diff --git a/source/Dockerfile b/source/Dockerfile index 065d208..2789a4e 100644 --- a/source/Dockerfile +++ b/source/Dockerfile @@ -1,5 +1,5 @@ # Builder part for maven packaging. -FROM maven:3-eclipse-temurin-17 as builder +FROM maven:3-eclipse-temurin-21 as builder WORKDIR /app @@ -17,7 +17,7 @@ FROM debian:bullseye # Get java from eclipse-temurin image (could perhaps do something with jlink later on) ENV JAVA_HOME=/opt/java/openjdk -COPY --from=eclipse-temurin:17 $JAVA_HOME $JAVA_HOME +COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME ENV PATH "${JAVA_HOME}/bin:${PATH}" # Set defaults diff --git a/source/file-server-client/pom.xml b/source/file-server-client/pom.xml index 7f3466a..f79d402 100644 --- a/source/file-server-client/pom.xml +++ b/source/file-server-client/pom.xml @@ -50,11 +50,13 @@ com.squareup.okhttp3 okhttp + ${okhttp.version} test com.squareup.okhttp3 mockwebserver + ${okhttp.version} test diff --git a/source/pom.xml b/source/pom.xml index 780bf79..4fa839c 100644 --- a/source/pom.xml +++ b/source/pom.xml @@ -23,7 +23,7 @@ nl.aerius aerius-root-pom - 1.0.0 + 1.1.0-SNAPSHOT pom @@ -35,15 +35,10 @@ The file server Parent - 17 - - 2.20.56 + 2.30.7 + 4.12.0 aerius_file-server - ${project.artifactId} - aerius - https://sonarcloud.io - ${project.build.directory}/dependency-check-report-pmd.xml @@ -80,4 +75,19 @@ file-server file-server-client + + + + dependency-check + + + + org.owasp + dependency-check-maven + false + + + + +