Merge pull request #133 from IBM/java-17

update to Java 17

Author: jmeis

.github/workflows/maven.yml

@@ -9,10 +9,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 17
     - name: Build with Maven
       run: mvn -B package --file pom.xml
     - name: Run unit test with Surefire

Dockerfile

@@ -1,16 +1,10 @@
-# IBM Java SDK UBI is not available on public docker yet. Use regular
-# base as builder until this is ready. For reference:
-# https://github.com/ibmruntimes/ci.docker/tree/master/ibmjava/8/sdk/ubi-min
-
-FROM ibmjava:8-sdk AS builder
+FROM registry.access.redhat.com/ubi8/openjdk-17:1.11 AS builder
 LABEL maintainer="IBM Java Engineering at IBM Cloud"
 
+USER root
 WORKDIR /app
-RUN apt-get update \
-  && apt-get install -y --no-install-recommends maven=3.6.0-1~18.04.1
-
 COPY pom.xml .
-RUN mvn -N io.takari:maven:wrapper -Dmaven=3.5.0
+RUN mvn -N wrapper:wrapper -Dmaven=3.8.4
 
 COPY . /app
 RUN ./mvnw install
@@ -20,6 +14,7 @@ ARG bx_dev_userid=1000
 RUN export BX_DEV_USER=$bx_dev_user
 RUN export BX_DEV_USERID=$bx_dev_userid
 RUN if [ $bx_dev_user != "root" ]; then useradd -ms /bin/bash -u $bx_dev_userid $bx_dev_user; fi
+USER 1001
 
 # Multi-stage build. New build stage that uses the UBI as the base image.
 
@@ -28,7 +23,7 @@ RUN if [ $bx_dev_user != "root" ]; then useradd -ms /bin/bash -u $bx_dev_userid
 # Docker at the moment.
 # (https://github.com/ibmruntimes/ci.docker/tree/master/ibmjava/8/sfj/ubi-min)
 
-FROM adoptopenjdk/openjdk8:ubi-jre
+FROM registry.access.redhat.com/ubi8/openjdk-17:1.11
 
 # Copy over app from builder image into the runtime image.
 RUN mkdir /opt/app

Dockerfile-tools

@@ -1,14 +1,10 @@
 # In the short term, we are using the OpenJDK for UBI. Long term, we will use
 # the IBM Java Small Footprint JVM (SFJ) for UBI, but that is not in public
 # Docker at the moment.
-FROM adoptopenjdk/openjdk8:ubi
+FROM registry.access.redhat.com/ubi8/openjdk-17:1.11
 
 LABEL maintainer="IBM Java Engineering at IBM Cloud"
 
-RUN yum -y install --disableplugin=subscription-manager maven \
-    && yum --disableplugin=subscription-manager clean all
-
-
 ARG bx_dev_user=root
 ARG bx_dev_userid=1000
 RUN BX_DEV_USER=$bx_dev_user

pom.xml

@@ -10,14 +10,9 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
         <opentracing-spring-jaeger-web-starter.version>3.3.1</opentracing-spring-jaeger-web-starter.version>
         <app.name>javaspringapp</app.name>
-
-        <!-- Remove this once Spring boot updates to 2.17.0 or above-->
-        <log4j2.version>2.17.0</log4j2.version>
     </properties>
 
     <parent>