From db76b104e5386e8843d3aa1ea85498670dbf5234 Mon Sep 17 00:00:00 2001
From: "romain.birling" <romain.birling@sonarsource.com>
Date: Thu, 18 Dec 2025 15:34:50 +0100
Subject: [PATCH 1/3] Upgrade java version from 17 to 21

---
 .github/workflows/build.yml | 12 ++++++------
 mise.toml                   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 79ef2c3a1e..0ca229836e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,8 +71,8 @@ jobs:
       - uses: jdx/mise-action@5ac50f778e26fac95da98d50503682459e86d566 # v3.2.0
         with:
           version: 2025.7.12
-      - name: Select Java 17
-        run: mise use java@17
+      - name: Select Java 21
+        run: mise use java@21
       - name: Configure Maven
         uses: SonarSource/ci-github-actions/config-maven@v1
         with:
@@ -116,8 +116,8 @@ jobs:
       - uses: jdx/mise-action@5ac50f778e26fac95da98d50503682459e86d566 # v3.2.0
         with:
           version: 2025.7.12
-      - name: Select Java 17
-        run: mise use java@17
+      - name: Select Java 21
+        run: mise use java@21
       - name: Configure Maven
         uses: SonarSource/ci-github-actions/config-maven@v1
         with:
@@ -258,8 +258,8 @@ jobs:
         working-directory: java-checks-test-sources
         run: |
           mvn clean compile test-compile --batch-mode
-      - name: Select Java 17
-        run: mise use java@17
+      - name: Select Java 21
+        run: mise use java@21
       - uses: SonarSource/ci-github-actions/config-maven@v1
         with:
           deploy: false
diff --git a/mise.toml b/mise.toml
index c9152e9e51..95e1c9e9a1 100644
--- a/mise.toml
+++ b/mise.toml
@@ -1,3 +1,3 @@
 [tools]
-java = ["24", "17"]
+java = ["24", "21"]
 maven = "3.9"

From 93574be4521ab0899b4d8ad344f3b21b96c9b580 Mon Sep 17 00:00:00 2001
From: "romain.birling" <romain.birling@sonarsource.com>
Date: Fri, 19 Dec 2025 09:27:48 +0100
Subject: [PATCH 2/3] Update pom.xml to set jdk min version to 21

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fe8d04ed93..d5530ab6c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
   <properties>
     <license.title>SonarQube Java</license.title>
 
-    <jdk.min.version>17</jdk.min.version>
+    <jdk.min.version>21</jdk.min.version>
 
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
 

From a8627ddab2afac1fd0827052ee1023604add1cfe Mon Sep 17 00:00:00 2001
From: Leonardo Pilastri <leonardo.pilastri@sonarsource.com>
Date: Fri, 19 Dec 2025 15:02:34 +0100
Subject: [PATCH 3/3] Use Java 17 for orchestrator LATEST_RELEASE

---
 .github/workflows/build.yml | 8 ++++----
 mise.toml                   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0ca229836e..35332c7a40 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,8 +71,8 @@ jobs:
       - uses: jdx/mise-action@5ac50f778e26fac95da98d50503682459e86d566 # v3.2.0
         with:
           version: 2025.7.12
-      - name: Select Java 21
-        run: mise use java@21
+      - name: Select Java 17
+        run: mise use java@17
       - name: Configure Maven
         uses: SonarSource/ci-github-actions/config-maven@v1
         with:
@@ -258,8 +258,8 @@ jobs:
         working-directory: java-checks-test-sources
         run: |
           mvn clean compile test-compile --batch-mode
-      - name: Select Java 21
-        run: mise use java@21
+      - name: Select Java 17
+        run: mise use java@17
       - uses: SonarSource/ci-github-actions/config-maven@v1
         with:
           deploy: false
diff --git a/mise.toml b/mise.toml
index 95e1c9e9a1..4b3e4cec4c 100644
--- a/mise.toml
+++ b/mise.toml
@@ -1,3 +1,3 @@
 [tools]
-java = ["24", "21"]
+java = ["24", "21", "17"]
 maven = "3.9"