Bump java to 21 and base images to ubi9 (kserve#155)

chore:	Bump java version to 21 and base images from UBI8 to UBI9

Signed-off-by: Spolti <[email protected]>

Author: spolti

.github/workflows/build.yml

@@ -28,10 +28,10 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
 
-    - name: Set up Java 17
+    - name: Set up Java 21
       uses: actions/[email protected]
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
 
     - name: Install etcd

.github/workflows/codeql.yml

@@ -48,10 +48,10 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
-    - name: Set up Java 17
+    - name: Set up Java 21
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
 
     # Initializes the CodeQL tools for scanning.

Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest as build_base
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest as build_base
 
 # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
 # don't provide "default" values (e.g. 'ARG TARGETARCH=amd64') for non-buildx environments,
@@ -26,20 +26,20 @@ LABEL image="build_base"
 
 USER root
 
-ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk
+ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk
 
 RUN --mount=type=cache,target=/root/.cache/microdnf:rw \
-    microdnf --setopt=cachedir=/root/.cache/microdnf --nodocs install \
-       java-17-openjdk-devel \
+    microdnf --setopt=cachedir=/root/.cache/microdnf --nodocs install -y \
+       java-21-openjdk-devel \
        nss \
     && microdnf update --nodocs \
-    && sed -i 's:security.provider.12=SunPKCS11:#security.provider.12=SunPKCS11:g' /usr/lib/jvm/java-17-openjdk-*/conf/security/java.security \
-    && sed -i 's:#security.provider.1=SunPKCS11 ${java.home}/lib/security/nss.cfg:security.provider.12=SunPKCS11 ${java.home}/lib/security/nss.cfg:g' /usr/lib/jvm/java-17-openjdk-*/conf/security/java.security \
+    && sed -i 's:security.provider.12=SunPKCS11:#security.provider.12=SunPKCS11:g' /usr/lib/jvm/java-21-openjdk-*/conf/security/java.security \
+    && sed -i 's:#security.provider.1=SunPKCS11 ${java.home}/lib/security/nss.cfg:security.provider.12=SunPKCS11 ${java.home}/lib/security/nss.cfg:g' /usr/lib/jvm/java-21-openjdk-*/conf/security/java.security \
     && java -version \
     && true
 
 RUN --mount=type=cache,target=/root/.cache/microdnf:rw \
-    microdnf --setopt=cachedir=/root/.cache/microdnf --nodocs install \
+    microdnf --setopt=cachedir=/root/.cache/microdnf --nodocs install -y \
        wget \
        tar \
        gzip \
@@ -82,23 +82,23 @@ RUN echo "$(date '+%Y%m%d')-$(git rev-parse HEAD | cut -c -5)" > target/dockerho
 
 
 ###############################################################################
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest AS runtime
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest AS runtime
 
 # TODO: FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:1.15
 
 ARG USER=2000
 
 USER root
 
-ENV JAVA_HOME=/usr/lib/jvm/jre-17-openjdk
+ENV JAVA_HOME=/usr/lib/jvm/jre-21-openjdk
 
 RUN --mount=type=cache,target=/root/.cache/microdnf:rw \
-    microdnf --setopt=cachedir=/root/.cache/microdnf --nodocs install \
-       java-17-openjdk-headless \
+    microdnf --setopt=cachedir=/root/.cache/microdnf --nodocs install -y \
+       java-21-openjdk-headless \
        nss \
     && microdnf update --nodocs \
-    && sed -i 's:security.provider.12=SunPKCS11:#security.provider.12=SunPKCS11:g' /usr/lib/jvm/java-17-openjdk-*/conf/security/java.security \
-    && sed -i 's:#security.provider.1=SunPKCS11 ${java.home}/lib/security/nss.cfg:security.provider.12=SunPKCS11 ${java.home}/lib/security/nss.cfg:g' /usr/lib/jvm/java-17-openjdk-*/conf/security/java.security \
+    && sed -i 's:security.provider.12=SunPKCS11:#security.provider.12=SunPKCS11:g' /usr/lib/jvm/java-21-openjdk-*/conf/security/java.security \
+    && sed -i 's:#security.provider.1=SunPKCS11 ${java.home}/lib/security/nss.cfg:security.provider.12=SunPKCS11 ${java.home}/lib/security/nss.cfg:g' /usr/lib/jvm/java-21-openjdk-*/conf/security/java.security \
     && java -version \
     && true
 
@@ -109,7 +109,7 @@ COPY version /etc/modelmesh-version
 WORKDIR /opt/kserve/mmesh
 
 RUN --mount=type=cache,target=/root/.cache/microdnf:rw \
-    microdnf --setopt=cachedir=/root/.cache/microdnf --nodocs install \
+    microdnf --setopt=cachedir=/root/.cache/microdnf --nodocs install -y \
        shadow-utils \
        hostname \
     # Create app user

pom.xml

@@ -71,6 +71,10 @@
     <eclipse-collections-version>11.1.0</eclipse-collections-version>
     <log4j2-version>2.23.1</log4j2-version>
     <slf4j-version>1.7.36</slf4j-version>
+    <javax-json-version>1.1.4</javax-json-version>
+    <datadoghq-version>2.7</datadoghq-version>
+    <googlecode-concurrentlinkedhashmap-lru-version>1.4.2</googlecode-concurrentlinkedhashmap-lru-version>
+    <googlecode-findbugs-jsr305-version>3.0.2</googlecode-findbugs-jsr305-version>
     <!-- Care must be taken when updating the prometheus client lib version
          since we have some custom optimized extensions to this -->
     <prometheus-version>0.9.0</prometheus-version>
@@ -130,9 +134,9 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
+        <version>3.11.0</version>
         <configuration>
-          <release>17</release>
+          <release>21</release>
         </configuration>
       </plugin>
 
@@ -311,20 +315,15 @@
       <version>${litelinks-version}</version>
     </dependency>
 
-    <!--  <dependency>
-        <groupId>com.github.ben-manes.caffeine</groupId>
-        <artifactId>caffeine</artifactId>
-        <version>2.3.1</version>
-    </dependency> -->
     <dependency>
       <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
       <artifactId>concurrentlinkedhashmap-lru</artifactId>
-      <version>1.4.2</version>
+      <version>${googlecode-concurrentlinkedhashmap-lru-version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
-      <version>3.0.2</version>
+      <version>${googlecode-findbugs-jsr305-version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -393,7 +392,7 @@
     <dependency>
       <groupId>javax.json</groupId>
       <artifactId>javax.json-api</artifactId>
-      <version>1.1.4</version>
+      <version>${javax-json-version}</version>
       <scope>runtime</scope>
     </dependency>
     <!-- it also uses jackson-databind, declared above -->
@@ -403,7 +402,7 @@
     <dependency>
       <groupId>com.datadoghq</groupId>
       <artifactId>java-dogstatsd-client</artifactId>
-      <version>2.7</version>
+      <version>${datadoghq-version}</version>
       <exclusions>
         <!-- This is only needed for UDS channels,
              and brings in a bunch of transitive deps -->