From 3afbb81bcf91f04a243988dd270a2d19d97cdff8 Mon Sep 17 00:00:00 2001
From: "Fabrice Pipart (AmadeusIT)" <fabrice.pipart@amadeus.com>
Date: Wed, 10 Apr 2024 16:24:06 +0200
Subject: [PATCH] JDK 21 (https://github.com/quarkusio/quarkus/issues/39819)

---
 .github/workflows/ci.yml      |  4 ++--
 .github/workflows/release.yml | 12 ++++++------
 .github/workflows/sonar.yml   |  4 ++--
 contribute.md                 |  4 ++--
 pom.xml                       |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b8bfbca..67da876 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,10 +19,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           token: ${{ github.event_name == 'pull_request' && secrets.GITHUB_TOKEN || secrets.TAG_PAT_TOKEN }}
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: "adopt"
       - name: Cache Maven packages
         uses: actions/cache@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 18904bb..ed46e71 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,8 +16,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: graalvm/setup-graalvm@v1
         with:
-          version: '22.3.2'
-          java-version: '17'
+          distribution: 'graalvm'
+          java-version: '21'
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Cache Maven packages
@@ -50,8 +50,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: graalvm/setup-graalvm@v1
         with:
-          version: '22.3.2'
-          java-version: '17'
+          distribution: 'graalvm'
+          java-version: '21'
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Cache Maven packages
@@ -80,8 +80,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: graalvm/setup-graalvm@v1
         with:
-          version: '22.3.2'
-          java-version: '17'
+          distribution: 'graalvm'
+          java-version: '21'
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Cache Maven packages
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index b7093ae..b2fe267 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -14,10 +14,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'adopt'
       - name: Cache SonarCloud packages
         uses: actions/cache@v4
diff --git a/contribute.md b/contribute.md
index b2baef0..c3763c7 100644
--- a/contribute.md
+++ b/contribute.md
@@ -6,7 +6,7 @@
 
 To compile and run this app you will need:
 
-- JDK 17
+- JDK 21
 - Maven 3.8+
 
 ### How to build locally
@@ -66,7 +66,7 @@ impacted by your live changes, just type `r`.
 
 To compile and run this demo you will need:
 
-- JDK 17+
+- JDK 21+
 - GraalVM (See the [Building a Native Executable guide](https://quarkus.io/guides/building-native-image-guide)
   for help setting up your environment.)
 
diff --git a/pom.xml b/pom.xml
index f7a1368..1c3300a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,8 +26,8 @@
     <compiler-plugin.version>3.13.0</compiler-plugin.version>
     <mandrel.docker.version>22.3</mandrel.docker.version>
     <maven.compiler.parameters>true</maven.compiler.parameters>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
@@ -206,7 +206,7 @@
         <quarkus.container-image.build>true</quarkus.container-image.build>
         <quarkus.native.container-build>true</quarkus.native.container-build>
         <quarkus.native.builder-image>
-          quay.io/quarkus/ubi-quarkus-mandrel-builder-image:${mandrel.docker.version}-java17
+          quay.io/quarkus/ubi-quarkus-mandrel-builder-image:${mandrel.docker.version}-java21
         </quarkus.native.builder-image>
         <quarkus.package.type>native</quarkus.package.type>
         <quarkus.container-image.tag>${project.version}</quarkus.container-image.tag>