diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0da6ec3221e1cf776412f414925733d43e1a98a..204e94b09cc92c8d378a1cb965ec6b16571918b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: 'maven:3.6.3-jdk-11-slim' +image: 'maven:3.8.4-openjdk-17-slim' cache: paths: diff --git a/Dockerfile b/Dockerfile index f414f0ebb135b6e4c740088f00f56ef440bfd445..c540fa78662d8f97f100c28b0fe039143150d452 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ############ BUILD STAGE ############ -FROM maven:3.6.2-jdk-11-slim AS build +FROM maven:3.8.4-openjdk-17-slim AS build WORKDIR /app ARG PROJECT_ARTIFACT_ID=kypo-adaptive-training ## default link to proprietary repository, e.g., Gitlab repository @@ -11,7 +11,7 @@ RUN mvn clean install -DskipTests -Dproprietary-repo-url=$PROPRIETARY_REPO_URL & cp /app/target/$PROJECT_ARTIFACT_ID-*.jar /app/kypo-adaptive-training.jar ############ RUNNABLE STAGE ############ -FROM openjdk:11-jre-slim +FROM eclipse-temurin:17-jre-focal AS runnable WORKDIR /app COPY /etc/kypo-adaptive-training.properties /app/etc/kypo-adaptive-training.properties COPY entrypoint.sh /app/entrypoint.sh diff --git a/pom.xml b/pom.xml index e7c736a0585e27d7eacfb08cd0d233e1f124f608..86c4b6a1ac45dcfec6df0d316d7178013a0a121d 100644 --- a/pom.xml +++ b/pom.xml @@ -18,12 +18,12 @@ </parent> <properties> - <java.version>11</java.version> + <java.version>17</java.version> <proprietary-repo-id>gitlab-maven</proprietary-repo-id> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <kypo-security-commons.version>1.0.49</kypo-security-commons.version> - <kypo-elasticsearch-documents.version>1.1.2</kypo-elasticsearch-documents.version> + <kypo-security-commons.version>2.0.0</kypo-security-commons.version> + <kypo-elasticsearch-documents.version>2.0.0</kypo-elasticsearch-documents.version> <swagger.version>3.0.0</swagger.version> <swagger.directory>${basedir}/doc-files</swagger.directory> <swagger.skip>true</swagger.skip>