From 8d2549f4b350e2bd466e6517f4fe4b6ecf43eeb6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jan 2024 18:34:05 +0000
Subject: [PATCH 1/2] Bump jacocoVersion from 0.8.8 to 0.8.11

Bumps `jacocoVersion` from 0.8.8 to 0.8.11.

Updates `org.jacoco:org.jacoco.agent` from 0.8.8 to 0.8.11
- [Release notes](https://github.com/jacoco/jacoco/releases)
- [Commits](https://github.com/jacoco/jacoco/compare/v0.8.8...v0.8.11)

Updates `org.jacoco:jacoco-maven-plugin` from 0.8.8 to 0.8.11
- [Release notes](https://github.com/jacoco/jacoco/releases)
- [Commits](https://github.com/jacoco/jacoco/compare/v0.8.8...v0.8.11)

---
updated-dependencies:
- dependency-name: org.jacoco:org.jacoco.agent
  dependency-type: direct:development
  update-type: version-update:semver-patch
- dependency-name: org.jacoco:jacoco-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e77fdaaab3..930fcbc7ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
     <!-- Do not upgrade, leads to test failures, MSHARED-1014 -->
     <mavenSharedUtilsVersion>3.3.4</mavenSharedUtilsVersion>
     <powermockVersion>2.0.9</powermockVersion>
-    <jacocoVersion>0.8.8</jacocoVersion>
+    <jacocoVersion>0.8.11</jacocoVersion>
     <surefire-shared-utils.version>${project.version}</surefire-shared-utils.version>
     <maven.surefire.scm.devConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-surefire.git</maven.surefire.scm.devConnection>
     <maven.site.path>surefire-archives/surefire-LATEST</maven.site.path>

From 24fd39ddead9a1c8a064507adde8d89d8f05c401 Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@gmail.com>
Date: Thu, 4 Jan 2024 00:26:01 +0100
Subject: [PATCH 2/2] Drop old TestNG, test with more recent ones

---
 .../surefire/its/CheckTestNgVersionsIT.java   | 100 ++----------------
 1 file changed, 9 insertions(+), 91 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
index 557e13d11d..f008e7ee15 100644
--- 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) {