From 57dfd6aecd2659a93f7232fec6c7e8966bdca84b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sep 12 2017 09:35:40 +0000 Subject: Update to upstream version 2.20 --- diff --git a/.gitignore b/.gitignore index f23dce7..db11942 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ surefire-2.10-source-release.zip /surefire-2.18.1-source-release.zip /surefire-2.19-source-release.zip /surefire-2.19.1-source-release.zip +/surefire-2.20-source-release.zip diff --git a/0001-Maven-3.patch b/0001-Maven-3.patch index 33a43f7..3e391aa 100644 --- a/0001-Maven-3.patch +++ b/0001-Maven-3.patch @@ -1,4 +1,4 @@ -From 8e82ccc101710f4cc9c472001afd44bb288c4fe4 Mon Sep 17 00:00:00 2001 +From ac649e31f3cbe4e63a83222deb8aacce833108cf Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Thu, 5 May 2016 11:20:48 +0200 Subject: [PATCH 1/3] Maven 3 @@ -8,10 +8,10 @@ Subject: [PATCH 1/3] Maven 3 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 a4319bc..32ccf34 100644 +index 8bdf75e..3a21009 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 -@@ -162,16 +162,7 @@ public final class SurefireHelper +@@ -168,16 +168,7 @@ public final class SurefireHelper private static String getFailureBehavior( MavenExecutionRequest request ) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { @@ -28,7 +28,7 @@ index a4319bc..32ccf34 100644 + return request.getReactorFailureBehavior(); } - } + private static boolean failIfNoTests( SurefireReportParameters reportParameters ) -- -2.9.3 +2.13.5 diff --git a/0002-Fix-test-with-doxia-1.7.patch b/0002-Fix-test-with-doxia-1.7.patch index d4ffb32..c39ef15 100644 --- a/0002-Fix-test-with-doxia-1.7.patch +++ b/0002-Fix-test-with-doxia-1.7.patch @@ -1,39 +1,14 @@ -From 641500ac0d08697b5e2ee3ce6656c861113c7fe3 Mon Sep 17 00:00:00 2001 +From 1a9c200e7069f82f0bb31b7037748fca24be0b60 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Thu, 5 May 2016 11:19:09 +0200 Subject: [PATCH 2/3] Fix test with doxia-1.7 --- - maven-surefire-report-plugin/pom.xml | 9 +++++++-- - .../maven/plugins/surefire/report/SurefireReportGenerator.java | 2 +- - 2 files changed, 8 insertions(+), 3 deletions(-) + .../apache/maven/plugins/surefire/report/SurefireReportGenerator.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml -index e7c48a7..880e211 100644 ---- a/maven-surefire-report-plugin/pom.xml -+++ b/maven-surefire-report-plugin/pom.xml -@@ -86,12 +86,17 @@ - - org.apache.maven.doxia - doxia-sink-api -- 1.6 -+ 1.7 - - - org.apache.maven.doxia - doxia-site-renderer -- 1.6 -+ 1.7 -+ -+ -+ org.apache.maven.doxia -+ doxia-core -+ 1.7 - - - org.codehaus.plexus 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 a6e49cd..f62fd69 100644 +index 7cebfe7..ee0e16f 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 @@ -27,8 +27,8 @@ import java.util.Map; @@ -44,8 +19,8 @@ index a6e49cd..f62fd69 100644 import org.apache.maven.doxia.sink.SinkEventAttributes; +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.9.3 +2.13.5 diff --git a/0003-Port-to-TestNG-6.11.patch b/0003-Port-to-TestNG-6.11.patch index 55de360..b7e965a 100644 --- a/0003-Port-to-TestNG-6.11.patch +++ b/0003-Port-to-TestNG-6.11.patch @@ -1,4 +1,4 @@ -From f87ae3376dce09b6691081d254c1698f5e04dfa5 Mon Sep 17 00:00:00 2001 +From 144f8b0a9ec2bb312c6d35775269d1d75508e128 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 10 Jul 2017 10:37:50 +0200 Subject: [PATCH 3/3] Port to TestNG 6.11 @@ -9,7 +9,7 @@ Subject: [PATCH 3/3] 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 23498fd..85e4b4e 100644 +index 72082f7..9b969b7 100644 --- a/surefire-providers/surefire-testng/pom.xml +++ b/surefire-providers/surefire-testng/pom.xml @@ -51,8 +51,7 @@ @@ -23,7 +23,7 @@ index 23498fd..85e4b4e 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 e89d061..ec069bb 100644 +index a471f0d..f2409eb 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 @@ -36,5 +36,5 @@ index e89d061..ec069bb 100644 public void configure( XmlSuite suite, Map options ) -- -2.9.3 +2.13.5 diff --git a/maven-surefire.spec b/maven-surefire.spec index 992ec12..459d085 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,6 +1,6 @@ Name: maven-surefire -Version: 2.19.1 -Release: 8%{?dist} +Version: 2.20 +Release: 1%{?dist} Epoch: 0 Summary: Test framework project License: ASL 2.0 and CPL @@ -19,8 +19,6 @@ BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(commons-io:commons-io) 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-sink-api) BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) BuildRequires: mvn(org.apache.maven:maven-artifact) BuildRequires: mvn(org.apache.maven:maven-core) @@ -39,8 +37,12 @@ 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.surefire:surefire-junit47) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.mojo:javacc-maven-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.fusesource.jansi:jansi) +BuildRequires: mvn(org.testng:testng) BuildRequires: mvn(org.testng:testng::jdk15:) %description @@ -133,21 +135,25 @@ cp -p %{SOURCE2} . %pom_remove_dep :maven-toolchain maven-surefire-common %pom_remove_dep :maven-toolchain maven-surefire-plugin +%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 %mvn_package ":*{junit,testng,failsafe-plugin,report-parser}*" @1 %mvn_package ":*tests*" __noinstall # tests turned off because they need jmock -%mvn_build -f +# use xmvn-javadoc because maven-javadoc-plugin crashes JVM +%mvn_build -f -j -G org.fedoraproject.xmvn:xmvn-mojo:javadoc %install %mvn_install %files -f .mfiles -%doc README.TXT +%doc README.md %doc LICENSE NOTICE cpl-v10.html -%dir %{_javadir}/maven-surefire %files plugin -f .mfiles-surefire-plugin %files report-plugin -f .mfiles-report-plugin @@ -160,6 +166,9 @@ cp -p %{SOURCE2} . %doc LICENSE NOTICE cpl-v10.html %changelog +* Tue Sep 12 2017 Mikolaj Izdebski - 0:2.20-1 +- Update to upstream version 2.20 + * Wed Jul 26 2017 Fedora Release Engineering - 0:2.19.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index fb30a90..01c8aab 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -6dd03e8e177bf3bb15ff5453f223110e surefire-2.19.1-source-release.zip -67a4b75d42edcbd82d2878eba913691b cpl-v10.html +SHA512 (surefire-2.20-source-release.zip) = 0a05e77e921e8cc44ccfa0f24d58cb89a89133415e09f0d544456bcd9d64c7d7f5ec086963d9cb1539839f3e68585edc9b77dd40f590f58c0bae29427b247a26 +SHA512 (cpl-v10.html) = f7aa86fafb6a7831b1a5302099fbfe95361bcb5c49a2bc7aac0f5d53cea6c92fc3adbba897a54ab5b0cf32771cdc933fc5bb233461fbd48254a250d0d59109c9