You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
41 lines
1.8 KiB
41 lines
1.8 KiB
3 years ago
|
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 +-
|
||
|
|
2 files changed, 2 insertions(+), 3 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
|
||
|
|
--
|
||
|
|
2.30.2
|
||
|
|
|