From 67421d8dedb81ffcfc99377c025d72780f6d63df Mon Sep 17 00:00:00 2001 From: David Eckhard Date: Thu, 9 Nov 2023 15:18:09 +0100 Subject: [PATCH] global: migrate to java17 --- .ci/config.yaml | 2 +- .github/workflows/release.yml | 4 ++-- .github/workflows/test.yml | 4 ++-- Dockerfile | 4 ++-- pom.xml | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.ci/config.yaml b/.ci/config.yaml index ef34e221..981131c1 100644 --- a/.ci/config.yaml +++ b/.ci/config.yaml @@ -13,7 +13,7 @@ pipelines: deploy: enabled: false maven: - imageTag: jdk-11 + imageTag: jdk-17 stages: publish: enabled: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d8370ac8..11ba9153 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,11 +21,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11.0.2 + - name: Set up JDK 17 uses: actions/setup-java@v2 with: distribution: 'adopt' - java-version: 11.0 + java-version: 17.0 - name: Publish to GitHub packages run: mvn -B deploy diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0aa6b2f2..9ddc3424 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,8 +16,8 @@ jobs: - name: Setup Maven Action uses: s4u/setup-maven-action@v1.2.1 with: - java-version: '11' - maven-version: '3.8.2' + java-version: '17' + maven-version: '3.9.5' - name: Build with Maven run: mvn -B clean install diff --git a/Dockerfile b/Dockerfile index cb2fbb0d..7695e8e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # Create a first stage container to build the application, this container image will be dropped once # the runner is built -FROM adoptopenjdk/maven-openjdk11 as builder +FROM maven:3.9.5-eclipse-temurin-17-alpine as builder # This Dockerfile uses labels from the label-schema namespace from http://label-schema.org/rc1/ LABEL maintainer="zeno.casellato@tuwien.ac.at" \ @@ -30,7 +30,7 @@ RUN mvn -Duser.home=$BUILD_HOME -B package -DskipTests -Dquarkus.profile=${BUILD # Create a second stage container which will only contain the runtime binaries without build dependencies FROM rockylinux:8.5 as runner -ARG JAVA_PACKAGE=java-11-openjdk-headless +ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 # path to copy built binaries from builder container diff --git a/pom.xml b/pom.xml index c059d986..3df3a5a0 100644 --- a/pom.xml +++ b/pom.xml @@ -11,12 +11,12 @@ 3.0.0-M5 - 11 - 11 + 17 + 17 UTF-8 UTF-8 true - 3.8.1 + 3.11.0 quarkus-universe-bom io.quarkus 2.16.2.Final