ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated java version from 8 to 17. Updated all dependencies.

Browse Source 
The tournament and league tests now all fail, due to poorly designed mock tests for tournaments.  That will require a rewrite of the base classes to take a more IOC approach.
This commit is contained in:
Christian 'ketura' McCarty
2022-07-28 19:52:24 -05:00
parent 6438ee479c
commit e316984ce9
9 changed files with 34 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gemp-lotr/docker/gemp_app.Dockerfile
View File

@@ -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 \

6
gemp-lotr/gemp-lotr-async/pom.xml
View File

@@ -20,17 +20,17 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.1.49.Final</version>
<version>4.1.77.Final</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.2</version>
<version>2.9.0</version>
</dependency>
</dependencies>
<build>

2
gemp-lotr/gemp-lotr-cards/pom.xml
View File

@@ -25,7 +25,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<version>1.2.17</version>
</dependency>
</dependencies>
</project>

4
gemp-lotr/gemp-lotr-common/pom.xml
View File

@@ -19,12 +19,12 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.9</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>

6
gemp-lotr/gemp-lotr-images/pom.xml
View File

@@ -13,17 +13,17 @@
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.9</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>

10
gemp-lotr/gemp-lotr-logic/pom.xml
View File

@@ -20,22 +20,22 @@
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.3.2</version>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.9</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>

22
gemp-lotr/gemp-lotr-server/pom.xml
View File

@@ -18,22 +18,22 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.8.3</version>
<version>1.14.3</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.17</version>
<version>8.0.29</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.0</version>
<version>3.2.2</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -53,30 +53,30 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<version>1.18.1</version>
<version>1.19.4</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.9</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.0</version>
<artifactId>mockito-core</artifactId>
<version>3.12.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.2</version>
<version>2.9.0</version>
</dependency>
<dependency>
<groupId>org.sql2o</groupId>

1
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vset1/vpack1/Card_V1_061_Tests.java
View File

@@ -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;

11
gemp-lotr/pom.xml
View File

@@ -21,7 +21,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<java.version>17</java.version>
</properties>
<build>
@@ -29,7 +29,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<version>2.3.2</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
@@ -45,11 +45,6 @@
<url>http://download.java.net/maven/2/</url>
<layout>default</layout>
</repository>
<repository>
<id>maven-repository.java.net</id>
<name>Java.net Maven 1 Repository (legacy)</name>
<url>http://download.java.net/maven/1</url>
<layout>legacy</layout>
</repository>
</repositories>
</project>