From f75e359dc79dd0cb993584486ee9c466df0eb101 Mon Sep 17 00:00:00 2001
From: QDIBYS <alexis.szmundy@insee.fr>
Date: Wed, 21 Jan 2026 10:38:41 +0100
Subject: [PATCH 1/2] chore: bump java version

---
 Dockerfile | 2 +-
 pom.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 56ae0c7f..5807db6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21.0.9_10-jre-alpine
+FROM eclipse-temurin:25.0.1_8-jre
 
 ENV PATH_TO_JAR=/opt/app/app.jar
 WORKDIR /opt/app/
diff --git a/pom.xml b/pom.xml
index edb420fd..5876dbd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     </parent>
 
     <properties>
-        <java.version>21</java.version>
+        <java.version>25</java.version>
         <springdoc.version>2.8.15</springdoc.version>
         <mapstruct.version>1.6.3</mapstruct.version>
         <cucumber.version>7.33.0</cucumber.version>

From 21a9ec7084becac92584ea6a66e307c7e7028bb9 Mon Sep 17 00:00:00 2001
From: QDIBYS <alexis.szmundy@insee.fr>
Date: Wed, 21 Jan 2026 10:41:45 +0100
Subject: [PATCH 2/2] ci: CI to java 25

---
 .github/workflows/create-release.yaml | 8 ++++----
 .github/workflows/docker.yaml         | 4 ++--
 .github/workflows/maven.yml           | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml
index 9a18a3ab..8a73652a 100644
--- a/.github/workflows/create-release.yaml
+++ b/.github/workflows/create-release.yaml
@@ -20,11 +20,11 @@ jobs:
       release-tag: ${{ steps.version-step.outputs.newTag }}
       should_run_next_job:  ${{ steps.check-tag.outputs.should_continue }}
     steps:
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
 
       - name: Checkout repo
         uses: actions/checkout@v6
@@ -64,11 +64,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
 
       - name: install model filiere
         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
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 0b3a6722..0d8af844 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -20,11 +20,11 @@ jobs:
         with:
           ref: ${{ steps.extract_branch.outputs.branch }}
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v5
         with:
           distribution: "temurin"
-          java-version: "21"
+          java-version: "25"
 
       - name: install model filiere
         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
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index a9c97360..ca58eeca 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -22,10 +22,10 @@ jobs:
     steps:
     - uses: actions/checkout@v6
     
-    - name: Set up JDK 21
+    - name: Set up JDK 25
       uses: actions/setup-java@v5
       with:
-        java-version: '21'
+        java-version: '25'
         distribution: 'temurin'
         cache: maven