From 21f5f4c7df53fb0b56aeed250df1bf084668c32f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 01/24] Expand conditionals --- maven-surefire.spec | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index 32be2a6..f74c258 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,4 +1,3 @@ -%bcond_without junit5 Name: maven-surefire Version: 2.22.0 @@ -50,9 +49,6 @@ BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.testng:testng) BuildRequires: mvn(org.testng:testng::jdk15:) -%if %{with junit5} -BuildRequires: mvn(org.junit.platform:junit-platform-launcher) -%endif # PpidChecker relies on /usr/bin/ps to check process uptime Requires: procps-ng @@ -78,13 +74,6 @@ Summary: JUnit provider for Maven Surefire %description provider-junit JUnit provider for Maven Surefire. -%if %{with junit5} -%package provider-junit5 -Summary: JUnit 5 provider for Maven Surefire - -%description provider-junit5 -JUnit 5 provider for Maven Surefire. -%endif %package provider-testng Summary: TestNG provider for Maven Surefire @@ -138,9 +127,7 @@ sed -i /-Xdoclint:all/d pom.xml %pom_disable_module surefire-shadefire -%if %{without junit5} %pom_disable_module surefire-junit-platform surefire-providers -%endif %pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire @@ -193,9 +180,6 @@ sed -i /-Xdoclint:all/d pom.xml %files provider-junit -f .mfiles-junit %files provider-testng -f .mfiles-testng %files -n maven-failsafe-plugin -f .mfiles-failsafe-plugin -%if %{with junit5} -%files provider-junit5 -f .mfiles-junit5 -%endif %files javadoc -f .mfiles-javadoc %license LICENSE NOTICE cpl-v10.html From d7a079cc1bea0f3039dd4392162ea87fbc5dce89 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 13:02:12 +0000 Subject: [PATCH 02/24] Remove explicit Epoch --- maven-surefire.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index f74c258..64202f2 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -2,7 +2,6 @@ Name: maven-surefire Version: 2.22.0 Release: 3%{?dist} -Epoch: 0 Summary: Test framework project License: ASL 2.0 and CPL URL: http://maven.apache.org/surefire/ From c37e966dadea910378090ff04205c897b37e0e81 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 13 Apr 2019 19:17:15 +0200 Subject: [PATCH 03/24] Update to upstream 3.0.0-M3 milestone snapshot --- .gitignore | 1 + 0001-Maven-3.patch | 34 ------------- ...11.patch => 0001-Port-to-TestNG-6.11.patch | 12 ++--- 0002-Port-to-current-doxia.patch | 25 ---------- ...2-Port-to-current-maven-shared-utils.patch | 49 +++++-------------- generate-tarball.sh | 8 ++- maven-surefire.spec | 37 ++++++-------- sources | 2 +- 8 files changed, 40 insertions(+), 128 deletions(-) delete mode 100644 0001-Maven-3.patch rename 0003-Port-to-TestNG-6.11.patch => 0001-Port-to-TestNG-6.11.patch (86%) delete mode 100644 0002-Port-to-current-doxia.patch rename 0004-Port-to-current-maven-shared-utils.patch => 0002-Port-to-current-maven-shared-utils.patch (67%) diff --git a/.gitignore b/.gitignore index b6de701..3636942 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ surefire-2.10-source-release.zip /surefire-2.21.0-source-release.zip /surefire-2.22.0-source-release.zip /maven-surefire-2.22.0.tar.gz +/maven-surefire-3.0.0-M3.tar.gz diff --git a/0001-Maven-3.patch b/0001-Maven-3.patch deleted file mode 100644 index 226a4ab..0000000 --- a/0001-Maven-3.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3bb1ab3a99b7db611b5d265701e1ba293413b027 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Thu, 5 May 2016 11:20:48 +0200 -Subject: [PATCH 1/4] Maven 3 - ---- - .../apache/maven/plugin/surefire/SurefireHelper.java | 11 +---------- - 1 file changed, 1 insertion(+), 10 deletions(-) - -diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java -index dd29cb4..dc7915c 100644 ---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java -+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java -@@ -204,16 +204,7 @@ public final class SurefireHelper - private static String getFailureBehavior( MavenExecutionRequest request ) - throws NoSuchMethodException, InvocationTargetException, IllegalAccessException - { -- try -- { -- return request.getFailureBehavior(); -- } -- catch ( NoSuchMethodError e ) -- { -- return (String) request.getClass() -- .getMethod( "getReactorFailureBehavior" ) -- .invoke( request ); -- } -+ return request.getReactorFailureBehavior(); - } - - private static boolean failIfNoTests( SurefireReportParameters reportParameters ) --- -2.17.1 - diff --git a/0003-Port-to-TestNG-6.11.patch b/0001-Port-to-TestNG-6.11.patch similarity index 86% rename from 0003-Port-to-TestNG-6.11.patch rename to 0001-Port-to-TestNG-6.11.patch index 2667817..0281bd5 100644 --- a/0003-Port-to-TestNG-6.11.patch +++ b/0001-Port-to-TestNG-6.11.patch @@ -1,7 +1,7 @@ -From 73cbf7936466f7e32483b871813a82f214d44b30 Mon Sep 17 00:00:00 2001 +From 69c97f47a7bbec601b407cd2cd81aee64507e562 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 10 Jul 2017 10:37:50 +0200 -Subject: [PATCH 3/4] Port to TestNG 6.11 +Subject: [PATCH 1/2] Port to TestNG 6.11 --- surefire-providers/surefire-testng/pom.xml | 3 +-- @@ -9,7 +9,7 @@ Subject: [PATCH 3/4] Port to TestNG 6.11 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml -index 8aee308..e1b37ea 100644 +index 49e75b6e..a9db4a8d 100644 --- a/surefire-providers/surefire-testng/pom.xml +++ b/surefire-providers/surefire-testng/pom.xml @@ -51,8 +51,7 @@ @@ -23,10 +23,10 @@ index 8aee308..e1b37ea 100644 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 c639ce9..3f05eed 100644 +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 abstract class AbstractDirectConfigurator +@@ -63,7 +63,7 @@ public void configure( TestNG testng, Map options ) testng.setUseDefaultListeners( false ); configureInstance( testng, options ); // TODO: we should have the Profile so that we can decide if this is needed or not @@ -36,5 +36,5 @@ index c639ce9..3f05eed 100644 @Override -- -2.17.1 +2.20.1 diff --git a/0002-Port-to-current-doxia.patch b/0002-Port-to-current-doxia.patch deleted file mode 100644 index 5567555..0000000 --- a/0002-Port-to-current-doxia.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 16e1a53ff612f4a9a777e09cdc45988e9abbe2e2 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Fri, 29 Jun 2018 12:44:37 +0200 -Subject: [PATCH 2/4] Port to current doxia - ---- - .../maven/plugins/surefire/report/SurefireReportGenerator.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java -index f9b9480..f142c8d 100644 ---- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java -+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java -@@ -26,7 +26,7 @@ import java.util.Locale; - import java.util.Map; - import org.apache.maven.doxia.markup.HtmlMarkup; - import org.apache.maven.doxia.sink.Sink; --import org.apache.maven.doxia.sink.SinkEventAttributeSet; -+import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; - import org.apache.maven.doxia.util.DoxiaUtils; - import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; - import org.apache.maven.reporting.MavenReportException; --- -2.17.1 - diff --git a/0004-Port-to-current-maven-shared-utils.patch b/0002-Port-to-current-maven-shared-utils.patch similarity index 67% rename from 0004-Port-to-current-maven-shared-utils.patch rename to 0002-Port-to-current-maven-shared-utils.patch index 6e23538..8c69771 100644 --- a/0004-Port-to-current-maven-shared-utils.patch +++ b/0002-Port-to-current-maven-shared-utils.patch @@ -1,29 +1,17 @@ -From 6f1e595890521c0c3448457f112c1598d8b9c7f9 Mon Sep 17 00:00:00 2001 +From a96b8f5dd6d7fc51d9056c93bd08635e06957ea5 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 16 Mar 2018 13:45:01 +0100 -Subject: [PATCH 4/4] Port to current maven-shared-utils +Subject: [PATCH 2/2] Port to current maven-shared-utils --- - .../surefire/report/StatelessXmlReporter.java | 16 ++++++++++------ - pom.xml | 2 +- - 2 files changed, 11 insertions(+), 7 deletions(-) + .../plugin/surefire/report/StatelessXmlReporter.java | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java -index dad9808..111b92b 100644 +index b89c4e9b..8cf0b60c 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java -@@ -237,6 +237,10 @@ public class StatelessXmlReporter - } - ppw.endElement(); // TestSuite - } -+ catch (IOException e) -+ { -+ throw new RuntimeException(e); -+ } - finally - { - closeQuietly( fw ); -@@ -323,7 +327,7 @@ public class StatelessXmlReporter +@@ -326,7 +326,7 @@ private static File getReportFile( ReportEntry report, File reportsDirectory, St } private static void startTestElement( XMLWriter ppw, WrappedReportEntry report, String reportNameSuffix, @@ -32,7 +20,7 @@ index dad9808..111b92b 100644 { ppw.startElement( "testcase" ); ppw.addAttribute( "name", report.getReportName() ); -@@ -346,7 +350,7 @@ public class StatelessXmlReporter +@@ -349,7 +349,7 @@ private static void startTestElement( XMLWriter ppw, WrappedReportEntry report, } private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats, @@ -41,7 +29,7 @@ index dad9808..111b92b 100644 { ppw.startElement( "testsuite" ); -@@ -373,7 +377,7 @@ public class StatelessXmlReporter +@@ -377,7 +377,7 @@ private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, T private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLWriter ppw, WrappedReportEntry report, boolean trimStackTrace, OutputStream fw, @@ -50,7 +38,7 @@ index dad9808..111b92b 100644 { ppw.startElement( testErrorType ); -@@ -418,7 +422,7 @@ public class StatelessXmlReporter +@@ -434,7 +434,7 @@ private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLW // Create system-out and system-err elements private static void createOutErrElements( OutputStreamWriter outputStreamWriter, XMLWriter ppw, @@ -59,7 +47,7 @@ index dad9808..111b92b 100644 { EncodingOutputStream eos = new EncodingOutputStream( fw ); addOutputStreamElement( outputStreamWriter, eos, ppw, report.getStdout(), "system-out" ); -@@ -428,7 +432,7 @@ public class StatelessXmlReporter +@@ -444,7 +444,7 @@ private static void createOutErrElements( OutputStreamWriter outputStreamWriter, private static void addOutputStreamElement( OutputStreamWriter outputStreamWriter, EncodingOutputStream eos, XMLWriter xmlWriter, Utf8RecodingDeferredFileOutputStream utf8RecodingDeferredFileOutputStream, @@ -68,7 +56,7 @@ index dad9808..111b92b 100644 { if ( utf8RecodingDeferredFileOutputStream != null && utf8RecodingDeferredFileOutputStream.getByteCount() > 0 ) { -@@ -458,7 +462,7 @@ public class StatelessXmlReporter +@@ -474,7 +474,7 @@ private static void addOutputStreamElement( OutputStreamWriter outputStreamWrite * * @param xmlWriter The test suite to report to */ @@ -77,19 +65,6 @@ index dad9808..111b92b 100644 { xmlWriter.startElement( "properties" ); for ( final Entry entry : systemProperties.entrySet() ) -diff --git a/pom.xml b/pom.xml -index efc9342..6492689 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -91,7 +91,7 @@ - 3.5 - 3.5 - 2.5 -- 0.9 -+ 3.2.1 - 2.0.0-beta.5 - scm:git:https://gitbox.apache.org/repos/asf/maven-surefire.git - surefire-archives/surefire-LATEST -- -2.17.1 +2.20.1 diff --git a/generate-tarball.sh b/generate-tarball.sh index f2a3514..37a1413 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -2,7 +2,11 @@ set -e name=maven-surefire -version="$(sed -n 's/Version:\s*//p' *.spec)" +if [[ -n "$1" ]]; then + version="$1" +else + version="$(sed -n 's/Version:\s*//p' *.spec)" +fi # RETRIEVE wget "http://repo2.maven.org/maven2/org/apache/maven/surefire/surefire/${version}/surefire-${version}-source-release.zip" -O "${name}-${version}.orig.zip" @@ -16,6 +20,6 @@ unzip "../${name}-${version}.orig.zip" find -name '*.jar' -delete find -name '*.class' -delete -tar cf "../${name}-${version}.tar.gz" * +tar czf "../${name}-${version}.tar.gz" * cd .. rm -r tarball-tmp "${name}-${version}.orig.zip" diff --git a/maven-surefire.spec b/maven-surefire.spec index 64202f2..7de1ae7 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,24 +1,23 @@ - Name: maven-surefire -Version: 2.22.0 -Release: 3%{?dist} +Version: 3.0.0 +Release: 0.1.M3%{?dist} Summary: Test framework project License: ASL 2.0 and CPL URL: http://maven.apache.org/surefire/ BuildArch: noarch -# ./generate-tarball.sh -Source0: %{name}-%{version}.tar.gz +# ./generate-tarball.sh 3.0.0-M3 +Source0: %{name}-%{version}-M3.tar.gz # Remove bundled binaries which cannot be easily verified for licensing Source1: generate-tarball.sh Source2: http://junit.sourceforge.net/cpl-v10.html -Patch0: 0001-Maven-3.patch -Patch1: 0002-Port-to-current-doxia.patch -Patch2: 0003-Port-to-TestNG-6.11.patch -Patch3: 0004-Port-to-current-maven-shared-utils.patch +Patch1: 0001-Port-to-TestNG-6.11.patch +Patch2: 0002-Port-to-current-maven-shared-utils.patch BuildRequires: maven-local +BuildRequires: maven-assembly-plugin +BuildRequires: maven-toolchain BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) @@ -113,13 +112,11 @@ Summary: Javadoc for %{name} Javadoc for %{name}. %prep -%setup -q -n surefire-%{version} +%setup -q -n surefire-%{version}-M3 cp -p %{SOURCE2} . -%patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 # Disable strict doclint sed -i /-Xdoclint:all/d pom.xml @@ -132,7 +129,7 @@ sed -i /-Xdoclint:all/d pom.xml # Help plugin is needed only to evaluate effective Maven settings. # For building RPM package default settings will suffice. -%pom_remove_plugin :maven-help-plugin surefire-setup-integration-tests +%pom_remove_plugin :maven-help-plugin surefire-its # QA plugin useful only for upstream %pom_remove_plugin -r :jacoco-maven-plugin @@ -146,15 +143,6 @@ sed -i /-Xdoclint:all/d pom.xml %pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin %pom_remove_dep -r ::::site-source -%pom_xpath_set pom:mavenVersion 3.3.3 -%pom_remove_dep :maven-project maven-surefire-report-plugin -%pom_remove_dep :maven-project maven-surefire-common -%pom_remove_dep :maven-plugin-descriptor maven-surefire-common -%pom_remove_dep :maven-toolchain maven-surefire-common - -%pom_xpath_remove -r "pom:execution[pom:id='shared-logging-generated-sources']" - -%pom_add_dep com.google.code.findbugs:jsr305 surefire-api %build %mvn_package ":*{surefire-plugin,report-plugin}*" @1 @@ -163,7 +151,7 @@ sed -i /-Xdoclint:all/d pom.xml %mvn_package ":*tests*" __noinstall # tests turned off because they need jmock # use xmvn-javadoc because maven-javadoc-plugin crashes JVM -%mvn_build -f -j -G org.fedoraproject.xmvn:xmvn-mojo:javadoc +%mvn_build -X -f -j -G org.fedoraproject.xmvn:xmvn-mojo:javadoc %install %mvn_install @@ -184,6 +172,9 @@ sed -i /-Xdoclint:all/d pom.xml %license LICENSE NOTICE cpl-v10.html %changelog +* Sat Apr 13 2019 Mikolaj Izdebski - 3.0.0-0.1.M3 +- Update to upstream 3.0.0-M3 milestone snapshot + * Tue Jul 31 2018 Michael Simacek - 0:2.22.0-3 - Repack the tarball without binaries diff --git a/sources b/sources index 45b81bf..2a4a19d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (maven-surefire-2.22.0.tar.gz) = 339d76ef07280e72dea3217c545de1b36b02fdfa31258f3e9cb7ac9169c6826dbde5a2d39088482b3069054e957a27860547b09a6933c04ca7039fc9a0175d35 +SHA512 (maven-surefire-3.0.0-M3.tar.gz) = 1d6ced3e3f778be217c2d38f5ac4e748aa2fbda1c6214f04c3f76b15e56014364d52cb14f0fbb0b5f132e74304f1e3e3ff7fac49fd1e208b673596b25d287040 SHA512 (cpl-v10.html) = f7aa86fafb6a7831b1a5302099fbfe95361bcb5c49a2bc7aac0f5d53cea6c92fc3adbba897a54ab5b0cf32771cdc933fc5bb233461fbd48254a250d0d59109c9 From 443753f6bcfc38642c2b87d03a7dd80c99c03835 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 May 2019 18:58:30 +0200 Subject: [PATCH 04/24] Switch to tilde versioning --- maven-surefire.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index 7de1ae7..5b0d2de 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,6 +1,6 @@ Name: maven-surefire -Version: 3.0.0 -Release: 0.1.M3%{?dist} +Version: 3.0.0~M3 +Release: 1%{?dist} Summary: Test framework project License: ASL 2.0 and CPL URL: http://maven.apache.org/surefire/ @@ -172,6 +172,9 @@ sed -i /-Xdoclint:all/d pom.xml %license LICENSE NOTICE cpl-v10.html %changelog +* Mon May 13 2019 Mikolaj Izdebski - 3.0.0~M3-1 +- Switch to tilde versioning + * Sat Apr 13 2019 Mikolaj Izdebski - 3.0.0-0.1.M3 - Update to upstream 3.0.0-M3 milestone snapshot From 1c09515ca6c19c69a7451df0cf2000dbf3989108 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 May 2019 19:08:08 +0200 Subject: [PATCH 05/24] Inline %{version} macro --- maven-surefire.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index 5b0d2de..57bceec 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -7,7 +7,7 @@ URL: http://maven.apache.org/surefire/ BuildArch: noarch # ./generate-tarball.sh 3.0.0-M3 -Source0: %{name}-%{version}-M3.tar.gz +Source0: %{name}-3.0.0-M3.tar.gz # Remove bundled binaries which cannot be easily verified for licensing Source1: generate-tarball.sh Source2: http://junit.sourceforge.net/cpl-v10.html @@ -112,7 +112,7 @@ Summary: Javadoc for %{name} Javadoc for %{name}. %prep -%setup -q -n surefire-%{version}-M3 +%setup -q -n surefire-3.0.0-M3 cp -p %{SOURCE2} . %patch1 -p1 From 23f96427a5cbd1c91672910a0be56737c6e59098 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:17 +0200 Subject: [PATCH 06/24] Mass rebuild for javapackages-tools 201901 --- maven-surefire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index 57bceec..1e28a46 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,6 +1,6 @@ Name: maven-surefire Version: 3.0.0~M3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Test framework project License: ASL 2.0 and CPL URL: http://maven.apache.org/surefire/ @@ -172,6 +172,9 @@ sed -i /-Xdoclint:all/d pom.xml %license LICENSE NOTICE cpl-v10.html %changelog +* Fri May 24 2019 Mikolaj Izdebski - 3.0.0~M3-2 +- Mass rebuild for javapackages-tools 201901 + * Mon May 13 2019 Mikolaj Izdebski - 3.0.0~M3-1 - Switch to tilde versioning From 6dde2c1ae77290b4a90a4d8a074f4a098a323ed5 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 10 Jul 2019 16:48:57 +0200 Subject: [PATCH 07/24] Remove dependency on maven-shade-plugin --- maven-surefire.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index 1e28a46..b4b6de2 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,6 +1,6 @@ Name: maven-surefire Version: 3.0.0~M3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Test framework project License: ASL 2.0 and CPL URL: http://maven.apache.org/surefire/ @@ -32,7 +32,6 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) @@ -47,7 +46,6 @@ BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.testng:testng) BuildRequires: mvn(org.testng:testng::jdk15:) - # PpidChecker relies on /usr/bin/ps to check process uptime Requires: procps-ng @@ -72,7 +70,6 @@ Summary: JUnit provider for Maven Surefire %description provider-junit JUnit provider for Maven Surefire. - %package provider-testng Summary: TestNG provider for Maven Surefire @@ -143,6 +140,8 @@ sed -i /-Xdoclint:all/d pom.xml %pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin %pom_remove_dep -r ::::site-source +%pom_remove_plugin -r :maven-shade-plugin +%pom_remove_plugin :maven-shade-plugin surefire-shadefire %build %mvn_package ":*{surefire-plugin,report-plugin}*" @1 @@ -156,7 +155,6 @@ sed -i /-Xdoclint:all/d pom.xml %install %mvn_install - %files -f .mfiles %doc README.md %license LICENSE NOTICE cpl-v10.html @@ -172,6 +170,9 @@ sed -i /-Xdoclint:all/d pom.xml %license LICENSE NOTICE cpl-v10.html %changelog +* Wed Jul 10 2019 Marian Koncek - 3.0.0~M3-3 +- Remove dependency on maven-shade-plugin + * Fri May 24 2019 Mikolaj Izdebski - 3.0.0~M3-2 - Mass rebuild for javapackages-tools 201901 From bc5f2fabe9adf0226e3189c688d716666b34535d Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 15 Jul 2019 10:00:25 +0200 Subject: [PATCH 08/24] Revert "Remove dependency on maven-shade-plugin" This reverts commit 6dde2c1ae77290b4a90a4d8a074f4a098a323ed5. --- maven-surefire.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index b4b6de2..1e28a46 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,6 +1,6 @@ Name: maven-surefire Version: 3.0.0~M3 -Release: 3%{?dist} +Release: 2%{?dist} Summary: Test framework project License: ASL 2.0 and CPL URL: http://maven.apache.org/surefire/ @@ -32,6 +32,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) @@ -46,6 +47,7 @@ BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.testng:testng) BuildRequires: mvn(org.testng:testng::jdk15:) + # PpidChecker relies on /usr/bin/ps to check process uptime Requires: procps-ng @@ -70,6 +72,7 @@ Summary: JUnit provider for Maven Surefire %description provider-junit JUnit provider for Maven Surefire. + %package provider-testng Summary: TestNG provider for Maven Surefire @@ -140,8 +143,6 @@ sed -i /-Xdoclint:all/d pom.xml %pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin %pom_remove_dep -r ::::site-source -%pom_remove_plugin -r :maven-shade-plugin -%pom_remove_plugin :maven-shade-plugin surefire-shadefire %build %mvn_package ":*{surefire-plugin,report-plugin}*" @1 @@ -155,6 +156,7 @@ sed -i /-Xdoclint:all/d pom.xml %install %mvn_install + %files -f .mfiles %doc README.md %license LICENSE NOTICE cpl-v10.html @@ -170,9 +172,6 @@ sed -i /-Xdoclint:all/d pom.xml %license LICENSE NOTICE cpl-v10.html %changelog -* Wed Jul 10 2019 Marian Koncek - 3.0.0~M3-3 -- Remove dependency on maven-shade-plugin - * Fri May 24 2019 Mikolaj Izdebski - 3.0.0~M3-2 - Mass rebuild for javapackages-tools 201901 From 2166576e68fa53dac2fd856fcf584016b9f76edc Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 28 Oct 2019 10:30:21 +0100 Subject: [PATCH 09/24] Enable JUnit 5 provider --- maven-surefire.spec | 46 ++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index 1e28a46..1c3ac38 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,6 +1,6 @@ Name: maven-surefire Version: 3.0.0~M3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Test framework project License: ASL 2.0 and CPL URL: http://maven.apache.org/surefire/ @@ -16,34 +16,36 @@ Patch1: 0001-Port-to-TestNG-6.11.patch Patch2: 0002-Port-to-current-maven-shared-utils.patch BuildRequires: maven-local -BuildRequires: maven-assembly-plugin -BuildRequires: maven-toolchain BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(commons-lang:commons-lang) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-lang3) +BuildRequires: mvn(org.apache.maven.doxia:doxia-core) +BuildRequires: mvn(org.apache.maven.doxia:doxia-decoration-model) +BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) +BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) +BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) +BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) +BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) -BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) -BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) -BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) -BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) -BuildRequires: mvn(org.apache.maven.shared:maven-verifier) +BuildRequires: mvn(org.apache.maven:maven-toolchain) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.mojo:javacc-maven-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-java) -BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.fusesource.jansi:jansi) +BuildRequires: mvn(org.junit.platform:junit-platform-launcher) BuildRequires: mvn(org.testng:testng) BuildRequires: mvn(org.testng:testng::jdk15:) @@ -72,6 +74,11 @@ Summary: JUnit provider for Maven Surefire %description provider-junit JUnit provider for Maven Surefire. +%package provider-junit5 +Summary: JUnit 5 provider for Maven Surefire + +%description provider-junit5 +JUnit 5 provider for Maven Surefire. %package provider-testng Summary: TestNG provider for Maven Surefire @@ -123,8 +130,6 @@ sed -i /-Xdoclint:all/d pom.xml %pom_disable_module surefire-shadefire -%pom_disable_module surefire-junit-platform surefire-providers - %pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire # Help plugin is needed only to evaluate effective Maven settings. @@ -150,8 +155,7 @@ sed -i /-Xdoclint:all/d pom.xml %mvn_package ":*{junit,testng,failsafe-plugin,report-parser}*" @1 %mvn_package ":*tests*" __noinstall # tests turned off because they need jmock -# use xmvn-javadoc because maven-javadoc-plugin crashes JVM -%mvn_build -X -f -j -G org.fedoraproject.xmvn:xmvn-mojo:javadoc +%mvn_build -f %install %mvn_install @@ -165,6 +169,7 @@ sed -i /-Xdoclint:all/d pom.xml %files report-plugin -f .mfiles-report-plugin %files report-parser -f .mfiles-report-parser %files provider-junit -f .mfiles-junit +%files provider-junit5 -f .mfiles-junit5 %files provider-testng -f .mfiles-testng %files -n maven-failsafe-plugin -f .mfiles-failsafe-plugin @@ -172,6 +177,9 @@ sed -i /-Xdoclint:all/d pom.xml %license LICENSE NOTICE cpl-v10.html %changelog +* Mon Oct 28 2019 Mikolaj Izdebski - 3.0.0~M3-3 +- Enable JUnit 5 provider + * Fri May 24 2019 Mikolaj Izdebski - 3.0.0~M3-2 - Mass rebuild for javapackages-tools 201901 From 578892604e0a9c71eed2b58a9b7662bca2d15ab8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 28 Oct 2019 10:52:30 +0100 Subject: [PATCH 10/24] Disable report parser and report plugin --- maven-surefire.spec | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index 1c3ac38..933e5a5 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -18,21 +18,14 @@ Patch2: 0002-Port-to-current-maven-shared-utils.patch BuildRequires: maven-local BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(commons-lang:commons-lang) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-lang3) -BuildRequires: mvn(org.apache.maven.doxia:doxia-core) -BuildRequires: mvn(org.apache.maven.doxia:doxia-decoration-model) -BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) -BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) -BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) -BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) BuildRequires: mvn(org.apache.maven:maven-artifact) @@ -41,7 +34,6 @@ BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-toolchain) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.mojo:javacc-maven-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-java) BuildRequires: mvn(org.fusesource.jansi:jansi) @@ -62,12 +54,6 @@ Summary: Surefire plugin for maven %description plugin Maven surefire plugin for running tests via the surefire framework. -%package report-plugin -Summary: Surefire reports plugin for maven - -%description report-plugin -Plugin for generating reports from surefire test runs. - %package provider-junit Summary: JUnit provider for Maven Surefire @@ -86,12 +72,6 @@ Summary: TestNG provider for Maven Surefire %description provider-testng TestNG provider for Maven Surefire. -%package report-parser -Summary: Parses report output files from surefire - -%description report-parser -Plugin for parsing report output files from surefire. - %package -n maven-failsafe-plugin Summary: Maven plugin for running integration tests @@ -128,6 +108,8 @@ cp -p %{SOURCE2} . # Disable strict doclint sed -i /-Xdoclint:all/d pom.xml +%pom_disable_module maven-surefire-report-plugin +%pom_disable_module surefire-report-parser %pom_disable_module surefire-shadefire %pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire @@ -150,9 +132,9 @@ sed -i /-Xdoclint:all/d pom.xml %build -%mvn_package ":*{surefire-plugin,report-plugin}*" @1 +%mvn_package ":*{surefire-plugin}*" @1 %mvn_package ":*junit-platform*" junit5 -%mvn_package ":*{junit,testng,failsafe-plugin,report-parser}*" @1 +%mvn_package ":*{junit,testng,failsafe-plugin}*" @1 %mvn_package ":*tests*" __noinstall # tests turned off because they need jmock %mvn_build -f @@ -166,8 +148,6 @@ sed -i /-Xdoclint:all/d pom.xml %license LICENSE NOTICE cpl-v10.html %files plugin -f .mfiles-surefire-plugin -%files report-plugin -f .mfiles-report-plugin -%files report-parser -f .mfiles-report-parser %files provider-junit -f .mfiles-junit %files provider-junit5 -f .mfiles-junit5 %files provider-testng -f .mfiles-testng From 1c31765a2b4f78ffdde69283e2382e895b0d12e1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 28 Oct 2019 11:37:59 +0100 Subject: [PATCH 11/24] Require appropriate providers depending on installed packages --- maven-surefire.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maven-surefire.spec b/maven-surefire.spec index 933e5a5..223ee3e 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -50,6 +50,9 @@ Surefire is a test framework project. %package plugin Summary: Surefire plugin for maven +Requires: (%{name}-provider-junit = %{version}-%{release} if junit) +Requires: (%{name}-provider-junit5 = %{version}-%{release} if junit5) +Requires: (%{name}-provider-testng = %{version}-%{release} if testng) %description plugin Maven surefire plugin for running tests via the surefire framework. From c359166b1a461b2585a107b4132e86ec0b251e57 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 12/24] Mass rebuild for javapackages-tools 201902 --- maven-surefire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index 223ee3e..d48276a 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,6 +1,6 @@ Name: maven-surefire Version: 3.0.0~M3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Test framework project License: ASL 2.0 and CPL URL: http://maven.apache.org/surefire/ @@ -160,6 +160,9 @@ sed -i /-Xdoclint:all/d pom.xml %license LICENSE NOTICE cpl-v10.html %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 3.0.0~M3-4 +- Mass rebuild for javapackages-tools 201902 + * Mon Oct 28 2019 Mikolaj Izdebski - 3.0.0~M3-3 - Enable JUnit 5 provider From 015b74e0ae81c497d45740dd658f3f21febe989b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 27 Apr 2020 10:12:24 +0200 Subject: [PATCH 13/24] Disable surefire-grouper --- maven-surefire.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index d48276a..1b28d04 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -34,7 +34,6 @@ BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-toolchain) -BuildRequires: mvn(org.codehaus.mojo:javacc-maven-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-java) BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.junit.platform:junit-platform-launcher) @@ -114,6 +113,7 @@ sed -i /-Xdoclint:all/d pom.xml %pom_disable_module maven-surefire-report-plugin %pom_disable_module surefire-report-parser %pom_disable_module surefire-shadefire +%pom_disable_module surefire-grouper %pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire From a89fc76187373e085c82d3dda9d68cd05545d08c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 27 Apr 2020 10:48:18 +0200 Subject: [PATCH 14/24] Disable JUnit 4.8 test grouping --- 0001-Port-to-TestNG-6.11.patch | 10 +- 0002-Port-to-current-maven-shared-utils.patch | 8 +- 0003-Disable-JUnit-4.8-test-grouping.patch | 118 ++++++++++++++++++ maven-surefire.spec | 7 ++ 4 files changed, 134 insertions(+), 9 deletions(-) create mode 100644 0003-Disable-JUnit-4.8-test-grouping.patch diff --git a/0001-Port-to-TestNG-6.11.patch b/0001-Port-to-TestNG-6.11.patch index 0281bd5..ad3562c 100644 --- a/0001-Port-to-TestNG-6.11.patch +++ b/0001-Port-to-TestNG-6.11.patch @@ -1,7 +1,7 @@ -From 69c97f47a7bbec601b407cd2cd81aee64507e562 Mon Sep 17 00:00:00 2001 +From 14196b58bc1d96d76636914b575dc22b7cc94b1a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 10 Jul 2017 10:37:50 +0200 -Subject: [PATCH 1/2] Port to TestNG 6.11 +Subject: [PATCH 1/3] Port to TestNG 6.11 --- surefire-providers/surefire-testng/pom.xml | 3 +-- @@ -9,7 +9,7 @@ Subject: [PATCH 1/2] Port to TestNG 6.11 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 +index 49e75b6ea..a9db4a8d9 100644 --- a/surefire-providers/surefire-testng/pom.xml +++ b/surefire-providers/surefire-testng/pom.xml @@ -51,8 +51,7 @@ @@ -23,7 +23,7 @@ index 49e75b6e..a9db4a8d 100644 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 +index e9667316b..7021ef561 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 options ) @@ -36,5 +36,5 @@ index e9667316..7021ef56 100644 @Override -- -2.20.1 +2.25.2 diff --git a/0002-Port-to-current-maven-shared-utils.patch b/0002-Port-to-current-maven-shared-utils.patch index 8c69771..5dcf46c 100644 --- a/0002-Port-to-current-maven-shared-utils.patch +++ b/0002-Port-to-current-maven-shared-utils.patch @@ -1,14 +1,14 @@ -From a96b8f5dd6d7fc51d9056c93bd08635e06957ea5 Mon Sep 17 00:00:00 2001 +From 6a94c7674f844218752827f2b62de629691fcf39 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 16 Mar 2018 13:45:01 +0100 -Subject: [PATCH 2/2] Port to current maven-shared-utils +Subject: [PATCH 2/3] Port to current maven-shared-utils --- .../plugin/surefire/report/StatelessXmlReporter.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java -index b89c4e9b..8cf0b60c 100644 +index b89c4e9b0..8cf0b60c3 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java @@ -326,7 +326,7 @@ private static File getReportFile( ReportEntry report, File reportsDirectory, St @@ -66,5 +66,5 @@ index b89c4e9b..8cf0b60c 100644 xmlWriter.startElement( "properties" ); for ( final Entry entry : systemProperties.entrySet() ) -- -2.20.1 +2.25.2 diff --git a/0003-Disable-JUnit-4.8-test-grouping.patch b/0003-Disable-JUnit-4.8-test-grouping.patch new file mode 100644 index 0000000..ef03f05 --- /dev/null +++ b/0003-Disable-JUnit-4.8-test-grouping.patch @@ -0,0 +1,118 @@ +From 21890515f3eeba73065b79b6a65678ec1e2a821d Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 27 Apr 2020 10:45:30 +0200 +Subject: [PATCH 3/3] Disable JUnit 4.8 test grouping + +--- + .../surefire/junitcore/JUnitCoreProvider.java | 25 +++-------------- + .../maven/surefire/testng/TestNGExecutor.java | 27 ------------------- + 2 files changed, 3 insertions(+), 49 deletions(-) + +diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java +index 7c74e8b86..c86bb276c 100644 +--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java ++++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java +@@ -25,7 +25,6 @@ + import org.apache.maven.surefire.common.junit4.JUnit4RunListener; + import org.apache.maven.surefire.common.junit4.JUnitTestFailureListener; + import org.apache.maven.surefire.common.junit4.Notifier; +-import org.apache.maven.surefire.common.junit48.FilterFactory; + import org.apache.maven.surefire.common.junit48.JUnit48Reflector; + import org.apache.maven.surefire.common.junit48.JUnit48TestChecker; + import org.apache.maven.surefire.providerapi.AbstractProvider; +@@ -47,6 +46,7 @@ + import java.util.concurrent.ConcurrentHashMap; + + import static org.apache.maven.surefire.booter.CommandReader.getReader; ++import static org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil.createMatchAnyDescriptionFilter; + import static org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil.generateFailingTestDescriptions; + import static org.apache.maven.surefire.common.junit4.JUnit4RunListenerFactory.createCustomListeners; + import static org.apache.maven.surefire.common.junit4.Notifier.pureNotifier; +@@ -126,7 +126,7 @@ public RunResult invoke( Object forkTestSet ) + new Notifier( createRunListener( reporterFactory, consoleStream ), getSkipAfterFailureCount() ); + // startCapture() called in createRunListener() in prior to setTestsToRun() + +- Filter filter = jUnit48Reflector.isJUnit48Available() ? createJUnit48Filter() : null; ++ Filter filter = null; + + if ( testsToRun == null ) + { +@@ -168,8 +168,7 @@ public RunResult invoke( Object forkTestSet ) + { + Set failures = generateFailingTestDescriptions( testFailureListener.getAllFailures() ); + testFailureListener.reset(); +- FilterFactory filterFactory = new FilterFactory( testClassLoader ); +- Filter failureDescriptionFilter = filterFactory.createMatchAnyDescriptionFilter( failures ); ++ Filter failureDescriptionFilter = createMatchAnyDescriptionFilter( failures ); + rerunCore.execute( testsToRun, failureDescriptionFilter ); + } + } +@@ -270,24 +269,6 @@ private boolean isParallelTypes() + return jUnitCoreParameters.isParallelClasses() || jUnitCoreParameters.isParallelSuites(); + } + +- private Filter createJUnit48Filter() +- { +- final FilterFactory factory = new FilterFactory( testClassLoader ); +- Map props = providerParameters.getProviderProperties(); +- Filter groupFilter = factory.canCreateGroupFilter( props ) ? factory.createGroupFilter( props ) : null; +- TestListResolver methodFilter = optionallyWildcardFilter( testResolver ); +- boolean onlyGroups = methodFilter.isEmpty() || methodFilter.isWildcard(); +- if ( onlyGroups ) +- { +- return groupFilter; +- } +- else +- { +- Filter jUnitMethodFilter = factory.createMethodFilter( methodFilter ); +- return groupFilter == null ? jUnitMethodFilter : factory.and( groupFilter, jUnitMethodFilter ); +- } +- } +- + private TestsToRun scanClassPath() + { + TestsToRun scanned = scanResult.applyFilter( scannerFilter, testClassLoader ); +diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java +index 6bc30a300..05c55f55a 100644 +--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java ++++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java +@@ -237,36 +237,9 @@ private static XmlMethodSelector createMethodNameFilteringSelector( TestListReso + private static XmlMethodSelector createGroupMatchingSelector( Map options ) + throws TestSetFailedException + { +- final String groups = options.get( ProviderParameterNames.TESTNG_GROUPS_PROP ); +- final String excludedGroups = options.get( ProviderParameterNames.TESTNG_EXCLUDEDGROUPS_PROP ); +- +- if ( groups == null && excludedGroups == null ) + { + return null; + } +- +- // the class is available in the testClassPath +- final String clazzName = "org.apache.maven.surefire.testng.utils.GroupMatcherMethodSelector"; +- try +- { +- Class clazz = Class.forName( clazzName ); +- +- // HORRIBLE hack, but TNG doesn't allow us to setup a method selector instance directly. +- Method method = clazz.getMethod( "setGroups", String.class, String.class ); +- method.invoke( null, groups, excludedGroups ); +- } +- catch ( Exception e ) +- { +- throw new TestSetFailedException( e.getMessage(), e ); +- } +- +- XmlMethodSelector xms = new XmlMethodSelector(); +- +- xms.setName( clazzName ); +- // looks to need a high value +- xms.setPriority( 9999 ); +- +- return xms; + } + + static void run( List suiteFiles, String testSourceDirectory, +-- +2.25.2 + diff --git a/maven-surefire.spec b/maven-surefire.spec index 1b28d04..e5accc5 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -14,6 +14,7 @@ Source2: http://junit.sourceforge.net/cpl-v10.html Patch1: 0001-Port-to-TestNG-6.11.patch Patch2: 0002-Port-to-current-maven-shared-utils.patch +Patch3: 0003-Disable-JUnit-4.8-test-grouping.patch BuildRequires: maven-local BuildRequires: mvn(com.google.code.findbugs:jsr305) @@ -106,6 +107,7 @@ cp -p %{SOURCE2} . %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Disable strict doclint sed -i /-Xdoclint:all/d pom.xml @@ -113,7 +115,12 @@ sed -i /-Xdoclint:all/d pom.xml %pom_disable_module maven-surefire-report-plugin %pom_disable_module surefire-report-parser %pom_disable_module surefire-shadefire + %pom_disable_module surefire-grouper +%pom_remove_dep :surefire-grouper surefire-providers/common-junit48 +%pom_remove_dep :surefire-grouper surefire-providers/surefire-testng-utils +rm surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/{FilterFactory,GroupMatcherCategoryFilter}.java +rm surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java %pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire From 849025b64466f9d9ad72e68f229b5e00d00fddb3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 17 May 2020 09:46:32 +0200 Subject: [PATCH 15/24] Remove dependency on maven-toolchain --- maven-surefire.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index e5accc5..af2a4f3 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -34,7 +34,6 @@ BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven:maven-toolchain) BuildRequires: mvn(org.codehaus.plexus:plexus-java) BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.junit.platform:junit-platform-launcher) @@ -116,6 +115,8 @@ sed -i /-Xdoclint:all/d pom.xml %pom_disable_module surefire-report-parser %pom_disable_module surefire-shadefire +%pom_remove_dep :maven-toolchain maven-surefire-common + %pom_disable_module surefire-grouper %pom_remove_dep :surefire-grouper surefire-providers/common-junit48 %pom_remove_dep :surefire-grouper surefire-providers/surefire-testng-utils From b4a06ccf1817389597f98dd13484b4311482e02e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 17 May 2020 09:51:19 +0200 Subject: [PATCH 16/24] Remove dependency on maven-shade-plugin --- maven-surefire.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index af2a4f3..64eb5c2 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -26,7 +26,6 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) BuildRequires: mvn(org.apache.maven:maven-artifact) @@ -131,7 +130,8 @@ rm surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/suref # QA plugin useful only for upstream %pom_remove_plugin -r :jacoco-maven-plugin - +# Not wanted +%pom_remove_plugin -r :maven-shade-plugin # Not in Fedora %pom_remove_plugin -r :animal-sniffer-maven-plugin # Complains From a8977f06e840db9f473bab26225137191f92bd40 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 29 Jul 2020 16:17:11 +0200 Subject: [PATCH 17/24] Build against commons-io 2.7 --- maven-surefire.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index 64eb5c2..bb5da99 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -148,7 +148,7 @@ rm surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/suref %mvn_package ":*{junit,testng,failsafe-plugin}*" @1 %mvn_package ":*tests*" __noinstall # tests turned off because they need jmock -%mvn_build -f +%mvn_build -f -- -DcommonsIoVersion=2.7 %install %mvn_install From d462b7c62c571a2ffa058f242ae7dd0692e32fb3 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 4 Aug 2020 15:42:41 +0200 Subject: [PATCH 18/24] Build against commons-lang 3.11 --- maven-surefire.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index bb5da99..f2d28b4 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -148,7 +148,7 @@ rm surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/suref %mvn_package ":*{junit,testng,failsafe-plugin}*" @1 %mvn_package ":*tests*" __noinstall # tests turned off because they need jmock -%mvn_build -f -- -DcommonsIoVersion=2.7 +%mvn_build -f -- -DcommonsIoVersion=2.7 -DcommonsLang3Version=3.11 %install %mvn_install From 1320075484668c20458570446519ebe667659468 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 11 Sep 2020 14:09:59 +0200 Subject: [PATCH 19/24] Port to maven-shared-utils 3.3.3 --- 0004-Port-to-maven-shared-utils-3.3.3.patch | 57 +++++++++++++++++++++ maven-surefire.spec | 2 + 2 files changed, 59 insertions(+) create mode 100644 0004-Port-to-maven-shared-utils-3.3.3.patch diff --git a/0004-Port-to-maven-shared-utils-3.3.3.patch b/0004-Port-to-maven-shared-utils-3.3.3.patch new file mode 100644 index 0000000..0dac2d5 --- /dev/null +++ b/0004-Port-to-maven-shared-utils-3.3.3.patch @@ -0,0 +1,57 @@ +From 980a109bd3607f1035097d6ad923f82cc58c95d2 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Fri, 11 Sep 2020 12:17:15 +0200 +Subject: [PATCH] Port to maven-shared-utils 3.3.3 + +--- + .../DefaultForkConfiguration.java | 26 ++++++++++++------- + 1 file changed, 16 insertions(+), 10 deletions(-) + +diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java +index fa9945123..ed75ecdff 100644 +--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java ++++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java +@@ -42,6 +42,8 @@ + import static org.apache.maven.plugin.surefire.SurefireHelper.replaceThreadNumberPlaceholders; + import static org.apache.maven.surefire.booter.Classpath.join; + ++import org.apache.maven.shared.utils.cli.CommandLineException; ++ + /** + * Basic framework which constructs CLI. + * +@@ -131,17 +133,21 @@ public OutputStreamFlushableCommandline createCommandLine( @Nonnull StartupConfi + + cli.setExecutable( getJdkForTests().getJvmExecutable() ); + +- String jvmArgLine = newJvmArgLine( forkNumber ); +- if ( !jvmArgLine.isEmpty() ) +- { +- cli.createArg() +- .setLine( jvmArgLine ); +- } ++ try { ++ String jvmArgLine = newJvmArgLine( forkNumber ); ++ if ( !jvmArgLine.isEmpty() ) ++ { ++ cli.createArg() ++ .setLine( jvmArgLine ); ++ } + +- if ( getDebugLine() != null && !getDebugLine().isEmpty() ) +- { +- cli.createArg() +- .setLine( getDebugLine() ); ++ if ( getDebugLine() != null && !getDebugLine().isEmpty() ) ++ { ++ cli.createArg() ++ .setLine( getDebugLine() ); ++ } ++ } catch (CommandLineException ex) { ++ throw new SurefireBooterForkException("", ex); + } + + resolveClasspath( cli, findStartClass( config ), config, dumpLogDirectory ); +-- +2.26.2 + diff --git a/maven-surefire.spec b/maven-surefire.spec index f2d28b4..68ea441 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -15,6 +15,7 @@ Source2: http://junit.sourceforge.net/cpl-v10.html Patch1: 0001-Port-to-TestNG-6.11.patch Patch2: 0002-Port-to-current-maven-shared-utils.patch Patch3: 0003-Disable-JUnit-4.8-test-grouping.patch +Patch4: 0004-Port-to-maven-shared-utils-3.3.3.patch BuildRequires: maven-local BuildRequires: mvn(com.google.code.findbugs:jsr305) @@ -106,6 +107,7 @@ cp -p %{SOURCE2} . %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # Disable strict doclint sed -i /-Xdoclint:all/d pom.xml From ad796198a1d3eba403bb1dd494c391f86d517831 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 21 Sep 2020 16:27:19 +0200 Subject: [PATCH 20/24] Use https --- maven-surefire.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index 68ea441..5f1b2c0 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -3,14 +3,14 @@ Version: 3.0.0~M3 Release: 4%{?dist} Summary: Test framework project License: ASL 2.0 and CPL -URL: http://maven.apache.org/surefire/ +URL: https://maven.apache.org/surefire/ BuildArch: noarch # ./generate-tarball.sh 3.0.0-M3 Source0: %{name}-3.0.0-M3.tar.gz # Remove bundled binaries which cannot be easily verified for licensing Source1: generate-tarball.sh -Source2: http://junit.sourceforge.net/cpl-v10.html +Source2: https://junit.sourceforge.net/cpl-v10.html Patch1: 0001-Port-to-TestNG-6.11.patch Patch2: 0002-Port-to-current-maven-shared-utils.patch From 3e9075954d82f62d474084459537dfcbb48c1bd9 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 29 Sep 2020 12:10:08 +0200 Subject: [PATCH 21/24] Build against commons-io 2.8.0 --- maven-surefire.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index 5f1b2c0..0b5e4f4 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -150,7 +150,7 @@ rm surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/suref %mvn_package ":*{junit,testng,failsafe-plugin}*" @1 %mvn_package ":*tests*" __noinstall # tests turned off because they need jmock -%mvn_build -f -- -DcommonsIoVersion=2.7 -DcommonsLang3Version=3.11 +%mvn_build -f -- -DcommonsIoVersion=2.8.0 -DcommonsLang3Version=3.11 %install %mvn_install From 3a53f1a83de684aa126609de69ad3912cd58e543 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 22/24] Conditionalize buildrequires in bootstrap mode --- maven-surefire.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-surefire.spec b/maven-surefire.spec index 0b5e4f4..2b9dcad 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: maven-surefire Version: 3.0.0~M3 Release: 4%{?dist} @@ -18,6 +20,9 @@ Patch3: 0003-Disable-JUnit-4.8-test-grouping.patch Patch4: 0004-Port-to-maven-shared-utils-3.3.3.patch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) @@ -39,6 +44,7 @@ BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.junit.platform:junit-platform-launcher) BuildRequires: mvn(org.testng:testng) BuildRequires: mvn(org.testng:testng::jdk15:) +%endif # PpidChecker relies on /usr/bin/ps to check process uptime From fe430c9ff1b5265064a3c0d4ccee559c227bb445 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 23/24] Turn off bootstrap mode by default --- maven-surefire.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-surefire.spec b/maven-surefire.spec index 2b9dcad..2a83b9c 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: maven-surefire Version: 3.0.0~M3 From b43fb8cc81501765fa7320e1443a2533df9cc124 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 14 May 2021 18:38:36 +0200 Subject: [PATCH 24/24] Update to upstream version 3.0.0~M4 --- .gitignore | 1 + ...0002-Disable-JUnit-4.8-test-grouping.patch | 0 0002-Port-to-current-maven-shared-utils.patch | 70 ------------------- ...003-Port-to-maven-shared-utils-3.3.3.patch | 0 generate-tarball.sh | 9 +-- maven-surefire.spec | 33 ++++----- sources | 2 +- 7 files changed, 22 insertions(+), 93 deletions(-) rename 0003-Disable-JUnit-4.8-test-grouping.patch => 0002-Disable-JUnit-4.8-test-grouping.patch (100%) delete mode 100644 0002-Port-to-current-maven-shared-utils.patch rename 0004-Port-to-maven-shared-utils-3.3.3.patch => 0003-Port-to-maven-shared-utils-3.3.3.patch (100%) diff --git a/.gitignore b/.gitignore index 3636942..0e49534 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ surefire-2.10-source-release.zip /surefire-2.22.0-source-release.zip /maven-surefire-2.22.0.tar.gz /maven-surefire-3.0.0-M3.tar.gz +/maven-surefire-3.0.0~M4.tar.gz diff --git a/0003-Disable-JUnit-4.8-test-grouping.patch b/0002-Disable-JUnit-4.8-test-grouping.patch similarity index 100% rename from 0003-Disable-JUnit-4.8-test-grouping.patch rename to 0002-Disable-JUnit-4.8-test-grouping.patch diff --git a/0002-Port-to-current-maven-shared-utils.patch b/0002-Port-to-current-maven-shared-utils.patch deleted file mode 100644 index 5dcf46c..0000000 --- a/0002-Port-to-current-maven-shared-utils.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 6a94c7674f844218752827f2b62de629691fcf39 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Fri, 16 Mar 2018 13:45:01 +0100 -Subject: [PATCH 2/3] Port to current maven-shared-utils - ---- - .../plugin/surefire/report/StatelessXmlReporter.java | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java -index b89c4e9b0..8cf0b60c3 100644 ---- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java -+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java -@@ -326,7 +326,7 @@ private static File getReportFile( ReportEntry report, File reportsDirectory, St - } - - private static void startTestElement( XMLWriter ppw, WrappedReportEntry report, String reportNameSuffix, -- String timeAsString ) -+ String timeAsString ) throws IOException - { - ppw.startElement( "testcase" ); - ppw.addAttribute( "name", report.getReportName() ); -@@ -349,7 +349,7 @@ private static void startTestElement( XMLWriter ppw, WrappedReportEntry report, - } - - private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats, -- String timeAsString ) -+ String timeAsString ) throws IOException - { - ppw.startElement( "testsuite" ); - -@@ -377,7 +377,7 @@ private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, T - - private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLWriter ppw, - WrappedReportEntry report, boolean trimStackTrace, OutputStream fw, -- String testErrorType, boolean createOutErrElementsInside ) -+ String testErrorType, boolean createOutErrElementsInside ) throws IOException - { - ppw.startElement( testErrorType ); - -@@ -434,7 +434,7 @@ private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLW - - // Create system-out and system-err elements - private static void createOutErrElements( OutputStreamWriter outputStreamWriter, XMLWriter ppw, -- WrappedReportEntry report, OutputStream fw ) -+ WrappedReportEntry report, OutputStream fw ) throws IOException - { - EncodingOutputStream eos = new EncodingOutputStream( fw ); - addOutputStreamElement( outputStreamWriter, eos, ppw, report.getStdout(), "system-out" ); -@@ -444,7 +444,7 @@ private static void createOutErrElements( OutputStreamWriter outputStreamWriter, - private static void addOutputStreamElement( OutputStreamWriter outputStreamWriter, - EncodingOutputStream eos, XMLWriter xmlWriter, - Utf8RecodingDeferredFileOutputStream utf8RecodingDeferredFileOutputStream, -- String name ) -+ String name ) throws IOException - { - if ( utf8RecodingDeferredFileOutputStream != null && utf8RecodingDeferredFileOutputStream.getByteCount() > 0 ) - { -@@ -474,7 +474,7 @@ private static void addOutputStreamElement( OutputStreamWriter outputStreamWrite - * - * @param xmlWriter The test suite to report to - */ -- private static void showProperties( XMLWriter xmlWriter, Map systemProperties ) -+ private static void showProperties( XMLWriter xmlWriter, Map systemProperties ) throws IOException - { - xmlWriter.startElement( "properties" ); - for ( final Entry entry : systemProperties.entrySet() ) --- -2.25.2 - diff --git a/0004-Port-to-maven-shared-utils-3.3.3.patch b/0003-Port-to-maven-shared-utils-3.3.3.patch similarity index 100% rename from 0004-Port-to-maven-shared-utils-3.3.3.patch rename to 0003-Port-to-maven-shared-utils-3.3.3.patch diff --git a/generate-tarball.sh b/generate-tarball.sh index 37a1413..fec8974 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -2,14 +2,11 @@ set -e name=maven-surefire -if [[ -n "$1" ]]; then - version="$1" -else - version="$(sed -n 's/Version:\s*//p' *.spec)" -fi +version="$(sed -n 's/Version:\s*//p' *.spec)" +upstream_version="${version/'~'/'-'}" # RETRIEVE -wget "http://repo2.maven.org/maven2/org/apache/maven/surefire/surefire/${version}/surefire-${version}-source-release.zip" -O "${name}-${version}.orig.zip" +wget "https://repo1.maven.org/maven2/org/apache/maven/surefire/surefire/${upstream_version}/surefire-${upstream_version}-source-release.zip" -O "${name}-${version}.orig.zip" rm -rf tarball-tmp mkdir tarball-tmp diff --git a/maven-surefire.spec b/maven-surefire.spec index 2a83b9c..efc261d 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,23 +1,24 @@ %bcond_with bootstrap Name: maven-surefire -Version: 3.0.0~M3 -Release: 4%{?dist} +Version: 3.0.0~M4 +Release: 1%{?dist} Summary: Test framework project License: ASL 2.0 and CPL URL: https://maven.apache.org/surefire/ BuildArch: noarch -# ./generate-tarball.sh 3.0.0-M3 -Source0: %{name}-3.0.0-M3.tar.gz +%global upstream_version %(echo '%{version}' | tr '~' '-') + +# ./generate-tarball.sh +Source0: %{name}-%{version}.tar.gz # Remove bundled binaries which cannot be easily verified for licensing Source1: generate-tarball.sh Source2: https://junit.sourceforge.net/cpl-v10.html Patch1: 0001-Port-to-TestNG-6.11.patch -Patch2: 0002-Port-to-current-maven-shared-utils.patch -Patch3: 0003-Disable-JUnit-4.8-test-grouping.patch -Patch4: 0004-Port-to-maven-shared-utils-3.3.3.patch +Patch2: 0002-Disable-JUnit-4.8-test-grouping.patch +Patch3: 0003-Port-to-maven-shared-utils-3.3.3.patch BuildRequires: maven-local %if %{with bootstrap} @@ -63,25 +64,25 @@ Requires: (%{name}-provider-testng = %{version}-%{release} if testng) Maven surefire plugin for running tests via the surefire framework. %package provider-junit -Summary: JUnit provider for Maven Surefire +Summary: JUnit provider for Maven Surefire %description provider-junit JUnit provider for Maven Surefire. %package provider-junit5 -Summary: JUnit 5 provider for Maven Surefire +Summary: JUnit 5 provider for Maven Surefire %description provider-junit5 JUnit 5 provider for Maven Surefire. %package provider-testng -Summary: TestNG provider for Maven Surefire +Summary: TestNG provider for Maven Surefire %description provider-testng TestNG provider for Maven Surefire. %package -n maven-failsafe-plugin -Summary: Maven plugin for running integration tests +Summary: Maven plugin for running integration tests %description -n maven-failsafe-plugin The Failsafe Plugin is designed to run integration tests while the @@ -101,19 +102,18 @@ integration-test phase thus enabling the post-integration-test phase to execute. %package javadoc -Summary: Javadoc for %{name} +Summary: Javadoc for %{name} %description javadoc Javadoc for %{name}. %prep -%setup -q -n surefire-3.0.0-M3 +%setup -q -n surefire-%{upstream_version} cp -p %{SOURCE2} . %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 # Disable strict doclint sed -i /-Xdoclint:all/d pom.xml @@ -149,7 +149,6 @@ rm surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/suref %pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin %pom_remove_dep -r ::::site-source - %build %mvn_package ":*{surefire-plugin}*" @1 %mvn_package ":*junit-platform*" junit5 @@ -161,7 +160,6 @@ rm surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/suref %install %mvn_install - %files -f .mfiles %doc README.md %license LICENSE NOTICE cpl-v10.html @@ -176,6 +174,9 @@ rm surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/suref %license LICENSE NOTICE cpl-v10.html %changelog +* Fri May 14 2021 Marian Koncek - 3.0.0~M4-1 +- Update to upstream version 3.0.0~M4 + * Tue Nov 05 2019 Mikolaj Izdebski - 3.0.0~M3-4 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index 2a4a19d..ad73776 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (maven-surefire-3.0.0-M3.tar.gz) = 1d6ced3e3f778be217c2d38f5ac4e748aa2fbda1c6214f04c3f76b15e56014364d52cb14f0fbb0b5f132e74304f1e3e3ff7fac49fd1e208b673596b25d287040 +SHA512 (maven-surefire-3.0.0~M4.tar.gz) = 68ec305ff9bc56ef99af45098705d507ddc0944067fbb1411fceeb7bec8af2399f28ffb6fa722aba0ad65ec7089c76d6093e31eacb61c19c8975b37b06a56406 SHA512 (cpl-v10.html) = f7aa86fafb6a7831b1a5302099fbfe95361bcb5c49a2bc7aac0f5d53cea6c92fc3adbba897a54ab5b0cf32771cdc933fc5bb233461fbd48254a250d0d59109c9