diff --git a/.github/workflows/pr-ci.yaml b/.github/workflows/pr-ci.yaml index 5d9e25f..af29950 100644 --- a/.github/workflows/pr-ci.yaml +++ b/.github/workflows/pr-ci.yaml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: 'maven' - run: mvn -B -U clean verify diff --git a/.github/workflows/push-ci.yaml b/.github/workflows/push-ci.yaml index 805dce8..894042d 100644 --- a/.github/workflows/push-ci.yaml +++ b/.github/workflows/push-ci.yaml @@ -40,7 +40,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: 'maven' - name: Build application diff --git a/README.md b/README.md index fb9cbe4..8a73132 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ This demonstrates how a simple JSON data source can be used in Grafana to read t ### Dependencies -For native image support, GraalVM 23.0 (Java 17 version) is needed with the environment variable `GRAALVM_HOME` set to its path. It can be downloaded from: +For native image support, GraalVM for Java 21 is needed with the environment variable `GRAALVM_HOME` set to its path. It can be downloaded from: ``` https://github.com/graalvm/graalvm-ce-builds/releases ``` @@ -29,7 +29,7 @@ https://podman.io/getting-started/installation.html ### Build and run locally -This project uses [Quarkus](https://quarkus.io), which can produce a JAR to run in a JVM (JDK 17+), or an executable native image. +This project uses [Quarkus](https://quarkus.io), which can produce a JAR to run in a JVM (JDK 21+), or an executable native image. To build a JAR: ```bash @@ -44,7 +44,7 @@ Native image builds may use more than 4G of RAM to finish. To build a native image within a container, for a consistent environment: ```bash ./mvnw -Pnative -Dquarkus.native.container-build=true -Dquarkus.native.container-runtime=podman \ --Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.0-java17 \ +-Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-21 \ clean verify ``` diff --git a/pom.xml b/pom.xml index c391c62..0ded864 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ UTF-8 UTF-8 - 17 + 21 ${java.version} ${java.version} ${java.version} @@ -270,7 +270,7 @@ - 1.15.0 + 1.23.0 true diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm index 7793034..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.1724181070 +FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:1.20-2.1727147592 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'