Fix rerun and skip IT

Signed-off-by: Olivier Lamy <[email protected]>

Author: olamy

surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java

@@ -22,6 +22,8 @@
 import org.apache.maven.surefire.its.fixture.SurefireLauncher;
 import org.junit.Test;
 
+import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
+
 /**
  * Allow rerunFailingTestsCount, skipAfterFailureCount together
  *
@@ -33,7 +35,8 @@ public class Surefire1202RerunAndSkipIT extends SurefireJUnitIntegrationTestCase
 
     @Test
     public void junit4() {
-        unpack().addGoal("-Pjunit4").executeTest().assertTestSuiteResults(5, 0, 0, 3, 4);
+        assumeJavaVersion(17);
+        unpack().executeTest().assertTestSuiteResults(5, 0, 0, 3, 4);
     }
 
     private SurefireLauncher unpack() {

surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml

@@ -45,6 +45,15 @@
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
+    <dependencies>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-api</artifactId>
+        <version>6.0.1</version>
+        <scope>test</scope>
+      </dependency>
+    </dependencies>
+
     <build>
         <pluginManagement>
             <plugins>
@@ -63,26 +72,4 @@
         </pluginManagement>
     </build>
 
-    <profiles>
-        <profile>
-            <id>junit4</id>
-            <dependencies>
-              <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.12</version>
-                <scope>test</scope>
-              </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>

surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ATest.java

@@ -1,6 +1,6 @@
 package pkg;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;

surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/BTest.java

@@ -1,6 +1,6 @@
 package pkg;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 

surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/CTest.java

@@ -1,6 +1,6 @@
 package pkg;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 

surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/DTest.java

@@ -1,6 +1,6 @@
 package pkg;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 

surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ETest.java

@@ -1,6 +1,6 @@
 package pkg;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ETest
 {