From 85887dc85709e8719db0becc17adacd905dcd579 Mon Sep 17 00:00:00 2001

From: Mikolaj Izdebski <mizdebsk@redhat.com>

Date: Mon, 10 Jul 2017 10:37:50 +0200

Subject: [PATCH 1/3] Port to TestNG 6.11

---

 surefire-providers/surefire-testng/pom.xml                     | 3 +--

 .../maven/surefire/testng/conf/AbstractDirectConfigurator.java | 2 +-

 .../maven/surefire/testng/conf/TestNGMapConfigurator.java      | 2 +-

 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml

index 1ce2888..bf93114 100644

--- a/surefire-providers/surefire-testng/pom.xml

+++ b/surefire-providers/surefire-testng/pom.xml

@@ -51,8 +51,7 @@

     <dependency>

       <groupId>org.testng</groupId>

       <artifactId>testng</artifactId>

-      <version>5.10</version>

-      <classifier>jdk15</classifier>

+      <version>6.11</version>

       <scope>provided</scope>

     </dependency>

   </dependencies>

diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java

index e966731..7021ef5 100644

--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java

+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java

@@ -63,7 +63,7 @@ public abstract class AbstractDirectConfigurator

         testng.setUseDefaultListeners( false );

         configureInstance( testng, options );

         // TODO: we should have the Profile so that we can decide if this is needed or not

-        testng.setListenerClasses( loadListenerClasses( listeners ) );

+        testng.setListenerClasses( ( List ) loadListenerClasses( listeners ) );

     }

     @Override

diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java

index b6bf82e03..8164f4f4d 100755

--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java

+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java

@@ -68,7 +68,7 @@ public void configure( XmlSuite suite, Map<String, String> options )

         String parallel = options.get( PARALLEL_PROP );

         if ( parallel != null )

         {

-            suite.setParallel( parallel );

+            suite.setParallel( XmlSuite.ParallelMode.getValidParallel( parallel ) );

         }

     }

-- 

2.30.2