Skip to content

Commit cb3c819

Browse files
Merge pull request #387 from InseeFr/java25
Java 25
2 parents 0fe53bc + 203e6d9 commit cb3c819

5 files changed

Lines changed: 18 additions & 10 deletions

File tree

.github/workflows/create-release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
release-tag: ${{ steps.version-step.outputs.newTag }}
2121
should_run_next_job: ${{ steps.check-tag.outputs.should_continue }}
2222
steps:
23-
- name: Set up JDK 21
23+
- name: Set up JDK 25
2424
uses: actions/setup-java@v5
2525
with:
2626
distribution: 'temurin'
27-
java-version: '21'
27+
java-version: '25'
2828

2929
- name: Checkout repo
3030
uses: actions/checkout@v6
@@ -64,11 +64,11 @@ jobs:
6464
runs-on: ubuntu-latest
6565
steps:
6666
- uses: actions/checkout@v6
67-
- name: Set up JDK 21
67+
- name: Set up JDK 25
6868
uses: actions/setup-java@v5
6969
with:
7070
distribution: 'temurin'
71-
java-version: '21'
71+
java-version: '25'
7272

7373
- name: install model filiere
7474
run: mvn install:install-file -Dfile="$(pwd)/libs/modelefiliere-2.1.0.jar" -DgroupId=fr.insee -DartifactId=modelefiliere -Dversion=2.1.0 -Dpackaging=jar -DgeneratePom=true

.github/workflows/docker.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
with:
2121
ref: ${{ steps.extract_branch.outputs.branch }}
2222

23-
- name: Set up JDK 21
23+
- name: Set up JDK 25
2424
uses: actions/setup-java@v5
2525
with:
2626
distribution: "temurin"
27-
java-version: "21"
27+
java-version: "25"
2828

2929
- name: install model filiere
3030
run: mvn install:install-file -Dfile="$(pwd)/libs/modelefiliere-2.1.0.jar" -DgroupId=fr.insee -DartifactId=modelefiliere -Dversion=2.1.0 -Dpackaging=jar -DgeneratePom=true

.github/workflows/maven.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@v6
2424

25-
- name: Set up JDK 21
25+
- name: Set up JDK 25
2626
uses: actions/setup-java@v5
2727
with:
28-
java-version: '21'
28+
java-version: '25'
2929
distribution: 'temurin'
3030
cache: maven
3131

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:21.0.10_7-jre-alpine
1+
FROM eclipse-temurin:25.0.1_8-jre
22

33
ENV PATH_TO_JAR=/opt/app/app.jar
44
WORKDIR /opt/app/

pom.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</parent>
1616

1717
<properties>
18-
<java.version>21</java.version>
18+
<java.version>25</java.version>
1919
<springdoc.version>2.8.15</springdoc.version>
2020
<mapstruct.version>1.6.3</mapstruct.version>
2121
<cucumber.version>7.34.2</cucumber.version>
@@ -173,6 +173,14 @@
173173
<groupId>org.apache.maven.plugins</groupId>
174174
<artifactId>maven-compiler-plugin</artifactId>
175175
<version>3.15.0</version>
176+
<configuration>
177+
<annotationProcessorPaths>
178+
<path>
179+
<groupId>org.projectlombok</groupId>
180+
<artifactId>lombok</artifactId>
181+
</path>
182+
</annotationProcessorPaths>
183+
</configuration>
176184
</plugin>
177185
<plugin>
178186
<groupId>org.sonarsource.scanner.maven</groupId>

0 commit comments

Comments
 (0)