From 3a75f3995af712e3f77b45ed47596f0f5c63c246 Mon Sep 17 00:00:00 2001
From: Andrew Azores <me@andrewazor.es>
Date: Mon, 30 Sep 2024 10:27:43 -0400
Subject: [PATCH] chore(jdk): upgrade to JDK21 (#275)

---
 .github/workflows/ci.yaml             | 2 +-
 README.md                             | 2 +-
 pom.xml                               | 6 +++---
 src/main/docker/Dockerfile.jvm        | 2 +-
 src/main/docker/Dockerfile.legacy-jar | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 53b7fe8..c8457fb 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -66,7 +66,7 @@ jobs:
         ref: ${{ env.REF }}
     - uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - uses: actions/cache@v3
       with:
diff --git a/README.md b/README.md
index 936f472..89d5090 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ https://www.graalvm.org/reference-manual/native-image/Agent/
 In short, download the GraalVM CE distribution. Then do:
 ```bash
 # replace with actual path to downloaded and extracted GraalVM
-export JAVA_HOME=~/workspace/graalvm-ce-java17-21.3/
+export JAVA_HOME=~/workspace/graalvm-ce-java21-21.0.2/
 # run the application JAR with the tracing agent attached. This is a JVM-mode JAR!
 $JAVA_HOME/bin/java -agentlib:native-image-agent=config-output-dir=graal-config -jar target/cryostat-reports-*-runner.jar
 # in another terminal, make a request to exercise the expected microservice code path. Some "fully-featured"
diff --git a/pom.xml b/pom.xml
index 0b28a5c..8113a3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,8 +27,8 @@
   <properties>
     <compiler-plugin.version>3.13.0</compiler-plugin.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>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
@@ -158,7 +158,7 @@
         <configuration>
           <java>
             <googleJavaFormat>
-              <version>1.15.0</version>
+              <version>1.23.0</version>
               <style>AOSP</style>
               <reflowLongStrings>true</reflowLongStrings>
             </googleJavaFormat>
diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm
index d1911c5..1d8dfdf 100644
--- a/src/main/docker/Dockerfile.jvm
+++ b/src/main/docker/Dockerfile.jvm
@@ -21,7 +21,7 @@
 # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_DEBUG="true" quarkus/cryostat-reports-jvm
 #
 ###
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20-3.1727147550
+FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:1.20-2.1727147592
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
 
diff --git a/src/main/docker/Dockerfile.legacy-jar b/src/main/docker/Dockerfile.legacy-jar
index 123f813..e6fd341 100644
--- a/src/main/docker/Dockerfile.legacy-jar
+++ b/src/main/docker/Dockerfile.legacy-jar
@@ -21,7 +21,7 @@
 # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_DEBUG="true" quarkus/cryostat-reports-legacy-jar
 #
 ###
-FROM registry.access.redhat.com/ubi8/openjdk-17:1.20-2.1727147539
+FROM registry.access.redhat.com/ubi8/openjdk-21:1.20-3.1727147591
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'