From 9a7d52c86097540de65c43c00286eb46427f860f Mon Sep 17 00:00:00 2001
From: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
Date: Fri, 26 Apr 2024 05:46:29 +0200
Subject: [PATCH] 3.x Messaging TCK runs tests twice #7584 (#8668)

3.x Messaging TCK runs tests twice #7584 (#8668)

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
---
 microprofile/tests/tck/pom.xml                 | 18 ------------------
 microprofile/tests/tck/tck-graphql/pom.xml     |  5 +++++
 microprofile/tests/tck/tck-health/pom.xml      |  5 +++++
 microprofile/tests/tck/tck-messaging/pom.xml   |  1 -
 microprofile/tests/tck/tck-metrics/pom.xml     |  1 -
 .../tests/tck/tck-reactive-operators/pom.xml   |  1 -
 6 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/microprofile/tests/tck/pom.xml b/microprofile/tests/tck/pom.xml
index 1d79c30372b..12c5607778e 100644
--- a/microprofile/tests/tck/pom.xml
+++ b/microprofile/tests/tck/pom.xml
@@ -61,24 +61,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.maven.surefire</groupId>
-                            <artifactId>surefire-testng</artifactId>
-                            <version>${version.plugin.surefire}</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
     <profiles>
         <profile>
             <id>tck-ft</id>
diff --git a/microprofile/tests/tck/tck-graphql/pom.xml b/microprofile/tests/tck/tck-graphql/pom.xml
index 7bbbfc9d27e..19b326622db 100644
--- a/microprofile/tests/tck/tck-graphql/pom.xml
+++ b/microprofile/tests/tck/tck-graphql/pom.xml
@@ -62,6 +62,11 @@
             <artifactId>jakarta.xml.bind-api</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/microprofile/tests/tck/tck-health/pom.xml b/microprofile/tests/tck/tck-health/pom.xml
index ffbd106fdb5..69e8215c691 100644
--- a/microprofile/tests/tck/tck-health/pom.xml
+++ b/microprofile/tests/tck/tck-health/pom.xml
@@ -60,6 +60,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/microprofile/tests/tck/tck-messaging/pom.xml b/microprofile/tests/tck/tck-messaging/pom.xml
index ae00e439a20..8fd38ba0bcc 100644
--- a/microprofile/tests/tck/tck-messaging/pom.xml
+++ b/microprofile/tests/tck/tck-messaging/pom.xml
@@ -59,7 +59,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <inherited>false</inherited>
                 <configuration>
                     <dependenciesToScan>
                         <dependency>org.eclipse.microprofile.reactive.messaging:microprofile-reactive-messaging-tck
diff --git a/microprofile/tests/tck/tck-metrics/pom.xml b/microprofile/tests/tck/tck-metrics/pom.xml
index 6c44005daa8..2122db10737 100644
--- a/microprofile/tests/tck/tck-metrics/pom.xml
+++ b/microprofile/tests/tck/tck-metrics/pom.xml
@@ -108,7 +108,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <inherited>false</inherited>    <!-- Exclude testng dependency -->
                 <configuration>
                     <dependenciesToScan>
                         <dependency>org.eclipse.microprofile.metrics:microprofile-metrics-api-tck</dependency>
diff --git a/microprofile/tests/tck/tck-reactive-operators/pom.xml b/microprofile/tests/tck/tck-reactive-operators/pom.xml
index a7cc3336a7d..d8a6f1d533a 100644
--- a/microprofile/tests/tck/tck-reactive-operators/pom.xml
+++ b/microprofile/tests/tck/tck-reactive-operators/pom.xml
@@ -52,7 +52,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <inherited>false</inherited>
                 <configuration>
                     <dependenciesToScan>
                         <dependency>org.eclipse.microprofile.reactive.messaging:microprofile-reactive-messaging-tck