From 14a762a7ac22e4abe2b46a461830901b7de93be9 Mon Sep 17 00:00:00 2001
From: Artem Golovko <artemgolovko98@gmail.com>
Date: Fri, 17 May 2024 11:19:18 +0100
Subject: [PATCH] Issue #11803 - support testng with maven-surefire-plugin

---
 jetty-core/jetty-io/pom.xml                      | 16 ++++++++++++++++
 .../io/content/ContentSourcePublisherTest.java   |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/jetty-core/jetty-io/pom.xml b/jetty-core/jetty-io/pom.xml
index 749f45a11d9b..bb1d1a86c5fa 100644
--- a/jetty-core/jetty-io/pom.xml
+++ b/jetty-core/jetty-io/pom.xml
@@ -55,6 +55,22 @@
           <argLine>@{argLine} ${jetty.surefire.argLine} 
             --add-reads org.eclipse.jetty.io=org.eclipse.jetty.logging</argLine>
         </configuration>
+        <dependencies>
+          <!--
+          surefire plugin currently does not support junit5 with testng out of the box: https://maven.apache.org/surefire/maven-surefire-plugin/examples/testng.html#running-testng-and-junit-tests
+          We need to specify providers explicitly: https://maven.apache.org/surefire/maven-surefire-plugin/examples/providers.html
+          -->
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit-platform</artifactId>
+            <version>${maven.surefire.plugin.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-testng</artifactId>
+            <version>${maven.surefire.plugin.version}</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
   </build>
diff --git a/jetty-core/jetty-io/src/test/java/org/eclipse/jetty/io/content/ContentSourcePublisherTest.java b/jetty-core/jetty-io/src/test/java/org/eclipse/jetty/io/content/ContentSourcePublisherTest.java
index 39f79b860e6f..31d8c49ddd18 100644
--- a/jetty-core/jetty-io/src/test/java/org/eclipse/jetty/io/content/ContentSourcePublisherTest.java
+++ b/jetty-core/jetty-io/src/test/java/org/eclipse/jetty/io/content/ContentSourcePublisherTest.java
@@ -21,7 +21,9 @@
 import org.eclipse.jetty.io.Content;
 import org.reactivestreams.tck.TestEnvironment;
 import org.reactivestreams.tck.flow.FlowPublisherVerification;
+import org.testng.annotations.Test;
 
+@Test
 public final class ContentSourcePublisherTest extends FlowPublisherVerification<Content.Chunk>
 {
     public ContentSourcePublisherTest()