diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml index 9e57867ebf5..32311c594c7 100644 --- a/forge-gui-android/pom.xml +++ b/forge-gui-android/pom.xml @@ -414,7 +414,7 @@ org.apache.maven.plugins maven-antrun-plugin - 1.7 + 3.0.0 org.apache.ant @@ -472,7 +472,7 @@ org.apache.maven.plugins maven-antrun-plugin - 1.7 + 3.0.0 org.apache.ant diff --git a/forge-gui-android/proguard.cfg b/forge-gui-android/proguard.cfg index 877eac61e4d..e4109c95444 100644 --- a/forge-gui-android/proguard.cfg +++ b/forge-gui-android/proguard.cfg @@ -4,7 +4,8 @@ -dontskipnonpubliclibraryclasses -dontpreverify -verbose --optimizations !code/simplification/*,!field/*,!class/merging/*,!code/allocation/variable,!library/gson +# https://stackoverflow.com/a/32615580 +-optimizations !code/simplification/*,!field/*,!class/merging/*,!code/allocation/variable,!library/gson,!class/unboxing/enum ## Uncomment the line below and set it to the location of rt.jar in JDK if the Proguard step fails to find the libraries ## and spits out a thousand-something Class Not Found errors @@ -61,7 +62,7 @@ -keep class org.apache.commons.lang3.** { *; } -keep class com.google.guava.** { *; } -keep class com.google.common.** { *; } -#-keep class com.google.gson.GsonBuilder +##-keep class com.google.gson.GsonBuilder ##-keep class io.sentry.event.Event { *; } ##-keep class io.sentry.android.core.SentryAndroidOptions ##-keep class io.sentry.android.core.SentryAndroid @@ -129,6 +130,3 @@ } -keepattributes LineNumberTable,SourceFile - -# https://stackoverflow.com/a/32615580 --optimizations !class/unboxing/enum \ No newline at end of file diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml index e6b70e23286..9968e39ae4f 100644 --- a/forge-gui-desktop/pom.xml +++ b/forge-gui-desktop/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + 3.1.2 @@ -108,7 +108,7 @@ se.bjurr.gitchangelog git-changelog-maven-plugin - 1.92 + 1.101.0 GenerateGitChangelog @@ -188,12 +188,34 @@ com.mortennobel java-image-scaling - 0.8.5 + 0.8.6 org.powermock powermock-module-testng-common 2.0.9 + + + com.beust + jcommander + + + net.bytebuddy + byte-buddy + + + org.testng + testng + + + org.objenesis + objenesis + + + net.bytebuddy + byte-buddy-agent + + @@ -201,24 +223,52 @@ testng 7.4.0 test + + + com.beust + jcommander + + org.powermock powermock-module-testng 2.0.9 test + + + org.testng + testng + + org.powermock powermock-core 2.0.9 test + + + net.bytebuddy + byte-buddy + + + net.bytebuddy + byte-buddy-agent + + org.powermock powermock-api-mockito2 2.0.9 test + + + org.mockito + mockito-core + + org.powermock @@ -231,38 +281,52 @@ mockito-core 3.12.4 test + + + org.objenesis + objenesis + + + net.bytebuddy + byte-buddy + + + net.bytebuddy + byte-buddy-agent + + net.bytebuddy byte-buddy - 1.12.3 + 1.14.5 net.bytebuddy byte-buddy-agent - 1.12.3 + 1.14.5 test org.objenesis objenesis - 3.2 + 3.3 test org.freemarker freemarker - 2.3.31 + 2.3.32 com.googlecode.soundlibs jlayer - 1.0.1-1 + 1.0.1.4 com.beust jcommander - 1.78 + 1.82 jar @@ -367,7 +431,7 @@ org.apache.maven.plugins maven-antrun-plugin - 1.7 + 3.0.0 org.apache.ant @@ -490,7 +554,7 @@ ${project.build.finalName}-jar-with-dependencies.jar true forge - https://www.oracle.com/java/technologies/downloads/ + https://bell-sw.com/pages/downloads/#jdk-11-lts src/main/config/forge.ico forge.view.Main @@ -554,7 +618,7 @@ org.apache.maven.plugins maven-antrun-plugin - 1.7 + 3.0.0 org.apache.ant @@ -712,7 +776,7 @@ org.apache.maven.plugins maven-antrun-plugin - 1.7 + 3.0.0 org.apache.ant @@ -827,7 +891,7 @@ org.apache.maven.plugins maven-antrun-plugin - 1.7 + 3.0.0 org.apache.ant diff --git a/pom.xml b/pom.xml index 54c9f9644a3..7dcdd894b6b 100644 --- a/pom.xml +++ b/pom.xml @@ -102,17 +102,18 @@ maven-compiler-plugin - 3.1 + 3.8.1 11 11 + 11 org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + 3.1.1 true false @@ -125,18 +126,21 @@ org.apache.maven.plugins maven-surefire-plugin - 2.16 + 2.22.2 + + --illegal-access=permit + org.apache.maven.plugins maven-deploy-plugin - 2.8.1 + 3.0.0 org.apache.maven.wagon wagon-ftp - 2.6 + 3.3.4 @@ -144,40 +148,40 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + 3.1.2 org.apache.maven.plugins maven-site-plugin - 3.3 + 3.8.2 org.apache.maven.plugins maven-antrun-plugin - 1.7 + 3.0.0 maven-assembly-plugin - 2.4 + 3.2.0 maven-install-plugin - 2.5.1 + 3.0.1 org.apache.maven.plugins maven-dependency-plugin - 2.8 + 3.1.1 maven-release-plugin - 2.5 + 3.0.1 true @@ -188,25 +192,25 @@ maven-resources-plugin - 2.6 + 3.1.0 org.apache.maven.plugins maven-clean-plugin - 2.5 + 3.1.0 org.apache.maven.plugins maven-source-plugin - 2.2.1 + 3.1.0 org.apache.maven.plugins maven-scm-plugin - 1.9 + 1.11.2 @@ -285,7 +289,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.0.0 + 3.1.2 checkstyle-validation @@ -313,12 +317,12 @@ ch.qos.logback logback-classic - 1.2.11 + 1.5.8 ch.qos.logback logback-core - 1.2.11 + 1.5.8