From ca3e2ba8e452aec7e84d01de6b578583fff9dc21 Mon Sep 17 00:00:00 2001 From: 12mumi1mst <12mumi1mst@hft-stuttgart.de> Date: Tue, 5 Nov 2024 16:45:24 +0100 Subject: [PATCH] Direct update from jdk17 to jdk21 --- Dockerfile | 4 ++-- pom.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index a7ece2a..39430de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM amazoncorretto:17.0.3-alpine as corretto-jdk +FROM amazoncorretto:21-alpine as corretto-jdk ENV BASEDIR /data ENV TESTDIR $BASEDIR/test @@ -11,7 +11,7 @@ RUN mkdir -p $TESTDIR \ && mkdir $RESULTDIR \ && mkdir -p /$LIBSDIR/additional -ADD target/dta-jdk17-junit5-runner-jar-with-dependencies.jar /$BASEDIR/app.jar +ADD target/dta-jdk21-junit5-runner-jar-with-dependencies.jar /$BASEDIR/app.jar ADD https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/5.10.0/junit-jupiter-api-5.10.0.jar /$LIBSDIR/ ADD https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-engine/5.10.0/junit-jupiter-engine-5.10.0.jar /$LIBSDIR/ ADD https://repo1.maven.org/maven2/org/junit/platform/junit-platform-engine/1.10.0/junit-platform-engine-1.10.0.jar /$LIBSDIR/ diff --git a/pom.xml b/pom.xml index bbfb737..9c20b68 100644 --- a/pom.xml +++ b/pom.xml @@ -5,15 +5,15 @@ <modelVersion>4.0.0</modelVersion> <groupId>de.hftstuttgart</groupId> - <artifactId>dta-jdk17-junit5-runner</artifactId> + <artifactId>dta-jdk21-junit5-runner</artifactId> <version>${env.BUILD_NUMBER}</version> <packaging>jar</packaging> <properties> <buildNumber>${env.BUILD_NUMBER}</buildNumber> - <java.version>17</java.version> - <maven.compiler.source>17</maven.compiler.source> - <maven.compiler.target>17</maven.compiler.target> + <java.version>21</java.version> + <maven.compiler.source>21</maven.compiler.source> + <maven.compiler.target>21</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> -- GitLab