You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2026/08/09 21:11:37 UTC
(maven-remote-resources-plugin) branch master updated: Migrate the AbstractIT-based integration test classes to JUnit 5
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 894aac4 Migrate the AbstractIT-based integration test classes to JUnit 5
894aac4 is described below
commit 894aac470ce451bba37c4152d383491726ad8158
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Aug 9 22:53:24 2026 +0200
Migrate the AbstractIT-based integration test classes to JUnit 5
Convert the 9 JUnit 4 IT*.java classes (run by maven-failsafe-plugin
under the run-its profile) and their AbstractIT base class from
org.junit to org.junit.jupiter.api: @Test, @Before -> @BeforeEach,
static Assert.* -> Assertions.*, Assume.assumeTrue -> Assumptions.assumeTrue.
Add org.junit.jupiter:junit-jupiter-api as a direct test dependency
(the version is managed by the parent) and org.junit.vintage:junit-vintage-engine
so the still-JUnit-3-style RemoteResourcesMojoTest (extends the deprecated
AbstractMojoTestCase/PlexusTestCase) keeps running under the JUnit Platform.
junit:junit is kept for the same reason. Both are excluded from the
maven-dependency-plugin analyze-only check since they are only picked
up via reflection/ServiceLoader, not direct bytecode references.
RemoteResourcesMojoTest itself is intentionally left on the deprecated
AbstractMojoTestCase: a JUnit 5 path exists via maven-plugin-testing-harness's
@MojoTest/@InjectMojo/@MojoParameter annotations, but this test's imperative,
dynamically-configured mojo lookups do not map onto that declarative model
without a substantial redesign, so it is left as a follow-up.
Generated-by: Claude Opus 5 (1M context)
---
pom.xml | 20 +++++++++++++++++++-
.../maven/plugin/resources/remote/it/AbstractIT.java | 4 ++--
.../resources/remote/it/ITBadDependencyPoms.java | 4 ++--
.../resources/remote/it/ITCustomFilterDelimiter.java | 4 ++--
.../resources/remote/it/ITFilterLocalOverride.java | 4 ++--
.../resources/remote/it/ITGenerateFromBundle.java | 4 ++--
.../ITGenerateFromBundleWithTypeAndClassifier.java | 4 ++--
.../resources/remote/it/ITGenerateFromOverride.java | 4 ++--
.../resources/remote/it/ITGetDependencyProjects.java | 4 ++--
.../remote/it/ITRunOnlyAtExecutionRoot.java | 8 ++++----
.../resources/remote/it/ITSupplementalArtifact.java | 4 ++--
11 files changed, 41 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index e91adc4..cdf52be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,6 +205,7 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
+ <!-- still required by AbstractMojoTestCase (deprecated, PlexusTestCase/JUnit 3 based); see RemoteResourcesMojoTest -->
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
@@ -216,6 +217,17 @@ under the License.
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- runs RemoteResourcesMojoTest (AbstractMojoTestCase/PlexusTestCase, JUnit 3 style) on the JUnit Platform -->
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
@@ -362,7 +374,13 @@ under the License.
</goals>
<configuration>
<failOnWarning>true</failOnWarning>
- <ignoredDependencies>org.slf4j:slf4j-simple:*</ignoredDependencies>
+ <ignoredDependencies>
+ <ignoredDependency>org.slf4j:slf4j-simple:*</ignoredDependency>
+ <!-- still needed at test runtime by the deprecated AbstractMojoTestCase/PlexusTestCase (JUnit 3) -->
+ <ignoredDependency>junit:junit:*</ignoredDependency>
+ <!-- JUnit Platform test engines, discovered via ServiceLoader, never referenced from bytecode -->
+ <ignoredDependency>org.junit.vintage:junit-vintage-engine:*</ignoredDependency>
+ </ignoredDependencies>
</configuration>
</execution>
</executions>
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/AbstractIT.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/AbstractIT.java
index 59e1879..1eeffbe 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/AbstractIT.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/AbstractIT.java
@@ -19,10 +19,10 @@
package org.apache.maven.plugin.resources.remote.it;
import org.apache.maven.plugin.resources.remote.it.support.BootstrapInstaller;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
public abstract class AbstractIT {
- @Before
+ @BeforeEach
public void setUp() throws Exception {
BootstrapInstaller.install();
}
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITBadDependencyPoms.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITBadDependencyPoms.java
index b3d6cf1..57d4f5e 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITBadDependencyPoms.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITBadDependencyPoms.java
@@ -26,9 +26,9 @@ import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.shared.verifier.Verifier;
import org.codehaus.plexus.util.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author Benjamin Bentmann
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITCustomFilterDelimiter.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITCustomFilterDelimiter.java
index 32212d0..2ce5b05 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITCustomFilterDelimiter.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITCustomFilterDelimiter.java
@@ -26,9 +26,9 @@ import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.shared.verifier.Verifier;
import org.codehaus.plexus.util.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ITCustomFilterDelimiter extends AbstractIT {
@Test
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITFilterLocalOverride.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITFilterLocalOverride.java
index 8e5308e..de183c9 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITFilterLocalOverride.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITFilterLocalOverride.java
@@ -26,9 +26,9 @@ import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.shared.verifier.Verifier;
import org.codehaus.plexus.util.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ITFilterLocalOverride extends AbstractIT {
@Test
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundle.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundle.java
index 89f3eeb..19c8eb1 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundle.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundle.java
@@ -26,9 +26,9 @@ import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.shared.verifier.Verifier;
import org.codehaus.plexus.util.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ITGenerateFromBundle extends AbstractIT {
@Test
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundleWithTypeAndClassifier.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundleWithTypeAndClassifier.java
index 631e008..b83f264 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundleWithTypeAndClassifier.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromBundleWithTypeAndClassifier.java
@@ -26,9 +26,9 @@ import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.shared.verifier.Verifier;
import org.codehaus.plexus.util.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ITGenerateFromBundleWithTypeAndClassifier extends AbstractIT {
@Test
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromOverride.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromOverride.java
index 9cd6586..ed4b935 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromOverride.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGenerateFromOverride.java
@@ -26,9 +26,9 @@ import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.shared.verifier.Verifier;
import org.codehaus.plexus.util.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ITGenerateFromOverride extends AbstractIT {
@Test
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGetDependencyProjects.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGetDependencyProjects.java
index 91ae97a..9da63d1 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGetDependencyProjects.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITGetDependencyProjects.java
@@ -26,9 +26,9 @@ import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.shared.verifier.Verifier;
import org.codehaus.plexus.util.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author Benjamin Bentmann
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITRunOnlyAtExecutionRoot.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITRunOnlyAtExecutionRoot.java
index f01b4b0..ef9da45 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITRunOnlyAtExecutionRoot.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITRunOnlyAtExecutionRoot.java
@@ -27,11 +27,11 @@ import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.shared.verifier.Verifier;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.Os;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
/**
* @author Benjamin Bentmann
diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITSupplementalArtifact.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITSupplementalArtifact.java
index 6db4d7a..2fbade4 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/ITSupplementalArtifact.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/ITSupplementalArtifact.java
@@ -26,9 +26,9 @@ import org.apache.maven.plugin.resources.remote.it.support.TestUtils;
import org.apache.maven.shared.verifier.VerificationException;
import org.apache.maven.shared.verifier.Verifier;
import org.codehaus.plexus.util.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author John Casey