From 9a8879704ce547dfc3fbaf2b6a25aa9000346ad8 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Sat, 26 Mar 2022 15:40:41 +0100
Subject: [PATCH 1/2] [SUREFIRE-2024] Replace testng-junit5 by testng-engine

---
 .../site/apt/examples/junit-platform.apt.vm   |  21 ++-
 .../src/test/resources/junit5-testng/pom.xml  | 124 +++++++++---------
 2 files changed, 70 insertions(+), 75 deletions(-)

diff --git a/maven-surefire-plugin/src/site/apt/examples/junit-platform.apt.vm b/maven-surefire-plugin/src/site/apt/examples/junit-platform.apt.vm
index 5c02c6d1c8..b413e58379 100644
--- a/maven-surefire-plugin/src/site/apt/examples/junit-platform.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/examples/junit-platform.apt.vm
@@ -349,37 +349,32 @@ Using JUnit 5 Platform
 </profile>
 +---+
 
-** How to run TestNG tests within Jupiter engine
+** How to run TestNG tests within the JUnit Platform
 
   You can run TestNG tests combined with JUnit5 tests.
 
   For more information see this
-  {{{https://github.com/apache/maven-surefire/tree/master/surefire-its/src/test/resources/junit5-testng}example}}.
+  {{{https://github.com/apache/maven-surefire/tree/master/surefire-its/src/test/resources/junit5-testng}example}}
+  and {{{https://github.com/junit-team/testng-engine}TestNG Engine for the JUnit Platform}}.
 
 +---+
 <dependencies>
     <dependency>
         <groupId>org.testng</groupId>
         <artifactId>testng</artifactId>
-        <version>7.1.0</version>
+        <version>7.4.0</version>
         <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>com.github.testng-team</groupId>
-        <artifactId>testng-junit5</artifactId>
-        <version>0.0.1</version>
+        <groupId>org.junit.support</groupId>
+        <artifactId>testng-engine</artifactId>
+        <version>1.0.1</version>
         <scope>test</scope>
-        <exclusions>
-            <exclusion>
-                <groupId>org.junit.platform</groupId>
-                <artifactId>junit-platform-engine</artifactId>
-            </exclusion>
-        </exclusions>
     </dependency>
     <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-api</artifactId>
-        <version>5.6.2</version>
+        <version>5.8.2</version>
         <scope>test</scope>
     </dependency>
 </dependencies>
diff --git a/surefire-its/src/test/resources/junit5-testng/pom.xml b/surefire-its/src/test/resources/junit5-testng/pom.xml
index c18e4649c6..2f8cf9d5ab 100644
--- a/surefire-its/src/test/resources/junit5-testng/pom.xml
+++ b/surefire-its/src/test/resources/junit5-testng/pom.xml
@@ -21,74 +21,74 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.example</groupId>
-    <artifactId>testng-junit5</artifactId>
-    <version>1.0-SNAPSHOT</version>
+  <groupId>org.example</groupId>
+  <artifactId>testng-junit5</artifactId>
+  <version>1.0-SNAPSHOT</version>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${java.specification.version}</maven.compiler.source>
-        <maven.compiler.target>${java.specification.version}</maven.compiler.target>
-    </properties>
+  <description>Project with mixed TestNG and JUnit5 tests.</description>
 
-    <dependencies>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>${java.specification.version}</maven.compiler.source>
+    <maven.compiler.target>${java.specification.version}</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <version>7.4.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.support</groupId>
+      <artifactId>testng-engine</artifactId>
+      <version>1.0.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${surefire.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>junit5-engine</id>
+      <dependencies>
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>7.1.0</version>
-            <scope>test</scope>
+          <groupId>org.junit.jupiter</groupId>
+          <artifactId>junit-jupiter-engine</artifactId>
+          <!-- TODO check with next version of testng-engine -->
+          <!-- we have old junit-platform-commons:1.7.2 in dependency tree -->
+          <version>5.7.2</version>
+          <scope>test</scope>
         </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>junit5-api</id>
+      <dependencies>
         <dependency>
-            <groupId>com.github.testng-team</groupId>
-            <artifactId>testng-junit5</artifactId>
-            <version>0.0.1</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.junit.platform</groupId>
-                    <artifactId>junit-platform-engine</artifactId>
-                </exclusion>
-            </exclusions>
+          <groupId>org.junit.jupiter</groupId>
+          <artifactId>junit-jupiter-api</artifactId>
+          <!-- junit-jupiter-api has junit-platform-commons as nearest definition -->
+          <!-- so junit-platform-commons:1.8.2 wins ;-) -->
+          <version>5.8.2</version>
+          <scope>test</scope>
         </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${surefire.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>junit5-engine</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.junit.jupiter</groupId>
-                    <artifactId>junit-jupiter-engine</artifactId>
-                    <version>5.6.2</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>junit5-api</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.junit.jupiter</groupId>
-                    <artifactId>junit-jupiter-api</artifactId>
-                    <version>5.6.2</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
+      </dependencies>
+    </profile>
+  </profiles>
 
 </project>

From 4444fa3124721875f9422eac1d396649de3ecb1e Mon Sep 17 00:00:00 2001
From: tibordigana <tibordigana@apache.org>
Date: Wed, 30 Mar 2022 10:39:20 +0200
Subject: [PATCH 2/2] clarified after discussion, added default profile

---
 .../site/apt/examples/junit-platform.apt.vm   |  8 +---
 .../its/jiras/Surefire1787JUnit5IT.java       | 13 ++++++-
 .../src/test/resources/junit5-testng/pom.xml  | 37 ++++++++++++++++++-
 .../src/test/java/pkg/JUnit5Test.java         |  2 +-
 4 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/maven-surefire-plugin/src/site/apt/examples/junit-platform.apt.vm b/maven-surefire-plugin/src/site/apt/examples/junit-platform.apt.vm
index b413e58379..26e5f1b1c3 100644
--- a/maven-surefire-plugin/src/site/apt/examples/junit-platform.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/examples/junit-platform.apt.vm
@@ -371,17 +371,11 @@ Using JUnit 5 Platform
         <version>1.0.1</version>
         <scope>test</scope>
     </dependency>
-    <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-api</artifactId>
-        <version>5.8.2</version>
-        <scope>test</scope>
-    </dependency>
 </dependencies>
 +---+
 
   The Maven does not take any responsibility for broken compatibilities in this case and the responsibility for
-  the dependency <<<com.github.testng-team:testng-junit5>>>.
+  the dependency <<<org.junit.support:testng-engine>>>.
 
 ** JUnit Runner
 
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1787JUnit5IT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1787JUnit5IT.java
index f64ad702bd..ede3d11b84 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1787JUnit5IT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1787JUnit5IT.java
@@ -96,6 +96,18 @@ public void selectJUnit5()
                 "Using auto detected provider org.apache.maven.surefire.junitplatform.JUnitPlatformProvider" );
     }
 
+    @Test
+    public void testNg()
+    {
+        unpack( "junit5-testng" )
+            .activateProfile( "testng-only" )
+            .executeTest()
+            .verifyErrorFree( 1 )
+            .verifyTextInLog( "Running pkg.TestNGTest" )
+            .verifyTextInLog(
+                "Using auto detected provider org.apache.maven.surefire.junitplatform.JUnitPlatformProvider" );
+    }
+
     @Test
     public void testNgWithJupiterApi()
     {
@@ -107,7 +119,6 @@ public void testNgWithJupiterApi()
             .verifyTextInLog( "Running pkg.TestNGTest" )
             .verifyTextInLog(
                 "Using auto detected provider org.apache.maven.surefire.junitplatform.JUnitPlatformProvider" );
-
     }
 
     @Test
diff --git a/surefire-its/src/test/resources/junit5-testng/pom.xml b/surefire-its/src/test/resources/junit5-testng/pom.xml
index 2f8cf9d5ab..fd383106dc 100644
--- a/surefire-its/src/test/resources/junit5-testng/pom.xml
+++ b/surefire-its/src/test/resources/junit5-testng/pom.xml
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>7.4.0</version>
+      <version>7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -63,6 +63,23 @@
   </build>
 
   <profiles>
+    <profile>
+      <id>testng-only</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <testIncludes>
+                <!-- JUnit5Test.java ignored - Jupiter does not exist in dependencies. -->
+                <testInclude>**/TestNGTest.java</testInclude>
+              </testIncludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>junit5-engine</id>
       <dependencies>
@@ -78,6 +95,24 @@
     </profile>
     <profile>
       <id>junit5-api</id>
+      <!--
+      This exclusion avoids inconsistent versions combination: junit-platform-engine:1.7.2 and junit-jupiter-api:5.8.2.
+      The surefire would add artifacts to the class path: junit-platform-*, junit-jupiter-engine, etc.
+      -->
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>org.junit.support</groupId>
+            <artifactId>testng-engine</artifactId>
+            <exclusions>
+              <exclusion>
+                <groupId>org.junit.platform</groupId>
+                <artifactId>junit-platform-engine</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
       <dependencies>
         <dependency>
           <groupId>org.junit.jupiter</groupId>
diff --git a/surefire-its/src/test/resources/junit5-testng/src/test/java/pkg/JUnit5Test.java b/surefire-its/src/test/resources/junit5-testng/src/test/java/pkg/JUnit5Test.java
index 916eeab5f0..eea7289fd7 100644
--- a/surefire-its/src/test/resources/junit5-testng/src/test/java/pkg/JUnit5Test.java
+++ b/surefire-its/src/test/resources/junit5-testng/src/test/java/pkg/JUnit5Test.java
@@ -4,7 +4,7 @@
 
 class JUnit5Test {
     @Test
-    public void test() {
+    void test() {
 
     }
 }