chore(jdk): upgrade to JDK21 on UBI9

cryostatio · Sep 16, 2024 · a858ae4 · a858ae4
1 parent e6ac1b0
commit a858ae4
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/ci-code-analysis.yml b/.github/workflows/ci-code-analysis.yml
@@ -37,7 +37,7 @@ jobs:
         step: restore
     - uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - name: Run spotbugs
       run: mvn -B -U compile spotbugs:check

diff --git a/.github/workflows/pr-ci.yaml b/.github/workflows/pr-ci.yaml
@@ -110,7 +110,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: 'maven'
     - run: git submodule init && git submodule update
@@ -192,7 +192,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: 'maven'
     - run: git submodule init && git submodule update

diff --git a/.github/workflows/push-ci.yaml b/.github/workflows/push-ci.yaml
@@ -63,7 +63,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: 'maven'
     - run: git submodule init && git submodule update

diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ We welcome and appreciate any contributions from our community. Please visit our
 
 Build requirements:
 - git
-- JDK 17+
+- JDK 21+
 - Maven v3+
 - [Quarkus CLI](https://quarkus.io/guides/cli-tooling) v3.4.1+ (Recommended)
 - [Podman](https://podman.io/docs/installation) 4.7+

diff --git a/compose/cryostat.yml b/compose/cryostat.yml
@@ -25,8 +25,8 @@ services:
       CRYOSTAT_DISCOVERY_DOCKER_ENABLED: ${CRYOSTAT_DISCOVERY_DOCKER_ENABLED:-true}
       JAVA_OPTS_APPEND: >-
         -XX:+FlightRecorder
-        -XX:StartFlightRecording=name=onstart,settings=default,disk=true,maxage=5m
-        -XX:StartFlightRecording=name=startup,settings=profile,disk=true,duration=30s
+        -XX:StartFlightRecording=filename=/tmp,name=onstart,settings=default,disk=true,maxage=5m
+        -XX:StartFlightRecording=filename=/tmp,name=startup,settings=profile,disk=true,duration=30s
         -Dcom.sun.management.jmxremote.autodiscovery=true
         -Dcom.sun.management.jmxremote
         -Dcom.sun.management.jmxremote.port=9091

diff --git a/compose/cryostat_docker.yml b/compose/cryostat_docker.yml
@@ -35,7 +35,7 @@ services:
       CRYOSTAT_DISCOVERY_JDP_ENABLED: "true"
       JAVA_OPTS_APPEND: >-
         -XX:+FlightRecorder
-        -XX:StartFlightRecording=name=onstart,settings=default,disk=true,maxage=5m
+        -XX:StartFlightRecording=filename=/tmp,name=onstart,settings=default,disk=true,maxage=5m
         -Dcom.sun.management.jmxremote.autodiscovery=true
         -Dcom.sun.management.jmxremote
         -Dcom.sun.management.jmxremote.port=9091

diff --git a/compose/cryostat_k8s.yml b/compose/cryostat_k8s.yml
@@ -20,7 +20,7 @@ services:
     environment:
       CRYOSTAT_DISCOVERY_PODMAN_ENABLED: "false"
       CRYOSTAT_DISCOVERY_JDP_ENABLED: "true"
-      JAVA_OPTS_APPEND: "-XX:+FlightRecorder -XX:StartFlightRecording=name=onstart,settings=default,disk=true,maxage=5m -Dcom.sun.management.jmxremote.autodiscovery=true -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9091 -Dcom.sun.management.jmxremote.rmi.port=9091 -Djava.rmi.server.hostname=127.0.0.1 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false"
+      JAVA_OPTS_APPEND: "-XX:+FlightRecorder -XX:StartFlightRecording=filename=/tmp,name=onstart,settings=default,disk=true,maxage=5m -Dcom.sun.management.jmxremote.autodiscovery=true -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9091 -Dcom.sun.management.jmxremote.rmi.port=9091 -Djava.rmi.server.hostname=127.0.0.1 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false"
     restart: always
     healthcheck:
       test: curl --fail http://localhost:8181/health/liveness || exit 1

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
   <properties>
     <quarkus.application.version>${cryostat.imageVersionLower}</quarkus.application.version>
-    <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>
@@ -318,7 +318,7 @@
           </execution>
         </executions>
         <configuration>
-          <jvmArgs>-Dcryostat.discovery.jdp.enabled=true -Dcryostat.discovery.podman.enabled=true -XX:+FlightRecorder -XX:StartFlightRecording=name=onstart,settings=default,disk=true,maxage=5m -Dcom.sun.management.jmxremote.autodiscovery=true -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9091 -Dcom.sun.management.jmxremote.rmi.port=9091 -Djava.rmi.server.hostname=127.0.0.1 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false</jvmArgs>
+          <jvmArgs>-Dcryostat.discovery.jdp.enabled=true -Dcryostat.discovery.podman.enabled=true -XX:+FlightRecorder -XX:StartFlightRecording=filename=/tmp/,name=onstart,settings=default,disk=true,maxage=5m -Dcom.sun.management.jmxremote.autodiscovery=true -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9091 -Dcom.sun.management.jmxremote.rmi.port=9091 -Djava.rmi.server.hostname=127.0.0.1 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false</jvmArgs>
         </configuration>
       </plugin>
       <plugin>

diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm
@@ -77,7 +77,7 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-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 LANGUAGE='en_US:en'
 
@@ -107,7 +107,7 @@ ENV SSL_TRUSTSTORE=$CONF_DIR/truststore.p12 \
 USER root
 RUN mkdir -p $CONF_DIR \
     && chmod -R g=u $CONF_DIR \
-    && chown jboss:root $CONF_DIR
+    && chown default:root $CONF_DIR
 USER 185
 
 RUN /deployments/app/truststore-setup.bash
diff --git a/src/main/docker/include/truststore-setup.bash b/src/main/docker/include/truststore-setup.bash
@@ -15,7 +15,7 @@ cd "$CONF_DIR"
 keytool -importkeystore \
     -noprompt \
     -storetype PKCS12 \
-    -srckeystore /usr/lib/jvm/jre-17-openjdk/lib/security/cacerts \
+    -srckeystore /usr/lib/jvm/jre-openjdk/lib/security/cacerts \
     -srcstorepass changeit \
     -destkeystore "$SSL_TRUSTSTORE" \
     -deststorepass "$SSL_TRUSTSTORE_PASS"