Skip to content

Commit d010355

Browse files
committed
Standardise on Adoptium Temurin Eclipse OpenJDK. This is the same as what is used in jore4-map-matching and jore4-hastus.
Update JRE from 11 (LTS) to 17 (LTS) to enabe migration to Spring Boot 3 in the future. Remove obsolete `XX:MaxPermSize` option from failsafe plugin.
1 parent acc398f commit d010355

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,20 @@ jobs:
1515
- name: Checkout code
1616
uses: actions/checkout@v3
1717

18+
- name: Set up JDK 17
19+
uses: actions/setup-java@v3
20+
with:
21+
java-version: "17"
22+
java-package: jdk
23+
architecture: x64
24+
distribution: temurin
25+
26+
- name: Cache Maven packages
27+
uses: actions/cache@v3
28+
with:
29+
path: ~/.m2
30+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
31+
restore-keys: ${{ runner.os }}-m2
32+
1833
- name: Run tests
1934
run: mvn clean verify -Pall-tests

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# builder docker image
2-
FROM maven:3-openjdk-11 AS builder
2+
FROM maven:3-eclipse-temurin-17 AS builder
33

44
# set up workdir
55
WORKDIR /build
@@ -14,7 +14,7 @@ COPY ./profiles/prod /build/profiles/prod
1414
RUN mvn clean package spring-boot:repackage -Pprod
1515

1616
# distributed docker image
17-
FROM openjdk:11-jre
17+
FROM eclipse-temurin:17.0.8_7-jre
1818

1919
# expose server port
2020
EXPOSE 8080

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
<artifactId>maven-failsafe-plugin</artifactId>
226226
<groupId>org.apache.maven.plugins</groupId>
227227
<configuration>
228-
<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
228+
<argLine>-Xmx1024m</argLine>
229229
<disableXmlReport>false</disableXmlReport>
230230
<groups>integrationTest</groups>
231231
<includes>

0 commit comments

Comments
 (0)