diff --git a/gemp-lotr/docker/gemp_app.Dockerfile b/gemp-lotr/docker/gemp_app.Dockerfile index abf9f7efc..2d31e4503 100644 --- a/gemp-lotr/docker/gemp_app.Dockerfile +++ b/gemp-lotr/docker/gemp_app.Dockerfile @@ -1,7 +1,7 @@ -FROM alpine +FROM amazoncorretto:18-alpine-jdk RUN apk update; \ - apk update --allow-untrusted --repository=https://dl-cdn.alpinelinux.org/alpine/latest-stable/community; \ + apk update \ apk add --no-cache procps; \ apk add --no-cache net-tools; \ apk add --no-cache iputils; \ @@ -15,8 +15,7 @@ RUN apk update; \ apk add --no-cache freetype; \ apk add --no-cache fontconfig; \ apk add --no-cache git; \ - apk add --no-cache nano; \ - apk add --no-cache openjdk14-jdk --allow-untrusted --repository=https://dl-cdn.alpinelinux.org/alpine/latest-stable/community; + apk add --no-cache nano; @@ -25,13 +24,13 @@ RUN apk update; \ # https://github.com/carlossg/docker-maven/blob/26ba49149787c85b9c51222b47c00879b2a0afde/openjdk-14/Dockerfile ##################################################################### -ARG MAVEN_VERSION=3.6.3 +ARG MAVEN_VERSION=3.8.6 ARG USER_HOME_DIR="/root" -ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0 +ARG SHA=f790857f3b1f90ae8d16281f902c689e4f136ebe584aba45e4b1fa66c80cba826d3e0e52fdd04ed44b4c66f6d3fe3584a057c26dfcac544a60b301e6d0f91c26 ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries RUN mkdir -p /usr/share/maven /usr/share/maven/ref \ - && curl -fsSkL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \ + && curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \ && echo "${SHA} /tmp/apache-maven.tar.gz" | sha512sum -c - \ && tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 \ && rm -f /tmp/apache-maven.tar.gz \ diff --git a/gemp-lotr/gemp-lotr-async/pom.xml b/gemp-lotr/gemp-lotr-async/pom.xml index bf4de2844..87466a287 100644 --- a/gemp-lotr/gemp-lotr-async/pom.xml +++ b/gemp-lotr/gemp-lotr-async/pom.xml @@ -20,17 +20,17 @@ io.netty netty-all - 4.1.49.Final + 4.1.77.Final log4j log4j - 1.2.16 + 1.2.17 com.google.code.gson gson - 2.8.2 + 2.9.0 diff --git a/gemp-lotr/gemp-lotr-cards/pom.xml b/gemp-lotr/gemp-lotr-cards/pom.xml index 15f199cdd..d626aa7b1 100644 --- a/gemp-lotr/gemp-lotr-cards/pom.xml +++ b/gemp-lotr/gemp-lotr-cards/pom.xml @@ -25,7 +25,7 @@ log4j log4j - 1.2.16 + 1.2.17 \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-common/pom.xml b/gemp-lotr/gemp-lotr-common/pom.xml index f2dc42719..5d7bc0f30 100644 --- a/gemp-lotr/gemp-lotr-common/pom.xml +++ b/gemp-lotr/gemp-lotr-common/pom.xml @@ -19,12 +19,12 @@ log4j log4j - 1.2.16 + 1.2.17 junit junit - 4.9 + 4.13.2 test diff --git a/gemp-lotr/gemp-lotr-images/pom.xml b/gemp-lotr/gemp-lotr-images/pom.xml index f78f14d8b..183742314 100644 --- a/gemp-lotr/gemp-lotr-images/pom.xml +++ b/gemp-lotr/gemp-lotr-images/pom.xml @@ -13,17 +13,17 @@ com.googlecode.json-simple json-simple - 1.1 + 1.1.1 log4j log4j - 1.2.16 + 1.2.17 junit junit - 4.9 + 4.13.2 test diff --git a/gemp-lotr/gemp-lotr-logic/pom.xml b/gemp-lotr/gemp-lotr-logic/pom.xml index 789b20a62..8413ee4f4 100644 --- a/gemp-lotr/gemp-lotr-logic/pom.xml +++ b/gemp-lotr/gemp-lotr-logic/pom.xml @@ -20,22 +20,22 @@ com.googlecode.json-simple json-simple - 1.1 + 1.1.1 - org.apache.commons + commons-io commons-io - 1.3.2 + 2.11.0 log4j log4j - 1.2.16 + 1.2.17 junit junit - 4.9 + 4.13.2 test diff --git a/gemp-lotr/gemp-lotr-server/pom.xml b/gemp-lotr/gemp-lotr-server/pom.xml index 0c5949577..a0577a89d 100644 --- a/gemp-lotr/gemp-lotr-server/pom.xml +++ b/gemp-lotr/gemp-lotr-server/pom.xml @@ -18,22 +18,22 @@ org.jsoup jsoup - 1.8.3 + 1.14.3 log4j log4j - 1.2.16 + 1.2.17 mysql mysql-connector-java - 5.1.17 + 8.0.29 com.googlecode.json-simple json-simple - 1.1 + 1.1.1 commons-dbcp @@ -43,7 +43,7 @@ commons-collections commons-collections - 3.0 + 3.2.2 commons-lang @@ -53,30 +53,30 @@ com.sun.jersey jersey-server - 1.18.1 + 1.19.4 javax.servlet servlet-api - 2.4 + 2.5 provided junit junit - 4.9 + 4.13.2 test org.mockito - mockito-all - 1.9.0 + mockito-core + 3.12.4 test com.google.code.gson gson - 2.8.2 + 2.9.0 org.sql2o diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vset1/vpack1/Card_V1_061_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vset1/vpack1/Card_V1_061_Tests.java index 34010f4b0..4e9d5f569 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vset1/vpack1/Card_V1_061_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vset1/vpack1/Card_V1_061_Tests.java @@ -8,7 +8,6 @@ import com.gempukku.lotro.game.PhysicalCardImpl; import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException; import com.gempukku.lotro.logic.modifiers.MoveLimitModifier; import org.junit.Test; -import sun.security.pkcs11.P11TlsKeyMaterialGenerator; import java.util.HashMap; diff --git a/gemp-lotr/pom.xml b/gemp-lotr/pom.xml index 2abb8d899..558214c97 100644 --- a/gemp-lotr/pom.xml +++ b/gemp-lotr/pom.xml @@ -21,7 +21,7 @@ UTF-8 - 1.8 + 17 @@ -29,7 +29,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.0.2 + 2.3.2 ${java.version} ${java.version} @@ -45,11 +45,6 @@ http://download.java.net/maven/2/ default - - maven-repository.java.net - Java.net Maven 1 Repository (legacy) - http://download.java.net/maven/1 - legacy - +