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-resolver-ant-tasks.git

commit 715fff68ef276327b4110f5931c59a34b7b6ac48
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sat Oct 31 11:18:50 2026 +0000

    Migrate tests from JUnit 4 to JUnit 5
---
 pom.xml                                            | 20 +----
 .../resolver/internal/ant/ActiveProfileTest.java   | 11 +--
 .../{ActiveProfileTest.java => AntBuildFile.java}  | 24 +++---
 .../maven/resolver/internal/ant/AntBuildsTest.java | 20 +++--
 .../resolver/internal/ant/AntRepoSysTest.java      | 35 ++++----
 .../maven/resolver/internal/ant/DeployTest.java    | 18 ++---
 .../maven/resolver/internal/ant/InstallTest.java   | 14 ++--
 .../internal/ant/ProjectWorkspaceReaderTest.java   | 16 ++--
 .../resolver/internal/ant/ProxySelectorTest.java   | 25 +++---
 .../maven/resolver/internal/ant/ReactorTest.java   | 12 +--
 .../maven/resolver/internal/ant/ResolveTest.java   | 92 ++++++++++-----------
 .../maven/resolver/internal/ant/SettingsTest.java  | 30 +++----
 .../ant/tasks/CreatePomNoParentDirTest.java        | 20 ++---
 .../internal/ant/tasks/CreatePomRainyDayTest.java  | 29 ++++---
 .../resolver/internal/ant/tasks/CreatePomTest.java | 94 ++++++++++------------
 .../resolver/internal/ant/tasks/LayoutTest.java    | 13 ++-
 .../ant/types/DependencyManagementTest.java        | 27 +++----
 .../internal/ant/types/DependencyTest.java         |  8 +-
 .../resolver/internal/ant/types/ExclusionTest.java |  8 +-
 .../maven/resolver/internal/ant/types/PomTest.java |  8 +-
 .../internal/ant/types/SettingsReferenceTest.java  | 16 ++--
 21 files changed, 221 insertions(+), 319 deletions(-)

diff --git a/pom.xml b/pom.xml
index 862a968..746003a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,6 @@
     <antVersion>1.10.18</antVersion>
     <slf4jVersion>2.0.20</slf4jVersion>
     <junitVersion>4.13.2</junitVersion>
-    <hamcrestVersion>3.0</hamcrestVersion>
     
<maven.site.path>resolver-archives/resolver-ant-tasks-LATEST</maven.site.path>
     
<checkstyle.violation.ignore>LineLength,MagicNumber</checkstyle.violation.ignore>
     
<project.build.outputTimestamp>2026-08-03T16:01:18Z</project.build.outputTimestamp>
@@ -200,16 +199,9 @@
       <version>1.30.0</version>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junitVersion}</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.hamcrest</groupId>
-          <artifactId>hamcrest-core</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.ant</groupId>
@@ -223,14 +215,6 @@
       <version>${antVersion}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <!-- JUnit 4's own internals (e.g. AssumptionViolatedException 
implements SelfDescribing) need an
-           org.hamcrest implementation at runtime; hamcrest-core is excluded 
above, so this supplies it. -->
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <version>${hamcrestVersion}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-test-util</artifactId>
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/ActiveProfileTest.java 
b/src/test/java/org/apache/maven/resolver/internal/ant/ActiveProfileTest.java
index b6e31e2..adc72cc 100644
--- 
a/src/test/java/org/apache/maven/resolver/internal/ant/ActiveProfileTest.java
+++ 
b/src/test/java/org/apache/maven/resolver/internal/ant/ActiveProfileTest.java
@@ -18,20 +18,15 @@
  */
 package org.apache.maven.resolver.internal.ant;
 
-import junit.framework.JUnit4TestAdapter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class ActiveProfileTest extends AntBuildsTest {
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(ActiveProfileTest.class);
-    }
 
     @Test
     public void testActiveProfileNotDefinedInSettingsIsIgnored() {
         executeTarget("testActiveProfileNotDefinedInSettingsIsIgnored");
-        assertNotNull(
-                "repository of defined profile not registered", 
getProject().getReference("defined-repo"));
+        assertNotNull(getProject().getReference("defined-repo"), "repository 
of defined profile not registered");
     }
 }
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/ActiveProfileTest.java 
b/src/test/java/org/apache/maven/resolver/internal/ant/AntBuildFile.java
similarity index 60%
copy from 
src/test/java/org/apache/maven/resolver/internal/ant/ActiveProfileTest.java
copy to src/test/java/org/apache/maven/resolver/internal/ant/AntBuildFile.java
index b6e31e2..500d47e 100644
--- 
a/src/test/java/org/apache/maven/resolver/internal/ant/ActiveProfileTest.java
+++ b/src/test/java/org/apache/maven/resolver/internal/ant/AntBuildFile.java
@@ -18,20 +18,18 @@
  */
 package org.apache.maven.resolver.internal.ant;
 
-import junit.framework.JUnit4TestAdapter;
-import org.junit.Test;
+import org.apache.tools.ant.BuildFileRule;
 
-import static org.junit.Assert.assertNotNull;
-
-public class ActiveProfileTest extends AntBuildsTest {
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(ActiveProfileTest.class);
-    }
+/**
+ * Ant's {@link BuildFileRule} for JUnit 5 tests. The rule is a JUnit 4 {@code 
ExternalResource} whose cleanup is
+ * protected, so this subclass exposes it to be called from an {@code 
@AfterEach} method.
+ */
+public class AntBuildFile extends BuildFileRule {
 
-    @Test
-    public void testActiveProfileNotDefinedInSettingsIsIgnored() {
-        executeTarget("testActiveProfileNotDefinedInSettingsIsIgnored");
-        assertNotNull(
-                "repository of defined profile not registered", 
getProject().getReference("defined-repo"));
+    /**
+     * Restores the standard streams the rule replaced while a build file was 
configured and executed.
+     */
+    public void release() {
+        after();
     }
 }
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/AntBuildsTest.java 
b/src/test/java/org/apache/maven/resolver/internal/ant/AntBuildsTest.java
index 790cd98..72da6b9 100644
--- a/src/test/java/org/apache/maven/resolver/internal/ant/AntBuildsTest.java
+++ b/src/test/java/org/apache/maven/resolver/internal/ant/AntBuildsTest.java
@@ -22,15 +22,13 @@ import java.io.File;
 import java.io.PrintStream;
 
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.BuildFileRule;
 import org.apache.tools.ant.DefaultLogger;
 import org.apache.tools.ant.Project;
 import org.eclipse.aether.internal.test.util.TestFileUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public abstract class AntBuildsTest {
 
@@ -59,8 +57,7 @@ public abstract class AntBuildsTest {
         buildFile = projectFile;
     }
 
-    @Rule
-    public final BuildFileRule buildRule = new BuildFileRule();
+    private final AntBuildFile buildRule = new AntBuildFile();
 
     protected File projectDir;
 
@@ -80,7 +77,7 @@ public abstract class AntBuildsTest {
         // hook for subclasses to set further system properties for the 
project to pick up
     }
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         TestFileUtils.deleteFile(BUILD_DIR);
 
@@ -96,8 +93,9 @@ public abstract class AntBuildsTest {
         configureProject(buildFile.getAbsolutePath(), Project.MSG_VERBOSE);
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
+        buildRule.release();
         ProjectWorkspaceReader.dropInstance();
         TestFileUtils.deleteFile(BUILD_DIR);
     }
@@ -120,8 +118,8 @@ public abstract class AntBuildsTest {
     protected void assertLogContaining(String substring) {
         String realLog = getLog();
         assertTrue(
-                "expecting log to contain \"" + substring + "\" log was \"" + 
realLog + "\"",
-                realLog.contains(substring));
+                realLog.contains(substring),
+                "expecting log to contain \"" + substring + "\" log was \"" + 
realLog + "\"");
     }
 
     protected void executeTarget(String targetName) {
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/AntRepoSysTest.java 
b/src/test/java/org/apache/maven/resolver/internal/ant/AntRepoSysTest.java
index 4394f0c..1c7d4a1 100644
--- a/src/test/java/org/apache/maven/resolver/internal/ant/AntRepoSysTest.java
+++ b/src/test/java/org/apache/maven/resolver/internal/ant/AntRepoSysTest.java
@@ -22,32 +22,27 @@ import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 
-import junit.framework.JUnit4TestAdapter;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
 import org.eclipse.aether.util.graph.manager.TransitiveDependencyManager;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class AntRepoSysTest {
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(AntRepoSysTest.class);
-    }
 
-    @Rule
-    public TemporaryFolder temp = new TemporaryFolder();
+    @TempDir
+    File temp;
 
     private Project project;
 
     private Task task;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         project = new Project();
         project.setProperty("user.home", System.getProperty("user.home"));
@@ -72,8 +67,8 @@ public class AntRepoSysTest {
     public void testDependencyManagerIsClassicByDefault() {
         try (RepositorySystemSession.CloseableSession session = newSession()) {
             assertTrue(
-                    "expected the classic dependency manager, got " + 
session.getDependencyManager(),
-                    session.getDependencyManager() instanceof 
ClassicDependencyManager);
+                    session.getDependencyManager() instanceof 
ClassicDependencyManager,
+                    "expected the classic dependency manager, got " + 
session.getDependencyManager());
         }
     }
 
@@ -83,8 +78,8 @@ public class AntRepoSysTest {
 
         try (RepositorySystemSession.CloseableSession session = newSession()) {
             assertTrue(
-                    "expected the transitive dependency manager, got " + 
session.getDependencyManager(),
-                    session.getDependencyManager() instanceof 
TransitiveDependencyManager);
+                    session.getDependencyManager() instanceof 
TransitiveDependencyManager,
+                    "expected the transitive dependency manager, got " + 
session.getDependencyManager());
         }
     }
 
@@ -94,8 +89,8 @@ public class AntRepoSysTest {
 
         try (RepositorySystemSession.CloseableSession session = newSession()) {
             assertTrue(
-                    "expected the classic dependency manager, got " + 
session.getDependencyManager(),
-                    session.getDependencyManager() instanceof 
ClassicDependencyManager);
+                    session.getDependencyManager() instanceof 
ClassicDependencyManager,
+                    "expected the classic dependency manager, got " + 
session.getDependencyManager());
         }
     }
 
@@ -104,9 +99,9 @@ public class AntRepoSysTest {
      */
     @Test
     public void testUnreadableSettingsAreIgnored() throws Exception {
-        File broken = temp.newFile("settings.xml");
+        File broken = new File(temp, "settings.xml");
         Files.write(broken.toPath(), 
"<settings><not-closed>".getBytes(StandardCharsets.UTF_8));
-        File missing = new File(temp.getRoot(), "no-such-global-settings.xml");
+        File missing = new File(temp, "no-such-global-settings.xml");
 
         AntRepoSys sys = AntRepoSys.getInstance(project);
         sys.setUserSettings(broken);
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/DeployTest.java 
b/src/test/java/org/apache/maven/resolver/internal/ant/DeployTest.java
index 2e1fc10..e453684 100644
--- a/src/test/java/org/apache/maven/resolver/internal/ant/DeployTest.java
+++ b/src/test/java/org/apache/maven/resolver/internal/ant/DeployTest.java
@@ -21,21 +21,17 @@ package org.apache.maven.resolver.internal.ant;
 import java.io.File;
 import java.util.Arrays;
 
-import junit.framework.JUnit4TestAdapter;
 import org.apache.tools.ant.BuildException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /*
  * still missing:
  * - deploy snapshots/releases into correct repos
  */
 public class DeployTest extends AntBuildsTest {
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(DeployTest.class);
-    }
 
     @Test
     public void testDeployGlobalPom() {
@@ -80,17 +76,17 @@ public class DeployTest extends AntBuildsTest {
         File dir = new File(distRepoDir, "test/dummy/0.1-SNAPSHOT/");
         String[] files = dir.list();
         assertTrue(
-                "attached artifact not found: " + Arrays.toString(files),
-                Arrays.stream(files).anyMatch(f -> f.endsWith("-ant.xml")));
+                Arrays.stream(files).anyMatch(f -> f.endsWith("-ant.xml")),
+                "attached artifact not found: " + Arrays.toString(files));
     }
 
     private void assertUpdatedFile(long min, long max, File repoPath, String 
path) {
         File file = new File(repoPath, path);
         min = (min / 1000) * 1000;
         max = ((max + 999) / 1000) * 1000;
-        assertTrue("File does not exist in default repo: " + 
file.getAbsolutePath(), file.exists());
+        assertTrue(file.exists(), "File does not exist in default repo: " + 
file.getAbsolutePath());
         long lastModified = file.lastModified();
-        assertTrue("Files were not updated for 1s before/after timestamp", 
lastModified >= min && lastModified <= max);
+        assertTrue(lastModified >= min && lastModified <= max, "Files were not 
updated for 1s before/after timestamp");
     }
 
     /**
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/InstallTest.java 
b/src/test/java/org/apache/maven/resolver/internal/ant/InstallTest.java
index ec0bfb0..ad37594 100644
--- a/src/test/java/org/apache/maven/resolver/internal/ant/InstallTest.java
+++ b/src/test/java/org/apache/maven/resolver/internal/ant/InstallTest.java
@@ -21,15 +21,11 @@ package org.apache.maven.resolver.internal.ant;
 import java.io.File;
 import java.io.IOException;
 
-import junit.framework.JUnit4TestAdapter;
-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 InstallTest extends AntBuildsTest {
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(InstallTest.class);
-    }
 
     @Test
     public void testInstallGlobalPom() {
@@ -89,10 +85,10 @@ public class InstallTest extends AntBuildsTest {
 
     private void assertUpdatedFile(long tstamp, File repoPath, String path) {
         File file = new File(repoPath, path);
-        assertTrue("File does not exist in default repo: " + 
file.getAbsolutePath(), file.exists());
+        assertTrue(file.exists(), "File does not exist in default repo: " + 
file.getAbsolutePath());
         long lastModified = file.lastModified();
         assertTrue(
-                "Files were not updated for 1s before/after timestamp",
-                lastModified >= ((tstamp - 500) / 1000) * 1000 && lastModified 
<= tstamp + 2000);
+                lastModified >= ((tstamp - 500) / 1000) * 1000 && lastModified 
<= tstamp + 2000,
+                "Files were not updated for 1s before/after timestamp");
     }
 }
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/ProjectWorkspaceReaderTest.java
 
b/src/test/java/org/apache/maven/resolver/internal/ant/ProjectWorkspaceReaderTest.java
index 0da1539..86e3a35 100644
--- 
a/src/test/java/org/apache/maven/resolver/internal/ant/ProjectWorkspaceReaderTest.java
+++ 
b/src/test/java/org/apache/maven/resolver/internal/ant/ProjectWorkspaceReaderTest.java
@@ -24,28 +24,24 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import junit.framework.JUnit4TestAdapter;
 import org.apache.maven.resolver.internal.ant.types.Pom;
 import org.apache.tools.ant.Project;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 public class ProjectWorkspaceReaderTest {
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(ProjectWorkspaceReaderTest.class);
-    }
 
     private ProjectWorkspaceReader reader;
 
     private Project project;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         this.reader = new ProjectWorkspaceReader();
 
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/ProxySelectorTest.java 
b/src/test/java/org/apache/maven/resolver/internal/ant/ProxySelectorTest.java
index 20c2046..f701cef 100644
--- 
a/src/test/java/org/apache/maven/resolver/internal/ant/ProxySelectorTest.java
+++ 
b/src/test/java/org/apache/maven/resolver/internal/ant/ProxySelectorTest.java
@@ -22,35 +22,30 @@ import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 
-import junit.framework.JUnit4TestAdapter;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.repository.Proxy;
 import org.eclipse.aether.repository.ProxySelector;
 import org.eclipse.aether.repository.RemoteRepository;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class ProxySelectorTest {
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(ProxySelectorTest.class);
-    }
 
-    @Rule
-    public final TemporaryFolder folder = new TemporaryFolder();
+    @TempDir
+    File folder;
 
     private Project project;
 
     private Task task;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         project = new Project();
         project.setProperty("user.home", System.getProperty("user.home"));
@@ -129,7 +124,7 @@ public class ProxySelectorTest {
     }
 
     private File writeSettings(String... proxyElements) throws Exception {
-        File file = folder.newFile("settings.xml");
+        File file = new File(folder, "settings.xml");
         StringBuilder content = new StringBuilder();
         content.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
         content.append("<settings>\n");
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/ReactorTest.java 
b/src/test/java/org/apache/maven/resolver/internal/ant/ReactorTest.java
index d820777..3c9273e 100644
--- a/src/test/java/org/apache/maven/resolver/internal/ant/ReactorTest.java
+++ b/src/test/java/org/apache/maven/resolver/internal/ant/ReactorTest.java
@@ -21,19 +21,15 @@ package org.apache.maven.resolver.internal.ant;
 import java.io.File;
 import java.io.IOException;
 
-import junit.framework.JUnit4TestAdapter;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class ReactorTest extends AntBuildsTest {
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(ReactorTest.class);
-    }
 
     private Artifact artifact(String coords) {
         return new DefaultArtifact(coords);
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/ResolveTest.java 
b/src/test/java/org/apache/maven/resolver/internal/ant/ResolveTest.java
index 00c9ccf..1324755 100644
--- a/src/test/java/org/apache/maven/resolver/internal/ant/ResolveTest.java
+++ b/src/test/java/org/apache/maven/resolver/internal/ant/ResolveTest.java
@@ -24,31 +24,27 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Map;
 
-import junit.framework.JUnit4TestAdapter;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.ResourceCollection;
 import org.apache.tools.ant.types.resources.FileResource;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ResolveTest extends AntBuildsTest {
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(ResolveTest.class);
-    }
 
     @Test
     public void testResolveGlobalPom() {
         executeTarget("testResolveGlobalPom");
 
         String prop = 
getProject().getProperty("test.resolve.path.org.eclipse.aether:aether-api:jar");
-        assertNotNull("aether-api was not resolved as a property", prop);
+        assertNotNull(prop, "aether-api was not resolved as a property");
         assertTrue(
-                "aether-api was not resolved to default local repository",
-                prop.contains("aether-api") && prop.endsWith(".jar"));
+                prop.contains("aether-api") && prop.endsWith(".jar"),
+                "aether-api was not resolved to default local repository");
     }
 
     @Test
@@ -56,10 +52,10 @@ public class ResolveTest extends AntBuildsTest {
         executeTarget("testResolveOverrideGlobalPom");
 
         String prop = 
getProject().getProperty("test.resolve.path.org.eclipse.aether:aether-api:jar");
-        assertNotNull("aether-api was not resolved as a property", prop);
+        assertNotNull(prop, "aether-api was not resolved as a property");
         assertTrue(
-                "aether-api was not resolved to default local repository",
-                prop.contains("aether-api") && prop.endsWith(".jar"));
+                prop.contains("aether-api") && prop.endsWith(".jar"),
+                "aether-api was not resolved to default local repository");
     }
 
     @Test
@@ -67,11 +63,11 @@ public class ResolveTest extends AntBuildsTest {
         executeTarget("testResolveGlobalPomIntoOtherLocalRepo");
 
         String prop = 
getProject().getProperty("test.resolve.path.org.eclipse.aether:aether-api:jar");
-        assertNotNull("aether-api was not resolved as a property", prop);
+        assertNotNull(prop, "aether-api was not resolved as a property");
         assertTrue(
-                "aether-api was not resolved to default local repository",
                 prop.replace('\\', '/')
-                        
.endsWith("local-repo-custom/org/eclipse/aether/aether-api/0.9.0.M3/aether-api-0.9.0.M3.jar"));
+                        
.endsWith("local-repo-custom/org/eclipse/aether/aether-api/0.9.0.M3/aether-api-0.9.0.M3.jar"),
+                "aether-api was not resolved to default local repository");
     }
 
     @Test
@@ -80,8 +76,8 @@ public class ResolveTest extends AntBuildsTest {
         executeTarget("testResolveCustomFileLayout");
 
         assertTrue(
-                "aether-api was not saved with custom file layout",
-                new File(dir, 
"org.eclipse.aether/aether-api/org/eclipse/aether/jar").exists());
+                new File(dir, 
"org.eclipse.aether/aether-api/org/eclipse/aether/jar").exists(),
+                "aether-api was not saved with custom file layout");
     }
 
     @Test
@@ -92,17 +88,17 @@ public class ResolveTest extends AntBuildsTest {
         File jdocDir = new File(dir, "javadoc");
 
         assertTrue(
-                "aether-api-javadoc was not saved with custom file layout",
-                new File(jdocDir, 
"org.eclipse.aether-aether-api-javadoc.jar").exists());
+                new File(jdocDir, 
"org.eclipse.aether-aether-api-javadoc.jar").exists(),
+                "aether-api-javadoc was not saved with custom file layout");
 
-        assertTrue("found non-javadoc files", 
Arrays.stream(jdocDir.list()).allMatch(f -> f.endsWith("javadoc.jar")));
+        assertTrue(Arrays.stream(jdocDir.list()).allMatch(f -> 
f.endsWith("javadoc.jar")), "found non-javadoc files");
 
         File sourcesDir = new File(dir, "sources");
         assertTrue(
-                "aether-api-sources was not saved with custom file layout",
-                new File(sourcesDir, 
"org.eclipse.aether-aether-api-sources.jar").exists());
+                new File(sourcesDir, 
"org.eclipse.aether-aether-api-sources.jar").exists(),
+                "aether-api-sources was not saved with custom file layout");
         assertTrue(
-                "found non-sources files", 
Arrays.stream(sourcesDir.list()).allMatch(f -> f.endsWith("sources.jar")));
+                Arrays.stream(sourcesDir.list()).allMatch(f -> 
f.endsWith("sources.jar")), "found non-sources files");
     }
 
     @Test
@@ -110,12 +106,12 @@ public class ResolveTest extends AntBuildsTest {
         executeTarget("testResolvePath");
         Map<?, ?> refs = getProject().getReferences();
         Object obj = refs.get("out");
-        assertTrue("ref 'out' is no path", obj instanceof Path);
+        assertTrue(obj instanceof Path, "ref 'out' is no path");
         Path path = (Path) obj;
         String[] elements = path.list();
         assertTrue(
-                "no aether-api on classpath",
-                Arrays.stream(elements).anyMatch(e -> e.contains("aether-api") 
&& e.endsWith(".jar")));
+                Arrays.stream(elements).anyMatch(e -> e.contains("aether-api") 
&& e.endsWith(".jar")),
+                "no aether-api on classpath");
     }
 
     @Test
@@ -123,12 +119,12 @@ public class ResolveTest extends AntBuildsTest {
         executeTarget("testResolveDepsFromFile");
 
         String prop = 
getProject().getProperty("test.resolve.path.org.eclipse.aether:aether-spi:jar");
-        assertNotNull("aether-spi was not resolved as a property", prop);
+        assertNotNull(prop, "aether-spi was not resolved as a property");
         assertTrue(
-                "aether-spi was not resolved to default local repository",
-                prop.contains("aether-spi") && prop.endsWith(".jar"));
+                prop.contains("aether-spi") && prop.endsWith(".jar"),
+                "aether-spi was not resolved to default local repository");
         prop = 
getProject().getProperty("test.resolve.path.org.eclipse.aether:aether-api:jar");
-        assertNull("aether-api was resolved as a property", prop);
+        assertNull(prop, "aether-api was resolved as a property");
     }
 
     @Test
@@ -136,11 +132,11 @@ public class ResolveTest extends AntBuildsTest {
         executeTarget("testResolveNestedDependencyCollections");
 
         String prop = 
getProject().getProperty("test.resolve.path.org.eclipse.aether:aether-spi:jar");
-        assertNotNull("aether-spi was not resolved as a property", prop);
+        assertNotNull(prop, "aether-spi was not resolved as a property");
         prop = 
getProject().getProperty("test.resolve.path.org.eclipse.aether:aether-util:jar");
-        assertNotNull("aether-util was not resolved as a property", prop);
+        assertNotNull(prop, "aether-util was not resolved as a property");
         prop = 
getProject().getProperty("test.resolve.path.org.eclipse.aether:aether-api:jar");
-        assertNull("aether-api was resolved as a property", prop);
+        assertNull(prop, "aether-api was resolved as a property");
     }
 
     @Test
@@ -163,16 +159,16 @@ public class ResolveTest extends AntBuildsTest {
         executeTarget("testResolveTransitiveDependencyManagement");
 
         String prop = 
getProject().getProperty("test.resolve.path.org.slf4j:slf4j-api:jar");
-        assertNotNull("slf4j-api was not resolved as a property", prop);
+        assertNotNull(prop, "slf4j-api was not resolved as a property");
         assertTrue(
-                "slf4j-api was not resolved to default local repository",
-                prop.contains("slf4j-api") && 
prop.endsWith("slf4j-api-2.0.6.jar"));
+                prop.contains("slf4j-api") && 
prop.endsWith("slf4j-api-2.0.6.jar"),
+                "slf4j-api was not resolved to default local repository");
 
         prop = 
getProject().getProperty("test.resolve.path.org.apiguardian:apiguardian-api:jar");
-        assertNotNull("apiguardian-api was not resolved as a property", prop);
+        assertNotNull(prop, "apiguardian-api was not resolved as a property");
         assertTrue(
-                "apiguardian-api was not resolved to default local repository",
-                prop.contains("apiguardian-api") && 
prop.endsWith("apiguardian-api-1.1.1.jar"));
+                prop.contains("apiguardian-api") && 
prop.endsWith("apiguardian-api-1.1.1.jar"),
+                "apiguardian-api was not resolved to default local 
repository");
     }
 
     @Test
@@ -180,15 +176,15 @@ public class ResolveTest extends AntBuildsTest {
         executeTarget("testResolveTransitiveDependencyManagementTestScope");
 
         String prop = 
getProject().getProperty("test.compile.resolve.path.org.slf4j:slf4j-api:jar");
-        assertNotNull("slf4j-api was not resolved as a property", prop);
+        assertNotNull(prop, "slf4j-api was not resolved as a property");
         assertTrue(
-                "slf4j-api was not resolved to default local repository",
-                prop.contains("slf4j-api") && 
prop.endsWith("slf4j-api-2.0.6.jar"));
+                prop.contains("slf4j-api") && 
prop.endsWith("slf4j-api-2.0.6.jar"),
+                "slf4j-api was not resolved to default local repository");
 
         prop = 
getProject().getProperty("test.resolve.path.org.apiguardian:apiguardian-api:jar");
-        assertNotNull("apiguardian-api was not resolved as a property", prop);
+        assertNotNull(prop, "apiguardian-api was not resolved as a property");
         assertTrue(
-                "apiguardian-api was not resolved to default local repository",
-                prop.contains("apiguardian-api") && 
prop.endsWith("apiguardian-api-1.1.1.jar"));
+                prop.contains("apiguardian-api") && 
prop.endsWith("apiguardian-api-1.1.1.jar"),
+                "apiguardian-api was not resolved to default local 
repository");
     }
 }
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/SettingsTest.java 
b/src/test/java/org/apache/maven/resolver/internal/ant/SettingsTest.java
index 4687f3b..9d43606 100644
--- a/src/test/java/org/apache/maven/resolver/internal/ant/SettingsTest.java
+++ b/src/test/java/org/apache/maven/resolver/internal/ant/SettingsTest.java
@@ -21,56 +21,52 @@ package org.apache.maven.resolver.internal.ant;
 import java.io.File;
 import java.io.IOException;
 
-import junit.framework.JUnit4TestAdapter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class SettingsTest extends AntBuildsTest {
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(SettingsTest.class);
-    }
 
     @Test
     public void testUserSettings() {
         executeTarget("testUserSettings");
         assertEquals(
-                "user settings not set",
                 "userSettings.xml",
-                
AntRepoSys.getInstance(getProject()).getUserSettings().getName());
+                
AntRepoSys.getInstance(getProject()).getUserSettings().getName(),
+                "user settings not set");
     }
 
     @Test
     public void testGlobalSettings() {
         executeTarget("testGlobalSettings");
         assertEquals(
-                "global settings not set",
                 "globalSettings.xml",
-                
AntRepoSys.getInstance(getProject()).getGlobalSettings().getName());
+                
AntRepoSys.getInstance(getProject()).getGlobalSettings().getName(),
+                "global settings not set");
     }
 
     @Test
     public void testBothSettings() {
         executeTarget("testBothSettings");
         assertEquals(
-                "global settings not set",
                 "globalSettings.xml",
-                
AntRepoSys.getInstance(getProject()).getGlobalSettings().getName());
+                
AntRepoSys.getInstance(getProject()).getGlobalSettings().getName(),
+                "global settings not set");
         assertEquals(
-                "user settings not set",
                 "userSettings.xml",
-                
AntRepoSys.getInstance(getProject()).getUserSettings().getName());
+                
AntRepoSys.getInstance(getProject()).getUserSettings().getName(),
+                "user settings not set");
     }
 
     @Test
     public void testFallback() throws IOException {
         executeTarget("setUp");
         assertTrue(
-                "no fallback to local settings",
                 AntRepoSys.getInstance(getProject())
                         .getUserSettings()
                         .getAbsolutePath()
-                        .endsWith(".m2" + File.separator + "settings.xml"));
+                        .endsWith(".m2" + File.separator + "settings.xml"),
+                "no fallback to local settings");
     }
 }
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/tasks/CreatePomNoParentDirTest.java
 
b/src/test/java/org/apache/maven/resolver/internal/ant/tasks/CreatePomNoParentDirTest.java
index 16f2542..b8394cb 100644
--- 
a/src/test/java/org/apache/maven/resolver/internal/ant/tasks/CreatePomNoParentDirTest.java
+++ 
b/src/test/java/org/apache/maven/resolver/internal/ant/tasks/CreatePomNoParentDirTest.java
@@ -20,25 +20,21 @@ package org.apache.maven.resolver.internal.ant.tasks;
 
 import java.io.File;
 
-import junit.framework.JUnit4TestAdapter;
 import org.apache.tools.ant.Project;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class CreatePomNoParentDirTest {
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(CreatePomNoParentDirTest.class);
-    }
 
-    @Rule
-    public final TemporaryFolder tempFolder = new TemporaryFolder();
+    @TempDir
+    File tempFolder;
 
     @Test
     public void testPomTargetWithoutParentDirectory() throws Exception {
-        File baseDir = tempFolder.newFolder("base");
+        File baseDir = new File(tempFolder, "base");
+        assertTrue(baseDir.mkdir());
 
         Project project = new Project();
         project.setBaseDir(baseDir);
@@ -54,6 +50,6 @@ public class CreatePomNoParentDirTest {
         task.execute();
 
         File expected = new File(baseDir, "pom.xml");
-        assertTrue("bare pomTarget should write the POM to the project base 
dir: " + expected, expected.exists());
+        assertTrue(expected.exists(), "bare pomTarget should write the POM to 
the project base dir: " + expected);
     }
 }
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/tasks/CreatePomRainyDayTest.java
 
b/src/test/java/org/apache/maven/resolver/internal/ant/tasks/CreatePomRainyDayTest.java
index fead191..7305854 100644
--- 
a/src/test/java/org/apache/maven/resolver/internal/ant/tasks/CreatePomRainyDayTest.java
+++ 
b/src/test/java/org/apache/maven/resolver/internal/ant/tasks/CreatePomRainyDayTest.java
@@ -21,23 +21,22 @@ package org.apache.maven.resolver.internal.ant.tasks;
 import java.io.File;
 import java.io.PrintStream;
 
-import junit.framework.JUnit4TestAdapter;
+import org.apache.maven.resolver.internal.ant.AntBuildFile;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.BuildFileRule;
 import org.apache.tools.ant.DefaultLogger;
 import org.apache.tools.ant.Project;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class CreatePomRainyDayTest {
 
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(CreatePomRainyDayTest.class);
-    }
+    private final AntBuildFile buildRule = new AntBuildFile();
 
-    @Rule
-    public final BuildFileRule buildRule = new BuildFileRule();
+    @AfterEach
+    void tearDown() {
+        buildRule.release();
+    }
 
     public void configureProject(String filename, int logLevel) throws 
BuildException {
         buildRule.configureProject(filename, logLevel);
@@ -63,13 +62,13 @@ public class CreatePomRainyDayTest {
     public void testNoGroupId() {
         configureProject("target/test-classes/ant/createPom/noGroupId.xml", 
Project.MSG_VERBOSE);
         // Expect a BuildException when trying to execute the target
-        Assert.assertThrows(BuildException.class, () -> 
buildRule.executeTarget("setup"));
+        Assertions.assertThrows(BuildException.class, () -> 
buildRule.executeTarget("setup"));
 
         // This should work since the setSkipPomRegistration property is set 
to true
         
configureProject("target/test-classes/ant/createPom/noGroupIdSkipRegistration.xml",
 Project.MSG_VERBOSE);
         buildRule.executeTarget("setup");
         File pomFile = getPomFile();
-        Assert.assertTrue("The pom file should have been created at " + 
pomFile, pomFile.exists());
+        Assertions.assertTrue(pomFile.exists(), "The pom file should have been 
created at " + pomFile);
     }
 
     /**
@@ -81,19 +80,19 @@ public class CreatePomRainyDayTest {
     public void testNoArtifactId() {
         configureProject("target/test-classes/ant/createPom/noArtifactId.xml", 
Project.MSG_VERBOSE);
         // Expect a BuildException when trying to execute the target
-        Assert.assertThrows(BuildException.class, () -> 
buildRule.executeTarget("setup"));
+        Assertions.assertThrows(BuildException.class, () -> 
buildRule.executeTarget("setup"));
 
         // This should work since the setSkipPomRegistration property is set 
to true
         
configureProject("target/test-classes/ant/createPom/noArtifactIdSkipRegistration.xml",
 Project.MSG_VERBOSE);
         buildRule.executeTarget("setup");
         File pomFile = getPomFile();
-        Assert.assertTrue("The pom file should have been created at " + 
pomFile, pomFile.exists());
+        Assertions.assertTrue(pomFile.exists(), "The pom file should have been 
created at " + pomFile);
     }
 
     private File getPomFile() {
         Project project = buildRule.getProject();
         String pomPath = 
project.replaceProperties(project.getProperty("pomFile"));
-        Assert.assertNotNull("pomFile property should not be null", pomPath);
+        Assertions.assertNotNull(pomPath, "pomFile property should not be 
null");
         return new File(pomPath);
     }
 }
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/tasks/CreatePomTest.java 
b/src/test/java/org/apache/maven/resolver/internal/ant/tasks/CreatePomTest.java
index 012159d..b4894e6 100644
--- 
a/src/test/java/org/apache/maven/resolver/internal/ant/tasks/CreatePomTest.java
+++ 
b/src/test/java/org/apache/maven/resolver/internal/ant/tasks/CreatePomTest.java
@@ -24,7 +24,6 @@ import java.io.IOException;
 import java.io.Reader;
 import java.util.List;
 
-import junit.framework.JUnit4TestAdapter;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.Developer;
@@ -35,13 +34,10 @@ import org.apache.maven.model.Scm;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.resolver.internal.ant.AntBuildsTest;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class CreatePomTest extends AntBuildsTest {
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(CreatePomTest.class);
-    }
 
     public CreatePomTest() {
         super(new 
File("target/test-classes/ant/DependencyManagement/build.xml"));
@@ -52,70 +48,66 @@ public class CreatePomTest extends AntBuildsTest {
         executeTarget("setup");
         String pomPath = getProject().getProperty("pomFile");
 
-        Assert.assertNotNull("pomFile property should not be null", pomPath);
+        Assertions.assertNotNull(pomPath, "pomFile property should not be 
null");
         File pomFile = new File(pomPath);
 
         Model model = readPomFile(pomFile);
-        Assert.assertNotNull("Model should not be null", model);
-        Assert.assertEquals("modelVersion", "4.0.0", model.getModelVersion());
-        Assert.assertEquals("groupId", "test.resolver.dm", model.getGroupId());
-        Assert.assertEquals("artifactId", "dependency-management", 
model.getArtifactId());
-        Assert.assertEquals("version", "1.0-SNAPSHOT", model.getVersion());
+        Assertions.assertNotNull(model, "Model should not be null");
+        Assertions.assertEquals("4.0.0", model.getModelVersion(), 
"modelVersion");
+        Assertions.assertEquals("test.resolver.dm", model.getGroupId(), 
"groupId");
+        Assertions.assertEquals("dependency-management", 
model.getArtifactId(), "artifactId");
+        Assertions.assertEquals("1.0-SNAPSHOT", model.getVersion(), "version");
         DependencyManagement dm = model.getDependencyManagement();
         List<Dependency> dependencies = dm.getDependencies();
-        Assert.assertEquals("dependencies should have 2 entries", 2, 
dependencies.size());
+        Assertions.assertEquals(2, dependencies.size(), "dependencies should 
have 2 entries");
         Dependency matrix = dependencies.get(0);
-        Assert.assertEquals("matrix dependency groupId", "se.alipsa.matrix", 
matrix.getGroupId());
-        Assert.assertEquals("matrix dependency artifactId", "matrix-bom", 
matrix.getArtifactId());
-        Assert.assertEquals("matrix dependency version", "2.2.0", 
matrix.getVersion());
-        Assert.assertEquals("matrix dependency type", "pom", matrix.getType());
-        Assert.assertEquals("matrix dependency scope", "import", 
matrix.getScope());
+        Assertions.assertEquals("se.alipsa.matrix", matrix.getGroupId(), 
"matrix dependency groupId");
+        Assertions.assertEquals("matrix-bom", matrix.getArtifactId(), "matrix 
dependency artifactId");
+        Assertions.assertEquals("2.2.0", matrix.getVersion(), "matrix 
dependency version");
+        Assertions.assertEquals("pom", matrix.getType(), "matrix dependency 
type");
+        Assertions.assertEquals("import", matrix.getScope(), "matrix 
dependency scope");
 
         License license = model.getLicenses().get(0);
-        Assert.assertEquals("license name should match", "The Apache Software 
License, Version 2.0", license.getName());
-        Assert.assertEquals(
-                "license url should match", 
"http://www.apache.org/licenses/LICENSE-2.0.txt";, license.getUrl());
-        Assert.assertEquals("license distribution should match", "repo", 
license.getDistribution());
+        Assertions.assertEquals(
+                "The Apache Software License, Version 2.0", license.getName(), 
"license name should match");
+        Assertions.assertEquals(
+                "http://www.apache.org/licenses/LICENSE-2.0.txt";, 
license.getUrl(), "license url should match");
+        Assertions.assertEquals("repo", license.getDistribution(), "license 
distribution should match");
 
         Repository repo = model.getRepositories().get(0);
-        Assert.assertEquals("repository id should match", "my-internal-site", 
repo.getId());
-        Assert.assertEquals("repository url should match", 
"https://myserver/repo";, repo.getUrl());
-        Assert.assertEquals("repository layout should match", "default", 
repo.getLayout());
-        Assert.assertTrue(
-                "repository snapshots should be enabled", 
repo.getSnapshots().isEnabled());
-        Assert.assertTrue(
-                "repository releases should be enabled", 
repo.getReleases().isEnabled());
+        Assertions.assertEquals("my-internal-site", repo.getId(), "repository 
id should match");
+        Assertions.assertEquals("https://myserver/repo";, repo.getUrl(), 
"repository url should match");
+        Assertions.assertEquals("default", repo.getLayout(), "repository 
layout should match");
+        Assertions.assertTrue(repo.getSnapshots().isEnabled(), "repository 
snapshots should be enabled");
+        Assertions.assertTrue(repo.getReleases().isEnabled(), "repository 
releases should be enabled");
 
         List<Developer> developers = model.getDevelopers();
-        Assert.assertEquals("developers should have 1 entry", 1, 
developers.size());
+        Assertions.assertEquals(1, developers.size(), "developers should have 
1 entry");
         Developer developer = developers.get(0);
-        Assert.assertEquals("developer id should match", "jdoe", 
developer.getId());
-        Assert.assertEquals("developer name should match", "John Doe", 
developer.getName());
-        Assert.assertEquals("developer email should match", 
"[email protected]", developer.getEmail());
-        Assert.assertEquals("developer url should match", 
"http://www.example.com/jdoe";, developer.getUrl());
-        Assert.assertEquals("developer organization should match", "ACME", 
developer.getOrganization());
-        Assert.assertEquals(
-                "developers organizationUrl should match", 
"http://www.example.com";, developer.getOrganizationUrl());
-        Assert.assertEquals(
-                "developer should have 2 roles", 2, 
developer.getRoles().size());
-        Assert.assertTrue(
-                "developer should have an architect role", 
developer.getRoles().contains("architect"));
-        Assert.assertTrue(
-                "developer should have a developer role", 
developer.getRoles().contains("developer"));
-        Assert.assertEquals("developer timezone should match", 
"America/New_York", developer.getTimezone());
+        Assertions.assertEquals("jdoe", developer.getId(), "developer id 
should match");
+        Assertions.assertEquals("John Doe", developer.getName(), "developer 
name should match");
+        Assertions.assertEquals("[email protected]", developer.getEmail(), 
"developer email should match");
+        Assertions.assertEquals("http://www.example.com/jdoe";, 
developer.getUrl(), "developer url should match");
+        Assertions.assertEquals("ACME", developer.getOrganization(), 
"developer organization should match");
+        Assertions.assertEquals(
+                "http://www.example.com";, developer.getOrganizationUrl(), 
"developers organizationUrl should match");
+        Assertions.assertEquals(2, developer.getRoles().size(), "developer 
should have 2 roles");
+        Assertions.assertTrue(developer.getRoles().contains("architect"), 
"developer should have an architect role");
+        Assertions.assertTrue(developer.getRoles().contains("developer"), 
"developer should have a developer role");
+        Assertions.assertEquals("America/New_York", developer.getTimezone(), 
"developer timezone should match");
 
         Scm scm = model.getScm();
-        Assert.assertEquals(
-                "Scm connection should match", 
"scm:svn:http://127.0.0.1/svn/my-project";, scm.getConnection());
-        Assert.assertEquals(
-                "Scm developerConnection should match",
+        Assertions.assertEquals(
+                "scm:svn:http://127.0.0.1/svn/my-project";, 
scm.getConnection(), "Scm connection should match");
+        Assertions.assertEquals(
                 "scm:svn:https://127.0.0.1/svn/my-project";,
-                scm.getDeveloperConnection());
-        Assert.assertEquals("Scm url should match", 
"http://127.0.0.1/websvn/my-project";, scm.getUrl());
+                scm.getDeveloperConnection(),
+                "Scm developerConnection should match");
+        Assertions.assertEquals("http://127.0.0.1/websvn/my-project";, 
scm.getUrl(), "Scm url should match");
     }
 
     public static Model readPomFile(File pomFile) throws IOException, 
XmlPullParserException {
-        Assert.assertTrue("pomFile (" + pomFile + ") should exist", 
pomFile.exists());
+        Assertions.assertTrue(pomFile.exists(), "pomFile (" + pomFile + ") 
should exist");
         try (Reader reader = new FileReader(pomFile)) {
             MavenXpp3Reader pomReader = new MavenXpp3Reader();
             return pomReader.read(reader);
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/tasks/LayoutTest.java 
b/src/test/java/org/apache/maven/resolver/internal/ant/tasks/LayoutTest.java
index c43450c..511062e 100644
--- a/src/test/java/org/apache/maven/resolver/internal/ant/tasks/LayoutTest.java
+++ b/src/test/java/org/apache/maven/resolver/internal/ant/tasks/LayoutTest.java
@@ -18,23 +18,20 @@
  */
 package org.apache.maven.resolver.internal.ant.tasks;
 
-import junit.framework.JUnit4TestAdapter;
 import org.apache.tools.ant.BuildException;
 import org.eclipse.aether.artifact.DefaultArtifact;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  */
 public class LayoutTest {
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(LayoutTest.class);
-    }
 
-    @Test(expected = BuildException.class)
+    @Test
     public void testUnknownVariable() {
-        new Layout("{unknown}");
+        assertThrows(BuildException.class, () -> new Layout("{unknown}"));
     }
 
     @Test
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/types/DependencyManagementTest.java
 
b/src/test/java/org/apache/maven/resolver/internal/ant/types/DependencyManagementTest.java
index 8c72c56..c54869e 100644
--- 
a/src/test/java/org/apache/maven/resolver/internal/ant/types/DependencyManagementTest.java
+++ 
b/src/test/java/org/apache/maven/resolver/internal/ant/types/DependencyManagementTest.java
@@ -20,17 +20,13 @@ package org.apache.maven.resolver.internal.ant.types;
 
 import java.io.File;
 
-import junit.framework.JUnit4TestAdapter;
 import org.apache.maven.resolver.internal.ant.AntBuildsTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class DependencyManagementTest extends AntBuildsTest {
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(DependencyManagementTest.class);
-    }
 
     public DependencyManagementTest() {
         super(new 
File("src/test/resources/ant/DependencyManagement/build.xml"));
@@ -40,17 +36,14 @@ public class DependencyManagementTest extends AntBuildsTest 
{
     public void testDependencyManagement() {
         executeTarget("init");
         DependencyManagement dm = getProject().getReference("dm");
-        assertNotNull("Dependency management with id 'dm' should exists", dm);
-        assertEquals(
-                "Should have 2 dependencies defined",
-                2,
-                dm.getDependencies().getDependencyContainers().size());
+        assertNotNull(dm, "Dependency management with id 'dm' should exists");
+        assertEquals(2, dm.getDependencies().getDependencyContainers().size(), 
"Should have 2 dependencies defined");
         Dependency dep1 =
                 (Dependency) 
dm.getDependencies().getDependencyContainers().get(0);
-        assertEquals("groupId should match", "se.alipsa.matrix", 
dep1.getGroupId());
-        assertEquals("artifactId should match", "matrix-bom", 
dep1.getArtifactId());
-        assertEquals("version should match", "2.2.0", dep1.getVersion());
-        assertEquals("type should match", "pom", dep1.getType());
-        assertEquals("scope should match", "import", dep1.getScope());
+        assertEquals("se.alipsa.matrix", dep1.getGroupId(), "groupId should 
match");
+        assertEquals("matrix-bom", dep1.getArtifactId(), "artifactId should 
match");
+        assertEquals("2.2.0", dep1.getVersion(), "version should match");
+        assertEquals("pom", dep1.getType(), "type should match");
+        assertEquals("import", dep1.getScope(), "scope should match");
     }
 }
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/types/DependencyTest.java
 
b/src/test/java/org/apache/maven/resolver/internal/ant/types/DependencyTest.java
index f97b560..f655f37 100644
--- 
a/src/test/java/org/apache/maven/resolver/internal/ant/types/DependencyTest.java
+++ 
b/src/test/java/org/apache/maven/resolver/internal/ant/types/DependencyTest.java
@@ -18,17 +18,13 @@
  */
 package org.apache.maven.resolver.internal.ant.types;
 
-import junit.framework.JUnit4TestAdapter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
 public class DependencyTest {
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(DependencyTest.class);
-    }
 
     @Test
     public void testSetCoordsGidAidVer() {
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/types/ExclusionTest.java 
b/src/test/java/org/apache/maven/resolver/internal/ant/types/ExclusionTest.java
index 7988fbc..1783f89 100644
--- 
a/src/test/java/org/apache/maven/resolver/internal/ant/types/ExclusionTest.java
+++ 
b/src/test/java/org/apache/maven/resolver/internal/ant/types/ExclusionTest.java
@@ -18,17 +18,13 @@
  */
 package org.apache.maven.resolver.internal.ant.types;
 
-import junit.framework.JUnit4TestAdapter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
 public class ExclusionTest {
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(ExclusionTest.class);
-    }
 
     @Test
     public void testSetCoordsGid() {
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/types/PomTest.java 
b/src/test/java/org/apache/maven/resolver/internal/ant/types/PomTest.java
index 6758fe4..cd30edc 100644
--- a/src/test/java/org/apache/maven/resolver/internal/ant/types/PomTest.java
+++ b/src/test/java/org/apache/maven/resolver/internal/ant/types/PomTest.java
@@ -18,17 +18,13 @@
  */
 package org.apache.maven.resolver.internal.ant.types;
 
-import junit.framework.JUnit4TestAdapter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  */
 public class PomTest {
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(PomTest.class);
-    }
 
     @Test
     public void testSetCoordsGid() {
diff --git 
a/src/test/java/org/apache/maven/resolver/internal/ant/types/SettingsReferenceTest.java
 
b/src/test/java/org/apache/maven/resolver/internal/ant/types/SettingsReferenceTest.java
index 63d531a..c713f61 100644
--- 
a/src/test/java/org/apache/maven/resolver/internal/ant/types/SettingsReferenceTest.java
+++ 
b/src/test/java/org/apache/maven/resolver/internal/ant/types/SettingsReferenceTest.java
@@ -20,18 +20,14 @@ package org.apache.maven.resolver.internal.ant.types;
 
 import java.io.File;
 
-import junit.framework.JUnit4TestAdapter;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Reference;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class SettingsReferenceTest {
-    public static junit.framework.Test suite() {
-        return new JUnit4TestAdapter(SettingsReferenceTest.class);
-    }
 
     private Project project;
 
@@ -41,7 +37,7 @@ public class SettingsReferenceTest {
 
     private File globalFile;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         project = new Project();
         userFile = new File("user-settings.xml");
@@ -65,7 +61,7 @@ public class SettingsReferenceTest {
         ref.setProject(project);
         ref.setRefid(new Reference(project, "settings-id"));
 
-        assertEquals("global file should come from the referenced settings", 
globalFile, ref.getGlobalFile());
+        assertEquals(globalFile, ref.getGlobalFile(), "global file should come 
from the referenced settings");
     }
 
     /**
@@ -77,6 +73,6 @@ public class SettingsReferenceTest {
         ref.setProject(project);
         ref.setRefid(new Reference(project, "settings-id"));
 
-        assertEquals("user file should come from the referenced settings", 
userFile, ref.getFile());
+        assertEquals(userFile, ref.getFile(), "user file should come from the 
referenced settings");
     }
 }

Reply via email to