From 3a41f9d4926098d24c7e40db5cc6c2e804328260 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 26 Sep 2024 19:36:59 +0800
Subject: [PATCH] update more dependency, update CardMockTestCase

---
 forge-adventure/pom.xml                       |  4 +--
 forge-game/pom.xml                            |  2 +-
 forge-gui-android/pom.xml                     |  2 +-
 forge-gui-desktop/pom.xml                     | 22 +++++++--------
 .../java/forge/card/CardMockTestCase.java     |  8 +++---
 forge-gui-mobile-dev/pom.xml                  |  2 +-
 pom.xml                                       | 27 ++++++++++++-------
 7 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/forge-adventure/pom.xml b/forge-adventure/pom.xml
index ae3849e4ef2..d6670345b8e 100644
--- a/forge-adventure/pom.xml
+++ b/forge-adventure/pom.xml
@@ -133,7 +133,7 @@
             <plugin>
                 <groupId>com.google.code.maven-replacer-plugin</groupId>
                 <artifactId>replacer</artifactId>
-                <version>1.5.2</version>
+                <version>1.5.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -239,7 +239,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>24.1.0</version>
+            <version>25.0.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/forge-game/pom.xml b/forge-game/pom.xml
index 653a151451c..bab97bc2a36 100644
--- a/forge-game/pom.xml
+++ b/forge-game/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>7.4.0</version>
+            <version>7.10.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml
index 98a73e2cfb1..06292584dd2 100644
--- a/forge-gui-android/pom.xml
+++ b/forge-gui-android/pom.xml
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.17.0</version>
+            <version>1.17.1</version>
         </dependency>
         <dependency>
             <groupId>forge</groupId>
diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
index 4befda93bf0..7c4f5f5d6f7 100644
--- a/forge-gui-desktop/pom.xml
+++ b/forge-gui-desktop/pom.xml
@@ -23,7 +23,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.3.0</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -36,7 +36,7 @@
             <plugin>
                 <groupId>com.google.code.maven-replacer-plugin</groupId>
                 <artifactId>replacer</artifactId>
-                <version>1.5.2</version>
+                <version>1.5.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -88,7 +88,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>released-version</id>
@@ -221,7 +221,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>7.4.0</version>
+            <version>7.10.2</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -279,7 +279,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.12.4</version>
+            <version>5.13.0</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -299,7 +299,7 @@
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
-            <version>1.14.5</version>
+            <version>1.15.2</version>
         </dependency>
         <dependency>
             <groupId>net.bytebuddy</groupId>
@@ -316,7 +316,7 @@
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
-            <version>2.3.32</version>
+            <version>2.3.33</version>
         </dependency>
         <dependency>
             <groupId>com.googlecode.soundlibs</groupId>
@@ -497,7 +497,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>3.1.0</version>
+                        <version>3.2.0</version>
                         <executions>
                             <execution>
                                 <id>released-version</id>
@@ -726,7 +726,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>3.1.0</version>
+                        <version>3.2.0</version>
                         <executions>
                             <execution>
                                 <id>released-version</id>
@@ -838,7 +838,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>3.1.0</version>
+                        <version>3.2.0</version>
                         <executions>
                             <execution>
                                 <id>released-version</id>
@@ -949,7 +949,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>3.1.0</version>
+                        <version>3.2.0</version>
                         <executions>
                             <execution>
                                 <id>released-version</id>
diff --git a/forge-gui-desktop/src/test/java/forge/card/CardMockTestCase.java b/forge-gui-desktop/src/test/java/forge/card/CardMockTestCase.java
index cc0b9748a89..13e35f92b45 100644
--- a/forge-gui-desktop/src/test/java/forge/card/CardMockTestCase.java
+++ b/forge-gui-desktop/src/test/java/forge/card/CardMockTestCase.java
@@ -16,9 +16,9 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
 import org.powermock.modules.testng.PowerMockTestCase;
-import org.testng.IObjectFactory;
+//import org.testng.IObjectFactory;
 import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.ObjectFactory;
+//import org.testng.annotations.ObjectFactory;
 
 import forge.ImageCache;
 import forge.ImageKeys;
@@ -184,8 +184,8 @@ public class CardMockTestCase extends PowerMockTestCase {
         PowerMockito.when(FModel.getMagicDb()).thenReturn(data);
     }
 
-    @ObjectFactory
+    /*@ObjectFactory
     public IObjectFactory getObjectFactory() {
         return new org.powermock.modules.testng.PowerMockObjectFactory();
-    }
+    }*/
 }
diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml
index 21362d36ab1..77c98fb25e1 100644
--- a/forge-gui-mobile-dev/pom.xml
+++ b/forge-gui-mobile-dev/pom.xml
@@ -42,7 +42,7 @@
             <plugin>
                 <groupId>com.google.code.maven-replacer-plugin</groupId>
                 <artifactId>replacer</artifactId>
-                <version>1.5.2</version>
+                <version>1.5.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
diff --git a/pom.xml b/pom.xml
index 41e9133d778..d0e54b12552 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-ftp</artifactId>
-                <version>2.6</version>
+                <version>3.5.3</version>
             </extension>
         </extensions>
 
@@ -149,7 +149,7 @@
                         <dependency>
                             <groupId>org.apache.maven.wagon</groupId>
                             <artifactId>wagon-ftp</artifactId>
-                            <version>3.3.4</version>
+                            <version>3.5.3</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -157,13 +157,13 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.3.0</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>3.8.2</version>
+                    <version>3.9.1</version>
                 </plugin>
 
                 <plugin>
@@ -174,7 +174,7 @@
 
                 <plugin>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.0</version>
                 </plugin>
 
                 <plugin>
@@ -185,7 +185,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.1.2</version>
                 </plugin>
 
                 <plugin>
@@ -201,7 +201,7 @@
 
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.2.0</version>
                 </plugin>
 
                 <plugin>
@@ -213,7 +213,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.2.1</version>
                 </plugin>
 
                 <plugin>
@@ -225,7 +225,7 @@
                 <plugin>
                     <groupId>org.apache.maven.wagon</groupId>
                     <artifactId>wagon-ftp</artifactId>
-                    <version>2.6</version>
+                    <version>3.5.3</version>
                 </plugin>
                 <!--This plugin's configuration is used to store Eclipse m2e settings
                             only. It has no influence on the Maven build itself. -->
@@ -240,7 +240,7 @@
                                     <pluginExecutionFilter>
                                         <groupId>org.codehaus.mojo</groupId>
                                         <artifactId>build-helper-maven-plugin</artifactId>
-                                        <versionRange>[3.1,)</versionRange>
+                                        <versionRange>[3.2,)</versionRange>
                                         <goals>
                                             <goal>released-version</goal>
                                             <goal>parse-version</goal>
@@ -299,6 +299,13 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <version>3.1.2</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.puppycrawl.tools</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>9.3</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <id>checkstyle-validation</id>