Update to upstream version 2.19

This commit is contained in:
Mikolaj Izdebski 2015-10-19 14:52:31 +02:00
parent 2cbe0a9e0e
commit 00c6078a1d
4 changed files with 45 additions and 10 deletions

1
.gitignore vendored
View File

@ -18,3 +18,4 @@ surefire-2.10-source-release.zip
/surefire-2.16-source-release.zip /surefire-2.16-source-release.zip
/surefire-2.17-source-release.zip /surefire-2.17-source-release.zip
/surefire-2.18.1-source-release.zip /surefire-2.18.1-source-release.zip
/surefire-2.19-source-release.zip

View File

@ -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();
}
}

View File

@ -1,41 +1,50 @@
Name: maven-surefire Name: maven-surefire
Version: 2.18.1 Version: 2.19
Release: 2%{?dist} Release: 1%{?dist}
Epoch: 0 Epoch: 0
Summary: Test framework project Summary: Test framework project
License: ASL 2.0 and CPL License: ASL 2.0 and CPL
URL: http://maven.apache.org/surefire/ 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 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: 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.github.stephenc.jcip:jcip-annotations)
BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(com.google.code.findbugs:jsr305)
BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(commons-io:commons-io)
BuildRequires: mvn(junit:junit) BuildRequires: mvn(junit:junit)
BuildRequires: mvn(net.sourceforge.htmlunit:htmlunit)
BuildRequires: mvn(org.apache.commons:commons-lang3) 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-sink-api)
BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) 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-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-parent:pom:)
BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.apache.maven:maven-plugin-descriptor) BuildRequires: mvn(org.apache.maven:maven-plugin-descriptor)
BuildRequires: mvn(org.apache.maven:maven-project) 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: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-enforcer-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-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-invoker-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-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-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.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api)
BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) 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-shared-utils)
BuildRequires: mvn(org.apache.maven.shared:maven-verifier) BuildRequires: mvn(org.apache.maven.shared:maven-verifier)
BuildRequires: mvn(org.codehaus.mojo:javacc-maven-plugin) BuildRequires: mvn(org.codehaus.mojo:javacc-maven-plugin)
@ -104,6 +113,8 @@ Javadoc for %{name}.
%prep %prep
%setup -q -n surefire-%{version} %setup -q -n surefire-%{version}
cp -p %{SOURCE2} . cp -p %{SOURCE2} .
%patch0 -p1
%pom_disable_module surefire-shadefire %pom_disable_module surefire-shadefire
%pom_remove_dep -r org.apache.maven.surefire: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 %doc LICENSE NOTICE cpl-v10.html
%changelog %changelog
* Mon Oct 19 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.19-1
- Update to upstream version 2.19
* Mon Jul 13 2015 Michael Simacek <msimacek@redhat.com> - 0:2.18.1-2 * Mon Jul 13 2015 Michael Simacek <msimacek@redhat.com> - 0:2.18.1-2
- Fix FTBFS - Fix FTBFS

View File

@ -1,2 +1,2 @@
7a5a9c85fd85d39d45040d03876c518f surefire-2.18.1-source-release.zip 7587628e1c27c93e9865533bd24591fc surefire-2.19-source-release.zip
67a4b75d42edcbd82d2878eba913691b cpl-v10.html 67a4b75d42edcbd82d2878eba913691b cpl-v10.html