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.git
commit 349d0d0b0a2657d41be5ec5cfa4846850af97962 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Sat Oct 31 13:32:49 2026 +0000 Run the IT fixtures on JUnit 5 --- .../test/java/org/apache/maven/it/TestCase.java | 2 +- .../mng-4660-outdated-packaged-artifact/pom.xml | 6 ++-- .../test/java/org/apache/maven/it/TestCase.java | 4 +-- .../test/resources/mng-4660-resume-from/pom.xml | 6 ++-- .../test/java/org/apache/maven/it/TestCase.java | 4 +-- .../test/java/org/apache/maven/it/TestCase.java | 4 +-- .../test/java/org/apache/maven/it/TestCase.java | 4 +-- .../test/java/org/apache/maven/it/TestCase.java | 4 +-- .../mng-5760-resume-feature/four-modules/pom.xml | 6 ++-- .../test/java/org/apache/maven/it/TestCase.java | 4 +-- .../test/java/org/apache/maven/it/TestCase.java | 4 +-- .../test/java/org/apache/maven/it/TestCase.java | 4 +-- .../parent-dependent/pom.xml | 6 ++-- .../parent-independent/module-a/pom.xml | 6 ++-- .../test/java/org/apache/maven/it/TestCase.java | 4 +-- .../parent-independent/module-b/pom.xml | 6 ++-- .../test/java/org/apache/maven/it/TestCase.java | 4 +-- .../src/test/resources/mng-6071/pom.xml | 6 ++-- .../src/test/java/com/mycompany/app/AppTest.java | 4 +-- .../resources/mng-6720-fail-fast/module-1/pom.xml | 6 ++-- .../src/test/java/mng6720/Module1Test.java | 2 +- .../resources/mng-6720-fail-fast/module-2/pom.xml | 6 ++-- .../src/test/java/mng6720/Module2Test.java | 2 +- .../resources/mng-6720-fail-fast/module-3/pom.xml | 6 ++-- .../src/test/java/mng6720/Module3Test.java | 2 +- .../child-a/pom.xml | 4 +-- .../org/apache/maven/its/mng6754/DelayingTest.java | 2 +- .../child-b/pom.xml | 4 +-- .../org/apache/maven/its/mng6754/DelayingTest.java | 2 +- .../pom.xml | 6 ++-- .../mng-8750-new-scopes/compile-only-test/pom.xml | 4 +-- .../apache/maven/its/mng8750/CompileOnlyTest.java | 10 +++---- .../mng-8750-new-scopes/comprehensive-test/pom.xml | 4 +-- .../maven/its/mng8750/ComprehensiveTest.java | 32 +++++++++++----------- .../src/test/resources/mng-8750-new-scopes/pom.xml | 6 ++-- .../mng-8750-new-scopes/test-only-test/pom.xml | 4 +-- .../org/apache/maven/its/mng8750/TestOnlyTest.java | 17 ++++++------ .../mng-8750-new-scopes/test-runtime-test/pom.xml | 4 +-- .../apache/maven/its/mng8750/TestRuntimeTest.java | 27 +++++++++--------- 39 files changed, 118 insertions(+), 120 deletions(-) diff --git a/its/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/test/java/org/apache/maven/it/TestCase.java b/its/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/test/java/org/apache/maven/it/TestCase.java index d7de31bf7f..717056ecf4 100644 --- a/its/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/test/java/org/apache/maven/it/TestCase.java +++ b/its/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/test/java/org/apache/maven/it/TestCase.java @@ -37,7 +37,7 @@ * under the License. */ -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestCase { @Test diff --git a/its/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/pom.xml b/its/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/pom.xml index f0f8eb77d8..4163044f2c 100644 --- a/its/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/pom.xml @@ -43,9 +43,9 @@ under the License. <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <version>5.14.4</version> <scope>test</scope> </dependency> </dependencies> diff --git a/its/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java b/its/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java index a0809f7ba2..8988115c81 100644 --- a/its/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java +++ b/its/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java @@ -37,9 +37,9 @@ * under the License. */ -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class TestCase { @Test diff --git a/its/core-it-suite/src/test/resources/mng-4660-resume-from/pom.xml b/its/core-it-suite/src/test/resources/mng-4660-resume-from/pom.xml index 31313842d3..26a80d9466 100644 --- a/its/core-it-suite/src/test/resources/mng-4660-resume-from/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-4660-resume-from/pom.xml @@ -43,9 +43,9 @@ under the License. <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <version>5.14.4</version> <scope>test</scope> </dependency> </dependencies> diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-a/src/test/java/org/apache/maven/it/TestCase.java b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-a/src/test/java/org/apache/maven/it/TestCase.java index 60903cfda4..aa413f925d 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-a/src/test/java/org/apache/maven/it/TestCase.java +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-a/src/test/java/org/apache/maven/it/TestCase.java @@ -37,9 +37,9 @@ * under the License. */ -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class TestCase { @Test diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-b/src/test/java/org/apache/maven/it/TestCase.java b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-b/src/test/java/org/apache/maven/it/TestCase.java index 36ab8f46c7..8a9e0b7029 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-b/src/test/java/org/apache/maven/it/TestCase.java +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-b/src/test/java/org/apache/maven/it/TestCase.java @@ -37,9 +37,9 @@ * under the License. */ -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class TestCase { @Test diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-c/src/test/java/org/apache/maven/it/TestCase.java b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-c/src/test/java/org/apache/maven/it/TestCase.java index 0197c4271e..9154236a03 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-c/src/test/java/org/apache/maven/it/TestCase.java +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-c/src/test/java/org/apache/maven/it/TestCase.java @@ -37,9 +37,9 @@ * under the License. */ -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class TestCase { @Test diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-d/src/test/java/org/apache/maven/it/TestCase.java b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-d/src/test/java/org/apache/maven/it/TestCase.java index 5fe9225834..c5c307866f 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-d/src/test/java/org/apache/maven/it/TestCase.java +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-d/src/test/java/org/apache/maven/it/TestCase.java @@ -37,9 +37,9 @@ * under the License. */ -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class TestCase { @Test diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/pom.xml b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/pom.xml index 4103e73737..a94ab2b0d4 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/pom.xml @@ -44,9 +44,9 @@ under the License. <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <version>5.14.4</version> <scope>test</scope> </dependency> </dependencies> diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-a/src/test/java/org/apache/maven/it/TestCase.java b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-a/src/test/java/org/apache/maven/it/TestCase.java index c18b1e92b6..32d1d78ff3 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-a/src/test/java/org/apache/maven/it/TestCase.java +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-a/src/test/java/org/apache/maven/it/TestCase.java @@ -37,9 +37,9 @@ * under the License. */ -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class TestCase { @Test diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-b/src/test/java/org/apache/maven/it/TestCase.java b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-b/src/test/java/org/apache/maven/it/TestCase.java index 3991f60ecf..8bd8436960 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-b/src/test/java/org/apache/maven/it/TestCase.java +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-b/src/test/java/org/apache/maven/it/TestCase.java @@ -37,9 +37,9 @@ * under the License. */ -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class TestCase { @Test diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-c/src/test/java/org/apache/maven/it/TestCase.java b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-c/src/test/java/org/apache/maven/it/TestCase.java index f0e4fe85f1..8b22fa13bb 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-c/src/test/java/org/apache/maven/it/TestCase.java +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-c/src/test/java/org/apache/maven/it/TestCase.java @@ -37,9 +37,9 @@ * under the License. */ -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class TestCase { @Test diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/pom.xml b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/pom.xml index 549940f712..a99f9ead2c 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/pom.xml @@ -43,9 +43,9 @@ under the License. <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <version>5.14.4</version> <scope>test</scope> </dependency> </dependencies> diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-a/pom.xml b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-a/pom.xml index 952078d103..08a5db711c 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-a/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-a/pom.xml @@ -27,9 +27,9 @@ under the License. <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <version>5.14.4</version> <scope>test</scope> </dependency> </dependencies> diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-a/src/test/java/org/apache/maven/it/TestCase.java b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-a/src/test/java/org/apache/maven/it/TestCase.java index c18b1e92b6..32d1d78ff3 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-a/src/test/java/org/apache/maven/it/TestCase.java +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-a/src/test/java/org/apache/maven/it/TestCase.java @@ -37,9 +37,9 @@ * under the License. */ -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class TestCase { @Test diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-b/pom.xml b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-b/pom.xml index 868d9e82fd..edf54f43b2 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-b/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-b/pom.xml @@ -27,9 +27,9 @@ under the License. <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <version>5.14.4</version> <scope>test</scope> </dependency> </dependencies> diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-b/src/test/java/org/apache/maven/it/TestCase.java b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-b/src/test/java/org/apache/maven/it/TestCase.java index 3991f60ecf..8bd8436960 100644 --- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-b/src/test/java/org/apache/maven/it/TestCase.java +++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-b/src/test/java/org/apache/maven/it/TestCase.java @@ -37,9 +37,9 @@ * under the License. */ -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class TestCase { @Test diff --git a/its/core-it-suite/src/test/resources/mng-6071/pom.xml b/its/core-it-suite/src/test/resources/mng-6071/pom.xml index cee6ebdb46..ec888861d6 100644 --- a/its/core-it-suite/src/test/resources/mng-6071/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6071/pom.xml @@ -16,9 +16,9 @@ <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <version>5.14.4</version> <scope>test</scope> </dependency> </dependencies> diff --git a/its/core-it-suite/src/test/resources/mng-6071/src/test/java/com/mycompany/app/AppTest.java b/its/core-it-suite/src/test/resources/mng-6071/src/test/java/com/mycompany/app/AppTest.java index e023687e76..d07985f582 100644 --- a/its/core-it-suite/src/test/resources/mng-6071/src/test/java/com/mycompany/app/AppTest.java +++ b/its/core-it-suite/src/test/resources/mng-6071/src/test/java/com/mycompany/app/AppTest.java @@ -39,9 +39,9 @@ import java.net.URL; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * Unit test for simple App. diff --git a/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/pom.xml b/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/pom.xml index b84b014f0c..d7f521771f 100644 --- a/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/pom.xml @@ -26,9 +26,9 @@ <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <version>5.14.4</version> <scope>test</scope> </dependency> </dependencies> diff --git a/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/src/test/java/mng6720/Module1Test.java b/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/src/test/java/mng6720/Module1Test.java index adfe44e68c..b45d091f6e 100644 --- a/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/src/test/java/mng6720/Module1Test.java +++ b/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-1/src/test/java/mng6720/Module1Test.java @@ -18,7 +18,7 @@ */ package mng6720; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Module1Test { @Test diff --git a/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/pom.xml b/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/pom.xml index 05132591a0..75cfef1370 100644 --- a/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/pom.xml @@ -26,9 +26,9 @@ <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <version>5.14.4</version> <scope>test</scope> </dependency> </dependencies> diff --git a/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/src/test/java/mng6720/Module2Test.java b/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/src/test/java/mng6720/Module2Test.java index 7056e6a010..47c1234053 100644 --- a/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/src/test/java/mng6720/Module2Test.java +++ b/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-2/src/test/java/mng6720/Module2Test.java @@ -18,7 +18,7 @@ */ package mng6720; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Module2Test { @Test diff --git a/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/pom.xml b/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/pom.xml index 5a155c0e96..26600b45d7 100644 --- a/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/pom.xml @@ -26,9 +26,9 @@ <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <version>5.14.4</version> <scope>test</scope> </dependency> <dependency> diff --git a/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/src/test/java/mng6720/Module3Test.java b/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/src/test/java/mng6720/Module3Test.java index 9118076e5c..9e2afa0944 100644 --- a/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/src/test/java/mng6720/Module3Test.java +++ b/its/core-it-suite/src/test/resources/mng-6720-fail-fast/module-3/src/test/java/mng6720/Module3Test.java @@ -18,7 +18,7 @@ */ package mng6720; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Module3Test { @Test diff --git a/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-a/pom.xml b/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-a/pom.xml index 6087edc8db..91a04e0204 100644 --- a/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-a/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-a/pom.xml @@ -29,8 +29,8 @@ under the License. <name>Maven Integration Test :: Child A</name> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> </dependency> </dependencies> <build> diff --git a/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-a/src/test/java/org/apache/maven/its/mng6754/DelayingTest.java b/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-a/src/test/java/org/apache/maven/its/mng6754/DelayingTest.java index 1afc9dd93b..c934c24fac 100644 --- a/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-a/src/test/java/org/apache/maven/its/mng6754/DelayingTest.java +++ b/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-a/src/test/java/org/apache/maven/its/mng6754/DelayingTest.java @@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DelayingTest { @Test diff --git a/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-b/pom.xml b/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-b/pom.xml index a520d277b7..eacf02f18b 100644 --- a/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-b/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-b/pom.xml @@ -29,8 +29,8 @@ under the License. <name>Maven Integration Test :: Child B</name> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> </dependency> </dependencies> <build> diff --git a/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-b/src/test/java/org/apache/maven/its/mng6754/DelayingTest.java b/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-b/src/test/java/org/apache/maven/its/mng6754/DelayingTest.java index 1afc9dd93b..c934c24fac 100644 --- a/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-b/src/test/java/org/apache/maven/its/mng6754/DelayingTest.java +++ b/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/child-b/src/test/java/org/apache/maven/its/mng6754/DelayingTest.java @@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DelayingTest { @Test diff --git a/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/pom.xml b/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/pom.xml index 9a9bc22ac8..b7e75df1c3 100644 --- a/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-6754-version-timestamp-in-multimodule-build/pom.xml @@ -52,9 +52,9 @@ under the License. <dependencyManagement> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <version>5.14.4</version> <scope>test</scope> </dependency> </dependencies> diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/compile-only-test/pom.xml b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/compile-only-test/pom.xml index 5295a1978f..934f2f1566 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/compile-only-test/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/compile-only-test/pom.xml @@ -43,8 +43,8 @@ under the License. <!-- Test dependency --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/compile-only-test/src/test/java/org/apache/maven/its/mng8750/CompileOnlyTest.java b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/compile-only-test/src/test/java/org/apache/maven/its/mng8750/CompileOnlyTest.java index 8bba718bc0..7a149a672b 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/compile-only-test/src/test/java/org/apache/maven/its/mng8750/CompileOnlyTest.java +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/compile-only-test/src/test/java/org/apache/maven/its/mng8750/CompileOnlyTest.java @@ -18,8 +18,8 @@ */ package org.apache.maven.its.mng8750; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * Test class to verify compile-only scope behavior. @@ -33,7 +33,7 @@ public class CompileOnlyTest { public void testCompileDependencyAvailableAtRuntime() { CompileOnlyExample example = new CompileOnlyExample(); String result = example.useCompileDep(); - Assert.assertTrue("Compile dependency should be available", result.contains("Used compile dependency")); + Assertions.assertTrue(result.contains("Used compile dependency"), "Compile dependency should be available"); } /** @@ -43,7 +43,7 @@ public void testCompileDependencyAvailableAtRuntime() { public void testCompileOnlyDependencyCallableAtRuntime() { CompileOnlyExample example = new CompileOnlyExample(); String result = example.useCompileOnlyDep(); - Assert.assertTrue("Compile-only dependency should be callable", result.contains("Compile-only dependency")); + Assertions.assertTrue(result.contains("Compile-only dependency"), "Compile-only dependency should be callable"); } /** @@ -56,7 +56,7 @@ public void testMainMethodBehavior() { try { CompileOnlyExample.main(new String[0]); } catch (Exception e) { - Assert.fail("Main method should handle compile-only dependency gracefully: " + e.getMessage()); + Assertions.fail("Main method should handle compile-only dependency gracefully: " + e.getMessage()); } } } diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/comprehensive-test/pom.xml b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/comprehensive-test/pom.xml index b328285b7a..e8d3068cce 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/comprehensive-test/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/comprehensive-test/pom.xml @@ -61,8 +61,8 @@ under the License. <!-- JUnit for testing --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/comprehensive-test/src/test/java/org/apache/maven/its/mng8750/ComprehensiveTest.java b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/comprehensive-test/src/test/java/org/apache/maven/its/mng8750/ComprehensiveTest.java index abee81d09e..a195c35d6d 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/comprehensive-test/src/test/java/org/apache/maven/its/mng8750/ComprehensiveTest.java +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/comprehensive-test/src/test/java/org/apache/maven/its/mng8750/ComprehensiveTest.java @@ -20,8 +20,8 @@ import org.apache.maven.its.mng8750.deps.TestDep; import org.apache.maven.its.mng8750.deps.TestOnlyDep; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * Comprehensive test class that verifies all new Maven 4 scopes work correctly together. @@ -37,11 +37,11 @@ public void testCompileOnlyScope() { // Regular compile dependency should work String result = example.useCompileDep(); - Assert.assertTrue("Compile dependency should be available", result.contains("Used compile dependency")); + Assertions.assertTrue(result.contains("Used compile dependency"), "Compile dependency should be available"); // Compile-only dependency is callable at runtime under current behavior String co = example.useCompileOnlyDep(); - Assert.assertTrue(co.contains("Compile-only dependency")); + Assertions.assertTrue(co.contains("Compile-only dependency")); } /** @@ -52,10 +52,10 @@ public void testTestOnlyScope() { // Test-only dependency should be available during test compilation // (proven by the fact that we can import and use it here) TestOnlyDep testOnlyDep = new TestOnlyDep(); - Assert.assertNotNull("Test-only dependency should be available during test compilation", testOnlyDep); + Assertions.assertNotNull(testOnlyDep, "Test-only dependency should be available during test compilation"); // And it is available at test runtime in this setup - Assert.assertNotNull(testOnlyDep.getMessage()); + Assertions.assertNotNull(testOnlyDep.getMessage()); } /** @@ -70,16 +70,16 @@ public void testTestRuntimeScope() { Object dep = testRuntimeDepClass.getDeclaredConstructor().newInstance(); String result = (String) testRuntimeDepClass.getMethod("getMessage").invoke(dep); - Assert.assertTrue( - "Test-runtime dependency should be available at test runtime", - result.contains("Test runtime dependency")); + Assertions.assertTrue( + result.contains("Test runtime dependency"), + "Test-runtime dependency should be available at test runtime"); System.out.println("Test-runtime scope verification: PASSED"); } catch (ClassNotFoundException e) { - Assert.fail("Test-runtime dependency should be available at test runtime: " + e.getMessage()); + Assertions.fail("Test-runtime dependency should be available at test runtime: " + e.getMessage()); } catch (Exception e) { - Assert.fail("Error accessing test-runtime dependency: " + e.getMessage()); + Assertions.fail("Error accessing test-runtime dependency: " + e.getMessage()); } } @@ -91,8 +91,8 @@ public void testRegularTestScope() { // Regular test dependency should be available during both compilation and runtime TestDep testDep = new TestDep(); String result = testDep.getMessage(); - Assert.assertNotNull("Test dependency should be available", result); - Assert.assertTrue(result.toLowerCase().contains("test dependency")); + Assertions.assertNotNull(result, "Test dependency should be available"); + Assertions.assertTrue(result.toLowerCase().contains("test dependency")); } /** @@ -128,9 +128,9 @@ public void testAllScopesTogether() { // Test-runtime dependency should be available } - Assert.assertTrue("Compile-only scope should work correctly", compileOnlyPassed); - Assert.assertTrue("Test-only scope should work correctly", testOnlyPassed); - Assert.assertTrue("Test-runtime scope should work correctly", testRuntimePassed); + Assertions.assertTrue(compileOnlyPassed, "Compile-only scope should work correctly"); + Assertions.assertTrue(testOnlyPassed, "Test-only scope should work correctly"); + Assertions.assertTrue(testRuntimePassed, "Test-runtime scope should work correctly"); System.out.println("All scope verifications: PASSED"); } diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/pom.xml b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/pom.xml index 1103663836..655f35be96 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/pom.xml @@ -35,9 +35,9 @@ under the License. <dependencyManagement> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.13.2</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <version>5.14.4</version> <scope>test</scope> </dependency> </dependencies> diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-only-test/pom.xml b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-only-test/pom.xml index cbcaa25919..817eefab57 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-only-test/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-only-test/pom.xml @@ -43,8 +43,8 @@ under the License. <!-- JUnit for testing --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-only-test/src/test/java/org/apache/maven/its/mng8750/TestOnlyTest.java b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-only-test/src/test/java/org/apache/maven/its/mng8750/TestOnlyTest.java index d9ae073542..da2dfcf287 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-only-test/src/test/java/org/apache/maven/its/mng8750/TestOnlyTest.java +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-only-test/src/test/java/org/apache/maven/its/mng8750/TestOnlyTest.java @@ -20,8 +20,8 @@ import org.apache.maven.its.mng8750.deps.TestDep; import org.apache.maven.its.mng8750.deps.TestOnlyDep; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * Test class to verify test-only scope behavior. @@ -37,9 +37,8 @@ public class TestOnlyTest { public void testTestDependencyAvailableAtTestRuntime() { TestDep dep = new TestDep(); String result = dep.getMessage(); - Assert.assertNotNull("Test dependency should be available", result); - Assert.assertTrue( - "Test dependency should be available", result.toLowerCase().contains("test dependency")); + Assertions.assertNotNull(result, "Test dependency should be available"); + Assertions.assertTrue(result.toLowerCase().contains("test dependency"), "Test dependency should be available"); } /** @@ -52,7 +51,7 @@ public void testTestOnlyDependencyAvailableAtTestRuntime() { // With current behavior under test, test-only dependency is available at test runtime TestOnlyDep dep = new TestOnlyDep(); String result = dep.getMessage(); - Assert.assertNotNull("Test-only dependency should be available at test runtime", result); + Assertions.assertNotNull(result, "Test-only dependency should be available at test runtime"); } /** @@ -64,9 +63,9 @@ public void testTestOnlyDependencyAvailableAtTestRuntime() { public void testTestOnlyDependencyAvailableAtTestCompile() { // This test verifies that the test-only dependency was available during compilation // by checking that this test class itself compiled successfully - Assert.assertTrue( - "Test class compiled successfully, proving test-only dependency was available during test compilation", - true); + Assertions.assertTrue( + true, + "Test class compiled successfully, proving test-only dependency was available during test compilation"); // We can't actually instantiate the TestOnlyDep here because it won't be available // at runtime, but the fact that this class compiled proves it was available during diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-runtime-test/pom.xml b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-runtime-test/pom.xml index 13d458b483..fb34cb28c0 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-runtime-test/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-runtime-test/pom.xml @@ -43,8 +43,8 @@ under the License. <!-- JUnit for testing --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-runtime-test/src/test/java/org/apache/maven/its/mng8750/TestRuntimeTest.java b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-runtime-test/src/test/java/org/apache/maven/its/mng8750/TestRuntimeTest.java index c3a322c109..f32fc670dd 100644 --- a/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-runtime-test/src/test/java/org/apache/maven/its/mng8750/TestRuntimeTest.java +++ b/its/core-it-suite/src/test/resources/mng-8750-new-scopes/test-runtime-test/src/test/java/org/apache/maven/its/mng8750/TestRuntimeTest.java @@ -19,8 +19,8 @@ package org.apache.maven.its.mng8750; import org.apache.maven.its.mng8750.deps.TestDep; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; // This import should NOT work during test compilation because test-runtime dependencies // are not available during test compilation phase @@ -40,9 +40,8 @@ public class TestRuntimeTest { public void testTestDependencyAvailableAtTestRuntime() { TestDep dep = new TestDep(); String result = dep.getMessage(); - Assert.assertNotNull("Test dependency should be available", result); - Assert.assertTrue( - "Test dependency should be available", result.toLowerCase().contains("test dependency")); + Assertions.assertNotNull(result, "Test dependency should be available"); + Assertions.assertTrue(result.toLowerCase().contains("test dependency"), "Test dependency should be available"); } /** @@ -60,16 +59,16 @@ public void testTestRuntimeDependencyAvailableAtTestRuntime() { // Call getMessage() method using reflection String result = (String) testRuntimeDepClass.getMethod("getMessage").invoke(dep); - Assert.assertTrue( - "Test-runtime dependency should be available at test runtime", - result.contains("Test runtime dependency")); + Assertions.assertTrue( + result.contains("Test runtime dependency"), + "Test-runtime dependency should be available at test runtime"); System.out.println("Test runtime classpath verification: PASSED"); } catch (ClassNotFoundException e) { - Assert.fail("Test-runtime dependency should be available at test runtime: " + e.getMessage()); + Assertions.fail("Test-runtime dependency should be available at test runtime: " + e.getMessage()); } catch (Exception e) { - Assert.fail("Error accessing test-runtime dependency: " + e.getMessage()); + Assertions.fail("Error accessing test-runtime dependency: " + e.getMessage()); } } @@ -83,7 +82,7 @@ public void testTestRuntimeDependencyNotAvailableAtTestCompile() { // The fact that this test class compiled successfully without being able to // directly import TestRuntimeDep proves that test-runtime dependencies are // not available during test compilation - Assert.assertTrue("Test class compiled without direct access to test-runtime dependency", true); + Assertions.assertTrue(true, "Test class compiled without direct access to test-runtime dependency"); // We can verify this by checking that the class is not directly accessible // during compilation (which is why we had to comment out the import) @@ -98,15 +97,15 @@ public void testTestRuntimeDependencyNotAvailableAtTestCompile() { public void testScopeDifference() { // Regular test dependency - available during both compilation and runtime TestDep testDep = new TestDep(); - Assert.assertNotNull("Test dependency should be available", testDep); + Assertions.assertNotNull(testDep, "Test dependency should be available"); // Test-runtime dependency - only available during runtime (accessed via reflection) try { Class<?> testRuntimeDepClass = Class.forName("org.apache.maven.its.mng8750.deps.TestRuntimeDep"); Object testRuntimeDep = testRuntimeDepClass.getDeclaredConstructor().newInstance(); - Assert.assertNotNull("Test-runtime dependency should be available at runtime", testRuntimeDep); + Assertions.assertNotNull(testRuntimeDep, "Test-runtime dependency should be available at runtime"); } catch (Exception e) { - Assert.fail("Test-runtime dependency should be available at test runtime: " + e.getMessage()); + Assertions.fail("Test-runtime dependency should be available at test runtime: " + e.getMessage()); } } }
