Skip to content

Commit

Permalink
chore(jdk): upgrade to JDK21 (#326)
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewazores authored Sep 30, 2024
1 parent 5ccfd42 commit 813b096
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/push-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand All @@ -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
Expand All @@ -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
```

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<java.version>17</java.version>
<java.version>21</java.version>
<maven.compiler.release>${java.version}</maven.compiler.release>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
Expand Down Expand Up @@ -270,7 +270,7 @@
<configuration>
<java>
<googleJavaFormat>
<version>1.15.0</version>
<version>1.23.0</version>
<style>AOSP</style>
<reflowLongStrings>true</reflowLongStrings>
</googleJavaFormat>
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/Dockerfile.jvm
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down

0 comments on commit 813b096

Please sign in to comment.