diff --git a/plexus-compiler-its/pom.xml b/plexus-compiler-its/pom.xml index e2ac1b1d7..c813c0433 100644 --- a/plexus-compiler-its/pom.xml +++ b/plexus-compiler-its/pom.xml @@ -14,7 +14,6 @@ Plexus Compiler It Tests - 4.13.2 21 true diff --git a/plexus-compiler-its/src/main/it/aspectj-compiler/pom.xml b/plexus-compiler-its/src/main/it/aspectj-compiler/pom.xml index f9c68382b..673125261 100644 --- a/plexus-compiler-its/src/main/it/aspectj-compiler/pom.xml +++ b/plexus-compiler-its/src/main/it/aspectj-compiler/pom.xml @@ -65,9 +65,9 @@ - junit - junit - @junit.version@ + org.junit.jupiter + junit-jupiter-api + @version.junit5@ test diff --git a/plexus-compiler-its/src/main/it/aspectj-compiler/src/test/java/org/acme/ApplicationTest.java b/plexus-compiler-its/src/main/it/aspectj-compiler/src/test/java/org/acme/ApplicationTest.java index 9e2dec864..202075978 100644 --- a/plexus-compiler-its/src/main/it/aspectj-compiler/src/test/java/org/acme/ApplicationTest.java +++ b/plexus-compiler-its/src/main/it/aspectj-compiler/src/test/java/org/acme/ApplicationTest.java @@ -1,9 +1,9 @@ package org.acme; -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 ApplicationTest { @Test diff --git a/plexus-compiler-its/src/main/it/aspectj-compiler/verify.groovy b/plexus-compiler-its/src/main/it/aspectj-compiler/verify.groovy index 1b7add224..4a6c9cf2e 100644 --- a/plexus-compiler-its/src/main/it/aspectj-compiler/verify.groovy +++ b/plexus-compiler-its/src/main/it/aspectj-compiler/verify.groovy @@ -25,12 +25,12 @@ assert content.contains( "Tests run: 2, Failures: 0, Errors: 0, Skipped: 0" ) def junitLog = """Running org.acme.ApplicationTest call(String org.acme.Application.greet(String)) execution(String org.acme.Application.greet(String)) -call(void org.junit.Assert.assertEquals(Object, Object)) +call(void org.junit.jupiter.api.Assertions.assertEquals(Object, Object)) call(void org.acme.Application.main(String[])) execution(void org.acme.Application.main(String[])) Running application execution(String org.acme.Application.greet(String)) -call(void org.junit.Assert.assertTrue(boolean))""".normalize() +call(void org.junit.jupiter.api.Assertions.assertTrue(boolean))""".normalize() // Maven 4's console reporter prefixes surefire lines with "[INFO] " and forked // test stdout with "[INFO] [stdout] "; strip those so the woven-output block