From 00c6078a1d10047d4895f660fbfc76b320e61a61 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 19 Oct 2015 14:52:31 +0200 Subject: [PATCH] Update to upstream version 2.19 --- .gitignore | 1 + maven-surefire-maven3.patch | 20 ++++++++++++++++++++ maven-surefire.spec | 32 +++++++++++++++++++++++--------- sources | 2 +- 4 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 maven-surefire-maven3.patch diff --git a/.gitignore b/.gitignore index 59753a6..5413cbd 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ surefire-2.10-source-release.zip /surefire-2.16-source-release.zip /surefire-2.17-source-release.zip /surefire-2.18.1-source-release.zip +/surefire-2.19-source-release.zip diff --git a/maven-surefire-maven3.patch b/maven-surefire-maven3.patch new file mode 100644 index 0000000..8571f65 --- /dev/null +++ b/maven-surefire-maven3.patch @@ -0,0 +1,20 @@ +--- surefire-2.19/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java~ 2015-10-14 21:15:22.000000000 +0200 ++++ surefire-2.19/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java 2015-10-20 08:53:24.412715344 +0200 +@@ -162,16 +162,7 @@ + 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(); + } + + } diff --git a/maven-surefire.spec b/maven-surefire.spec index 98a41bb..e06a706 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,41 +1,50 @@ Name: maven-surefire -Version: 2.18.1 -Release: 2%{?dist} +Version: 2.19 +Release: 1%{?dist} Epoch: 0 Summary: Test framework project License: ASL 2.0 and CPL URL: http://maven.apache.org/surefire/ -Source0: http://repo2.maven.org/maven2/org/apache/maven/surefire/surefire/%{version}/surefire-%{version}-source-release.zip -Source2: http://junit.sourceforge.net/cpl-v10.html BuildArch: noarch +Source0: http://repo2.maven.org/maven2/org/apache/maven/surefire/surefire/%{version}/surefire-%{version}-source-release.zip +Source2: http://junit.sourceforge.net/cpl-v10.html + +Patch0: maven-surefire-maven3.patch + BuildRequires: maven-local -BuildRequires: mvn(org.apache.maven:maven-artifact:2.2.1) -BuildRequires: mvn(org.apache.maven:maven-model:2.2.1) BuildRequires: mvn(com.github.stephenc.jcip:jcip-annotations) BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) +BuildRequires: mvn(net.sourceforge.htmlunit:htmlunit) 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:maven-artifact:2.2.1) BuildRequires: mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven:maven-model:2.2.1) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-plugin-descriptor) BuildRequires: mvn(org.apache.maven:maven-project) +BuildRequires: mvn(org.apache.maven:maven-settings:2.0.6) BuildRequires: mvn(org.apache.maven:maven-toolchain) +BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-deploy-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-install-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.plugins:maven-site-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-surefire-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-surefire-report-plugin) +BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness) 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.codehaus.mojo:javacc-maven-plugin) @@ -104,6 +113,8 @@ Javadoc for %{name}. %prep %setup -q -n surefire-%{version} cp -p %{SOURCE2} . +%patch0 -p1 + %pom_disable_module surefire-shadefire %pom_remove_dep -r org.apache.maven.surefire:surefire-shadefire @@ -147,6 +158,9 @@ cp -p %{SOURCE2} . %doc LICENSE NOTICE cpl-v10.html %changelog +* Mon Oct 19 2015 Mikolaj Izdebski - 0:2.19-1 +- Update to upstream version 2.19 + * Mon Jul 13 2015 Michael Simacek - 0:2.18.1-2 - Fix FTBFS diff --git a/sources b/sources index a7436b5..0dffa73 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -7a5a9c85fd85d39d45040d03876c518f surefire-2.18.1-source-release.zip +7587628e1c27c93e9865533bd24591fc surefire-2.19-source-release.zip 67a4b75d42edcbd82d2878eba913691b cpl-v10.html