Upgrade TestNG to 7.5.1, drop old versions

apache · Jan 4, 2024 · 0925122 · 0925122
1 parent f83b883
commit 0925122
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 102 deletions.
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
@@ -25,7 +25,6 @@
 import org.apache.maven.surefire.its.fixture.OutputValidator;
 import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
 import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -41,106 +40,25 @@
  */
 public class CheckTestNgVersionsIT extends SurefireJUnit4IntegrationTestCase {
 
+    // TestNG 7.6 and above needs JDK11
     @Test
-    public void test47() {
-        runTestNgTest("4.7", "jdk15");
+    public void test751() {
+        runTestNgTestWithRunOrder("7.5.1");
     }
 
     @Test
-    @Ignore("5.0 and 5.0.1 jars on central are malformed SUREFIRE-375 + MAVENUPLOAD-1024")
-    public void xXXtest50() {
-        runTestNgTest("5.0", "jdk15");
+    public void test6143() {
+        runTestNgTestWithRunOrder("6.14.3");
     }
 
     @Test
-    @Ignore("5.0 and 5.0.1 jars on central are malformed SUREFIRE-375 + MAVENUPLOAD-1024")
-    public void xXXtest501() {
-        runTestNgTest("5.0.1", "jdk15");
+    public void test69136() {
+        runTestNgTestWithRunOrder("6.9.13.6");
     }
 
     @Test
-    public void test502() {
-        runTestNgTest("5.0.2", "jdk15");
-    }
-
-    @Test
-    public void test51() {
-        runTestNgTest("5.1", "jdk15");
-    }
-
-    @Test
-    public void test55() {
-        runTestNgTest("5.5", "jdk15");
-    }
-
-    @Test
-    public void test56() {
-        runTestNgTest("5.6", "jdk15");
-    }
-
-    @Test
-    public void test57() {
-        runTestNgTest("5.7", "jdk15");
-    }
-
-    @Test
-    public void test58() {
-        runTestNgTest("5.8", "jdk15");
-    }
-
-    @Test
-    public void test59() {
-        runTestNgTest("5.9", "jdk15");
-    }
-
-    @Test
-    public void test510() {
-        runTestNgTest("5.10", "jdk15");
-    }
-
-    @Test
-    public void test511() {
-        runTestNgTest("5.11", "jdk15");
-    }
-
-    @Test
-    public void test512() {
-        runTestNgTest("5.12.1");
-    }
-
-    @Test
-    public void test513() {
-        runTestNgTest("5.13");
-    }
-
-    @Test
-    public void test5131() {
-        runTestNgTest("5.13.1");
-    }
-
-    @Test
-    public void test514() {
-        runTestNgTest("5.14");
-    }
-
-    @Test
-    public void test5141() {
-        runTestNgTest("5.14.1");
-    }
-
-    @Test
-    public void test5142() {
-        runTestNgTest("5.14.2");
-    }
-
-    @Test
-    public void test60() {
-        runTestNgTest("6.0");
-    }
-
-    @Test
-    public void test685() {
-        runTestNgTestWithRunOrder("6.8.5");
+    public void test6821() {
+        runTestNgTestWithRunOrder("6.8.21");
     }
 
     private void runTestNgTestWithRunOrder(String version) {

diff --git a/surefire-its/src/test/resources/junit5-testng/pom.xml b/surefire-its/src/test/resources/junit5-testng/pom.xml
@@ -39,13 +39,13 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>7.5</version>
+      <version>7.5.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.support</groupId>
       <artifactId>testng-engine</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.4</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/surefire-its/src/test/resources/surefire-1535-parallel-testng/pom.xml b/surefire-its/src/test/resources/surefire-1535-parallel-testng/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>6.13.1</version>
+            <version>7.5.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/surefire-its/src/test/resources/surefire-1733-testng/pom.xml b/surefire-its/src/test/resources/surefire-1733-testng/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>7.1.0</version>
+            <version>7.5.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml b/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>7.4.0</version>
+            <version>7.5.1</version>
             <exclusions>
                 <exclusion>
                     <!-- NOTE: Deliberaty excluding junit to enforce TestNG only tests, cf. SUREFIRE-642 -->

diff --git a/surefire-its/src/test/resources/testng-740-parallel/pom.xml b/surefire-its/src/test/resources/testng-740-parallel/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>7.4.0</version>
+            <version>7.5.1</version>
             <exclusions>
                 <exclusion>
                     <!-- NOTE: Deliberaty excluding junit to enforce TestNG only tests, cf. SUREFIRE-642 -->

diff --git a/surefire-its/src/test/resources/testng-junit4-together/pom.xml b/surefire-its/src/test/resources/testng-junit4-together/pom.xml
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>6.8.5</version>
+      <version>7.5.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/surefire-providers/surefire-testng-utils/pom.xml b/surefire-providers/surefire-testng-utils/pom.xml
@@ -50,8 +50,7 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>5.10</version>
-      <classifier>jdk15</classifier>
+      <version>7.5.1</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml
@@ -55,8 +55,7 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>5.10</version>
-      <classifier>jdk15</classifier>
+      <version>7.5.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>