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 f3bf507..7197227 100644 --- a/pom.xml +++ b/pom.xml @@ -27,8 +27,8 @@ 3.13.0 true - 17 - 17 + 21 + 21 UTF-8 UTF-8 quarkus-bom @@ -158,7 +158,7 @@ - 1.15.0 + 1.23.0 true diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm index 7793034..9b4e00f 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.1724181070 +FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.20-2.1725851019 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 131c34e..017933a 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.1724181067 +FROM registry.access.redhat.com/ubi9/openjdk-21:1.20-2.1725851019 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' diff --git a/src/main/docker/Dockerfile.native b/src/main/docker/Dockerfile.native index d4d5ae4..ef1c402 100644 --- a/src/main/docker/Dockerfile.native +++ b/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/cryostat-reports # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1052.1724178568 +FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4-1227.1725849298 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \