From 6a0be62a2118435e1f1826ebd35d3b855aa68750 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 9 Nov 2021 10:50:54 +0100 Subject: [PATCH] Port to TestNG 7.4.0 --- 0001-Port-to-TestNG-6.11.patch | 16 +++++++++++++++- maven-surefire.spec | 5 ++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/0001-Port-to-TestNG-6.11.patch b/0001-Port-to-TestNG-6.11.patch index 1282f7f..9efaca9 100644 --- a/0001-Port-to-TestNG-6.11.patch +++ b/0001-Port-to-TestNG-6.11.patch @@ -6,7 +6,8 @@ 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(-) + .../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 @@ -35,6 +36,19 @@ index e966731..7021ef5 100644 } @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 options ) + String parallel = options.get( PARALLEL_PROP ); + if ( parallel != null ) + { +- suite.setParallel( parallel ); ++ suite.setParallel( XmlSuite.ParallelMode.getValidParallel( parallel ) ); + } + } + -- 2.30.2 diff --git a/maven-surefire.spec b/maven-surefire.spec index a16cfbc..5ed3237 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -2,7 +2,7 @@ Name: maven-surefire Version: 3.0.0~M4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Test framework project License: ASL 2.0 and CPL URL: https://maven.apache.org/surefire/ @@ -174,6 +174,9 @@ rm surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/suref %license LICENSE NOTICE cpl-v10.html %changelog +* Tue Nov 09 2021 Marian Koncek - 3.0.0~M4-4 +- Port to TestNG 7.4.0 + * Thu Jul 22 2021 Fedora Release Engineering - 3.0.0~M4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild