rpms/maven-surefire
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Port to TestNG 6.11

Browse Source 
Resolves: rhbz#1469005
This commit is contained in:
Mikolaj Izdebski 2017-07-10 10:40:09 +02:00
parent ac3c8ee822
commit 0cc81415e6
4 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0001-Maven-3.patch
View File

@ -1,7 +1,7 @@
From 89e2e52cc4f481dede63fe32381f7862cd2a6b69 Mon Sep 17 00:00:00 2001
From 8e82ccc101710f4cc9c472001afd44bb288c4fe4 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Thu, 5 May 2016 11:20:48 +0200
Subject: [PATCH 1/2] Maven 3
Subject: [PATCH 1/3] Maven 3
---
.../java/org/apache/maven/plugin/surefire/SurefireHelper.java | 11 +----------
@ -30,5 +30,5 @@ index a4319bc..32ccf34 100644
}
--
2.5.5
2.9.3

6
0002-Fix-test-with-doxia-1.7.patch
View File

@ -1,7 +1,7 @@
From 2ba046249b2d31d91949aafba8561b8412c0434b Mon Sep 17 00:00:00 2001
From 641500ac0d08697b5e2ee3ce6656c861113c7fe3 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Thu, 5 May 2016 11:19:09 +0200
Subject: [PATCH 2/2] Fix test with doxia-1.7
Subject: [PATCH 2/3] Fix test with doxia-1.7
---
maven-surefire-report-plugin/pom.xml | 9 +++++++--
@ -47,5 +47,5 @@ index a6e49cd..f62fd69 100644
import org.apache.maven.reporting.MavenReportException;
--
2.5.5
2.9.3

40
0003-Port-to-TestNG-6.11.patch Normal file
View File

@ -0,0 +1,40 @@
From f87ae3376dce09b6691081d254c1698f5e04dfa5 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 10 Jul 2017 10:37:50 +0200
Subject: [PATCH 3/3] Port to TestNG 6.11
---
surefire-providers/surefire-testng/pom.xml | 3 +--
.../apache/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 23498fd..85e4b4e 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 e89d061..ec069bb 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
@@ -62,7 +62,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 ) );
}
public void configure( XmlSuite suite, Map<String, String> options )
--
2.9.3

8
maven-surefire.spec
View File

@ -1,6 +1,6 @@
Name: maven-surefire
Version: 2.19.1
Release: 6%{?dist}
Release: 7%{?dist}
Epoch: 0
Summary: Test framework project
License: ASL 2.0 and CPL
@ -12,6 +12,7 @@ Source2: http://junit.sourceforge.net/cpl-v10.html
Patch0: 0001-Maven-3.patch
Patch1: 0002-Fix-test-with-doxia-1.7.patch
Patch2: 0003-Port-to-TestNG-6.11.patch
BuildRequires: maven-local
BuildRequires: mvn(com.google.code.findbugs:jsr305)
@ -107,6 +108,7 @@ cp -p %{SOURCE2} .
%patch0 -p1
%patch1 -p1
%patch2 -p1
%pom_disable_module surefire-shadefire
@ -158,6 +160,10 @@ cp -p %{SOURCE2} .
%doc LICENSE NOTICE cpl-v10.html
%changelog
* Mon Jul 10 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.19.1-7
- Port to TestNG 6.11
- Resolves: rhbz#1469005
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.19.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild