41 lines
1.9 KiB
Diff
41 lines
1.9 KiB
Diff
From 69c97f47a7bbec601b407cd2cd81aee64507e562 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/2] Port to TestNG 6.11
|
|
|
|
---
|
|
surefire-providers/surefire-testng/pom.xml | 3 +--
|
|
.../maven/surefire/testng/conf/AbstractDirectConfigurator.java | 2 +-
|
|
2 files changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml
|
|
index 49e75b6e..a9db4a8d 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 e9667316..7021ef56 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 void configure( TestNG testng, Map<String, String> options )
|
|
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
|
|
--
|
|
2.20.1
|
|
|