RHCLOUD-31350 Bump Java from 17 to 21 (RedHatInsights#2504)

gwenneg · Mar 13, 2024 · fafaac5 · fafaac5
1 parent fa9babc
commit fafaac5
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 34 deletions.
diff --git a/.github/workflows/base-image-auto-update.yml b/.github/workflows/base-image-auto-update.yml
@@ -14,14 +14,14 @@ jobs:
       - name: Set up skopeo
         run: sudo apt-get install -y skopeo
       - name: Check change
-        run: skopeo inspect docker://registry.access.redhat.com/ubi8/openjdk-17-runtime:latest | grep Digest > .baseimage
+        run: skopeo inspect docker://registry.access.redhat.com/ubi8/openjdk-21-runtime:latest | grep Digest > .baseimage
       - name: Do change if the digest changed
         run: |
           git config user.name 'Update-a-Bot'
           git config user.email '[email protected]'
           git add -A
-          git commit -m "Update ubi8/openjdk-17-runtime:latest image digest" || echo "No changes to commit"
+          git commit -m "Update ubi8/openjdk-21-runtime:latest image digest" || echo "No changes to commit"
       - name: Create pull request
         uses: peter-evans/create-pull-request@v6
         with:
-          title: 'Update ubi8/openjdk-17-runtime:latest image digest'
+          title: 'Update ubi8/openjdk-21-runtime:latest image digest'
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,11 +27,11 @@ jobs:
           path: ~/.cache/yarn
           # The cache key is changed every month to prevent unlimited growth.
           key: yarn-cache-${{ steps.cache-key.outputs.date }}
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: adopt
-          java-version: 17
+          java-version: 21
       - name: Verify if admin-console changed
         id: admin-console-changed
         uses: tj-actions/[email protected]

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -55,11 +55,11 @@ jobs:
           # The cache key is changed every month to prevent unlimited growth.
           key: yarn-cache-${{ steps.cache-key.outputs.date }}
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: 17
+          java-version: 21
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

diff --git a/.rhcicd/sonarqube/Dockerfile b/.rhcicd/sonarqube/Dockerfile
@@ -1,5 +1,5 @@
-# Image available at https://catalog.redhat.com/software/containers/ubi9/openjdk-17-runtime.
-FROM registry.access.redhat.com/ubi9/openjdk-17
+# Image available at https://catalog.redhat.com/software/containers/ubi9/openjdk-21-runtime.
+FROM registry.access.redhat.com/ubi9/openjdk-21
 
 # Switch to the root user to be able to install the required packages.
 USER root

diff --git a/docker/Dockerfile.notifications-aggregator.jvm b/docker/Dockerfile.notifications-aggregator.jvm
@@ -3,14 +3,14 @@
 ###
 
 # Build the project
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest AS build
+FROM registry.access.redhat.com/ubi8/openjdk-21:latest AS build
 USER root
 COPY . /home/jboss
 WORKDIR /home/jboss
 RUN ./mvnw clean package -DskipTests -pl :notifications-aggregator -am --no-transfer-progress
 
 # Build the container
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest
+FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:latest
 
 # Update the base image packages
 USER root

diff --git a/docker/Dockerfile.notifications-backend.jvm b/docker/Dockerfile.notifications-backend.jvm
@@ -3,14 +3,14 @@
 ###
 
 # Build the project
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest AS build
+FROM registry.access.redhat.com/ubi8/openjdk-21:latest AS build
 USER root
 COPY . /home/jboss
 WORKDIR /home/jboss
 RUN ./mvnw clean package -DskipTests -pl :notifications-backend -am --no-transfer-progress
 
 # Build the container
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest
+FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:latest
 
 # Update the base image packages
 USER root

diff --git a/docker/Dockerfile.notifications-connector-drawer.jvm b/docker/Dockerfile.notifications-connector-drawer.jvm
@@ -3,14 +3,14 @@
 ###
 
 # Build the project
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest AS build
+FROM registry.access.redhat.com/ubi8/openjdk-21:latest AS build
 USER root
 COPY . /home/jboss
 WORKDIR /home/jboss
 RUN ./mvnw clean package -Dmaven.test.skip -Dcheckstyle.skip -pl :notifications-connector-drawer -am --no-transfer-progress
 
 # Build the container
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest
+FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:latest
 
 # Update the base image packages
 USER root

diff --git a/docker/Dockerfile.notifications-connector-email.jvm b/docker/Dockerfile.notifications-connector-email.jvm
@@ -3,14 +3,14 @@
 ###
 
 # Build the project
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest AS build
+FROM registry.access.redhat.com/ubi8/openjdk-21:latest AS build
 USER root
 COPY . /home/jboss
 WORKDIR /home/jboss
 RUN ./mvnw clean package -Dmaven.test.skip -Dcheckstyle.skip -pl :notifications-connector-email -am --no-transfer-progress
 
 # Build the container
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest
+FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:latest
 
 # Update the base image packages
 USER root

diff --git a/docker/Dockerfile.notifications-connector-google-chat.jvm b/docker/Dockerfile.notifications-connector-google-chat.jvm
@@ -3,14 +3,14 @@
 ###
 
 # Build the project
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest AS build
+FROM registry.access.redhat.com/ubi8/openjdk-21:latest AS build
 USER root
 COPY . /home/jboss
 WORKDIR /home/jboss
 RUN ./mvnw clean package -Dmaven.test.skip -Dcheckstyle.skip -pl :notifications-connector-google-chat -am --no-transfer-progress
 
 # Build the container
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest
+FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:latest
 
 # Update the base image packages
 USER root

diff --git a/docker/Dockerfile.notifications-connector-microsoft-teams.jvm b/docker/Dockerfile.notifications-connector-microsoft-teams.jvm
@@ -3,14 +3,14 @@
 ###
 
 # Build the project
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest AS build
+FROM registry.access.redhat.com/ubi8/openjdk-21:latest AS build
 USER root
 COPY . /home/jboss
 WORKDIR /home/jboss
 RUN ./mvnw clean package -Dmaven.test.skip -Dcheckstyle.skip -pl :notifications-connector-microsoft-teams -am --no-transfer-progress
 
 # Build the container
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest
+FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:latest
 
 # Update the base image packages
 USER root

diff --git a/docker/Dockerfile.notifications-connector-servicenow.jvm b/docker/Dockerfile.notifications-connector-servicenow.jvm
@@ -3,14 +3,14 @@
 ###
 
 # Build the project
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest AS build
+FROM registry.access.redhat.com/ubi8/openjdk-21:latest AS build
 USER root
 COPY . /home/jboss
 WORKDIR /home/jboss
 RUN ./mvnw clean package -Dmaven.test.skip -Dcheckstyle.skip -pl :notifications-connector-servicenow -am --no-transfer-progress
 
 # Build the container
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest
+FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:latest
 
 # Update the base image packages
 USER root

diff --git a/docker/Dockerfile.notifications-connector-slack.jvm b/docker/Dockerfile.notifications-connector-slack.jvm
@@ -3,14 +3,14 @@
 ###
 
 # Build the project
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest AS build
+FROM registry.access.redhat.com/ubi8/openjdk-21:latest AS build
 USER root
 COPY . /home/jboss
 WORKDIR /home/jboss
 RUN ./mvnw clean package -Dmaven.test.skip -Dcheckstyle.skip -pl :notifications-connector-slack -am --no-transfer-progress
 
 # Build the container
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest
+FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:latest
 
 # Update the base image packages
 USER root

diff --git a/docker/Dockerfile.notifications-connector-splunk.jvm b/docker/Dockerfile.notifications-connector-splunk.jvm
@@ -3,14 +3,14 @@
 ###
 
 # Build the project
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest AS build
+FROM registry.access.redhat.com/ubi8/openjdk-21:latest AS build
 USER root
 COPY . /home/jboss
 WORKDIR /home/jboss
 RUN ./mvnw clean package -Dmaven.test.skip -Dcheckstyle.skip -pl :notifications-connector-splunk -am --no-transfer-progress
 
 # Build the container
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest
+FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:latest
 
 # Update the base image packages
 USER root

diff --git a/docker/Dockerfile.notifications-connector-webhook.jvm b/docker/Dockerfile.notifications-connector-webhook.jvm
@@ -3,14 +3,14 @@
 ###
 
 # Build the project
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest AS build
+FROM registry.access.redhat.com/ubi8/openjdk-21:latest AS build
 USER root
 COPY . /home/jboss
 WORKDIR /home/jboss
 RUN ./mvnw clean package -Dmaven.test.skip -Dcheckstyle.skip -pl :notifications-connector-webhook -am --no-transfer-progress
 
 # Build the container
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest
+FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:latest
 
 # Update the base image packages
 USER root

diff --git a/docker/Dockerfile.notifications-engine.jvm b/docker/Dockerfile.notifications-engine.jvm
@@ -3,14 +3,14 @@
 ###
 
 # Build the project
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest AS build
+FROM registry.access.redhat.com/ubi8/openjdk-21:latest AS build
 USER root
 COPY . /home/jboss
 WORKDIR /home/jboss
 RUN ./mvnw clean package -DskipTests -pl :notifications-engine -am --no-transfer-progress
 
 # Build the container
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest
+FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:latest
 
 # Update the base image packages
 USER root

diff --git a/docker/Dockerfile.notifications-recipients-resolver.jvm b/docker/Dockerfile.notifications-recipients-resolver.jvm
@@ -3,14 +3,14 @@
 ###
 
 # Build the project
-FROM registry.access.redhat.com/ubi8/openjdk-17:latest AS build
+FROM registry.access.redhat.com/ubi8/openjdk-21:latest AS build
 USER root
 COPY . /home/jboss
 WORKDIR /home/jboss
 RUN ./mvnw clean package -Dmaven.test.skip -Dcheckstyle.skip -pl :notifications-recipients-resolver -am --no-transfer-progress
 
 # Build the container
-FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest
+FROM registry.access.redhat.com/ubi8/openjdk-21-runtime:latest
 
 # Update the base image packages
 USER root

diff --git a/pom.xml b/pom.xml
@@ -43,7 +43,7 @@
     <properties>
         <enforcer-plugin.version>3.4.1</enforcer-plugin.version>
         <maven-minimum-version>3.8.4</maven-minimum-version>
-        <java-version>17</java-version>
+        <java-version>21</java-version>
         <compiler-plugin.version>3.12.1</compiler-plugin.version>
         <maven.compiler.parameters>true</maven.compiler.parameters>
         <maven.compiler.source>${java-version}</maven.compiler.source>