external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 17:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

update more dependency, update CardMockTestCase

Browse Source
This commit is contained in:
Anthony Calosa
2024-09-26 19:36:59 +08:00
parent f5949b9413
commit 3a41f9d492
7 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-adventure/pom.xml
View File

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

2
forge-game/pom.xml
View File

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

2
forge-gui-android/pom.xml
View File

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

22
forge-gui-desktop/pom.xml
View File

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

8
forge-gui-desktop/src/test/java/forge/card/CardMockTestCase.java
View File

@@ -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();
}
}*/
}

2
forge-gui-mobile-dev/pom.xml
View File

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

27
pom.xml
View File

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