deps: upgrade dependencies and format

cleydyr · Feb 21, 2024 · 69b4923 · 69b4923
1 parent d247ded
commit 69b4923
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -29,8 +29,8 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<spotless.version>2.22.1</spotless.version>
-		<maven.version>3.8.5</maven.version>
-		<maven.plugin.version>3.6.4</maven.plugin.version>
+		<maven.version>3.9.6</maven.version>
+		<maven.plugin.version>3.11.0</maven.plugin.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<dependencies>
@@ -61,13 +61,13 @@
 		<dependency>
 			<groupId>org.apache.maven.shared</groupId>
 			<artifactId>maven-verifier</artifactId>
-			<version>1.8.0</version>
+			<version>2.0.0-M1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>4.5.0</version>
+			<version>5.2.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -90,7 +90,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>
-			<version>1.24.0</version>
+			<version>1.26.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.kohsuke</groupId>
@@ -262,7 +262,7 @@
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore></ignore>
+										<ignore/>
 									</action>
 								</pluginExecution>
 								<pluginExecution>
@@ -279,7 +279,7 @@
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore></ignore>
+										<ignore/>
 									</action>
 								</pluginExecution>
 							</pluginExecutions>

diff --git a/src/test/java/com/github/cleydyr/dart/command/files/DefaultFileCounterTest.java b/src/test/java/com/github/cleydyr/dart/command/files/DefaultFileCounterTest.java
@@ -5,7 +5,7 @@
 import java.io.File;
 import java.nio.file.Files;
 import junit.framework.TestCase;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
 
 public class DefaultFileCounterTest extends TestCase {
     public void testFileExtensions() {

diff --git a/src/test/java/com/github/cleydyr/dart/maven/plugin/CompileSassMojoTest.java b/src/test/java/com/github/cleydyr/dart/maven/plugin/CompileSassMojoTest.java
@@ -11,7 +11,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import junit.framework.TestCase;
-import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
 
 public class CompileSassMojoTest extends TestCase {
     public void testNoSourceMapFlag() throws Exception {

diff --git a/src/test/java/com/github/cleydyr/dart/maven/plugin/test/util/TestUtil.java b/src/test/java/com/github/cleydyr/dart/maven/plugin/test/util/TestUtil.java
@@ -2,8 +2,8 @@
 
 import java.io.File;
 import java.util.Random;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
+import org.apache.maven.shared.verifier.VerificationException;
+import org.apache.maven.shared.verifier.Verifier;
 
 public class TestUtil {
     private TestUtil() {
@@ -15,19 +15,16 @@ public static void installMainPlugin() throws VerificationException {
 
         Verifier verifier = new Verifier(new File(mainPluginDir).getAbsolutePath());
 
-        verifier.addCliOption("-DskipTests");
-        verifier.addCliOption("-Dmaven.javadoc.skip=true");
-        verifier.addCliOption("-Dgpg.skip");
-        verifier.executeGoal("install");
+        verifier.addCliArguments("-DskipTests", "-Dmaven.javadoc.skip=true", "-Dgpg.skip", "install");
+        verifier.execute();
         verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
     }
 
     public static void executeGoal(File testDir, String goal) throws VerificationException {
         Verifier verifier = new Verifier(testDir.getAbsolutePath());
-        verifier.executeGoal(goal);
+        verifier.addCliArgument(goal);
+        verifier.execute();
         verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
     }
 
     public static String randomAlphaString(int size) {