diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2d9101a..93a0bbe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,11 +48,11 @@ jobs: working-directory: finish steps: - uses: actions/checkout@v4 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v4 with: distribution: 'semeru' - java-version: 11 + java-version: 17 - run: unset _JAVA_OPTIONS - name: Run tests run: ../scripts/testApp.sh diff --git a/README.adoc b/README.adoc index 43187c6..708504e 100644 --- a/README.adoc +++ b/README.adoc @@ -340,7 +340,7 @@ Verify that the `cart-app:1.0-SNAPSHOT` image is listed among the Docker images, ---- REPOSITORY TAG cart-app 1.0-SNAPSHOT -icr.io/appcafe/open-liberty kernel-slim-java11-openj9-ubi +icr.io/appcafe/open-liberty kernel-slim-java17-openj9-ubi ---- diff --git a/finish/Dockerfile b/finish/Dockerfile index f3bfe48..457efe5 100644 --- a/finish/Dockerfile +++ b/finish/Dockerfile @@ -1,4 +1,4 @@ -FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi +FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi ARG VERSION=1.0 diff --git a/finish/pom.xml b/finish/pom.xml index 9462057..4f82907 100644 --- a/finish/pom.xml +++ b/finish/pom.xml @@ -9,8 +9,8 @@ UTF-8 UTF-8 - 11 - 11 + 17 + 17 ${user.home}/.m2/repository/com/hazelcast/hazelcast/ 9090 @@ -46,19 +46,19 @@ org.junit.jupiter junit-jupiter - 5.14.0 + 6.0.1 test org.jboss.resteasy resteasy-client - 6.2.14.Final + 7.0.0.Final test org.jboss.resteasy resteasy-json-binding-provider - 6.2.14.Final + 7.0.0.Final test diff --git a/scripts/dailyBuild.sh b/scripts/dailyBuild.sh index d04a482..606df2b 100755 --- a/scripts/dailyBuild.sh +++ b/scripts/dailyBuild.sh @@ -16,7 +16,7 @@ sed -i "\##ahttps://public.dhe.ibm.com/i cat pom.xml if [[ "$DOCKER_USERNAME" != "" ]]; then - sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" Dockerfile + sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" Dockerfile sed -i "s;RUN features.sh;#RUN features.sh;g" Dockerfile cat Dockerfile fi diff --git a/scripts/dockerImageTest.sh b/scripts/dockerImageTest.sh index 9b8b85b..21a90bc 100755 --- a/scripts/dockerImageTest.sh +++ b/scripts/dockerImageTest.sh @@ -15,20 +15,20 @@ sed -i "\##ahttps://public.dhe.ibm.com/i cat pom.xml if [[ "$OL_LEVEL" != "" ]]; then - sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi;FROM cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java11-openj9-ubi;g" Dockerfile + sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi;FROM cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java17-openj9-ubi;g" Dockerfile else - sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi;FROM cp.stg.icr.io/cp/olc/open-liberty-daily:full-java11-openj9-ubi;g" Dockerfile + sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi;FROM cp.stg.icr.io/cp/olc/open-liberty-daily:full-java17-openj9-ubi;g" Dockerfile fi sed -i "s;RUN features.sh;#RUN features.sh;g" Dockerfile cat Dockerfile echo "$DOCKER_PASSWORD" | sudo -u runner docker login -u "$DOCKER_USERNAME" --password-stdin cp.stg.icr.io if [[ "$OL_LEVEL" != "" ]]; then - sudo -u runner docker pull -q "cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java11-openj9-ubi" - sudo -u runner echo "build level:"; docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.revision\"}}" "cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java11-openj9-ubi" + sudo -u runner docker pull -q "cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java17-openj9-ubi" + sudo -u runner echo "build level:"; docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.revision\"}}" "cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java17-openj9-ubi" else - sudo -u runner docker pull -q "cp.stg.icr.io/cp/olc/open-liberty-daily:full-java11-openj9-ubi" - sudo -u runner echo "build level:"; docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.revision\"}}" "cp.stg.icr.io/cp/olc/open-liberty-daily:full-java11-openj9-ubi" + sudo -u runner docker pull -q "cp.stg.icr.io/cp/olc/open-liberty-daily:full-java17-openj9-ubi" + sudo -u runner echo "build level:"; docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.revision\"}}" "cp.stg.icr.io/cp/olc/open-liberty-daily:full-java17-openj9-ubi" fi #sudo ../scripts/startMinikube.sh diff --git a/start/Dockerfile b/start/Dockerfile index 22d3230..1ae8983 100644 --- a/start/Dockerfile +++ b/start/Dockerfile @@ -1,4 +1,4 @@ -FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi +FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi ARG VERSION=1.0 ARG REVISION=SNAPSHOT diff --git a/start/pom.xml b/start/pom.xml index 550d073..18c8b21 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -9,8 +9,8 @@ UTF-8 UTF-8 - 11 - 11 + 17 + 17 ${user.home}/.m2/repository/com/hazelcast/hazelcast/ 9090 @@ -46,19 +46,19 @@ org.junit.jupiter junit-jupiter - 5.14.0 + 6.0.1 test org.jboss.resteasy resteasy-client - 6.2.14.Final + 7.0.0.Final test org.jboss.resteasy resteasy-json-binding-provider - 6.2.14.Final + 7.0.0.Final test