diff --git a/0001-Remove-mockito-dependency.patch b/0001-Remove-mockito-dependency.patch deleted file mode 100644 index cc267c2..0000000 --- a/0001-Remove-mockito-dependency.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f5848da2ad6e95a78bac798f27062f165737610f Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -Date: Tue, 29 Mar 2011 14:44:37 +0200 -Subject: [PATCH 1/3] Remove mockito dependency - ---- - surefire-providers/surefire-junit47/pom.xml | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -diff --git a/surefire-providers/surefire-junit47/pom.xml b/surefire-providers/surefire-junit47/pom.xml -index 9f4f913..cc68cfd 100644 ---- a/surefire-providers/surefire-junit47/pom.xml -+++ b/surefire-providers/surefire-junit47/pom.xml -@@ -43,12 +43,6 @@ - plexus-utils - - -- org.mockito -- mockito-all -- 1.7 -- test -- -- - org.apache.maven.surefire - common-junit4 - ${project.version} --- -1.7.5.4 - diff --git a/0002-Remove-htmlunit-dependency.patch b/0002-Remove-htmlunit-dependency.patch deleted file mode 100644 index 143e20c..0000000 --- a/0002-Remove-htmlunit-dependency.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 32f70674cf1fed176c7bb0f557846bec1b6ffc30 Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -Date: Mon, 18 Apr 2011 15:06:00 +0200 -Subject: [PATCH 2/3] Remove htmlunit dependency - ---- - surefire-integration-tests/pom.xml | 6 ------ - surefire-setup-integration-tests/pom.xml | 6 ------ - 2 files changed, 0 insertions(+), 12 deletions(-) - -diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml -index 09d7f08..6484403 100644 ---- a/surefire-integration-tests/pom.xml -+++ b/surefire-integration-tests/pom.xml -@@ -51,12 +51,6 @@ - test - - -- net.sourceforge.htmlunit -- htmlunit -- 2.8 -- test -- -- - commons-io - commons-io - 2.0.1 -diff --git a/surefire-setup-integration-tests/pom.xml b/surefire-setup-integration-tests/pom.xml -index bc3b206..dc233ad 100644 ---- a/surefire-setup-integration-tests/pom.xml -+++ b/surefire-setup-integration-tests/pom.xml -@@ -90,12 +90,6 @@ - test - - -- net.sourceforge.htmlunit -- htmlunit -- 2.8 -- test -- -- - commons-io - commons-io - 2.0.1 --- -1.7.5.4 - diff --git a/maven-surefire.spec b/maven-surefire.spec index 24b8589..bca2913 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,6 +1,6 @@ Name: maven-surefire Version: 2.10 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: Test framework project License: ASL 2.0 @@ -10,14 +10,8 @@ URL: http://maven.apache.org/surefire/ Source0: http://repo2.maven.org/maven2/org/apache/maven/surefire/surefire/%{version}/surefire-%{version}-source-release.zip Source1: %{name}-jpp-depmap.xml -# mockito is not available in Fedora yet -Patch0: 0001-Remove-mockito-dependency.patch - -# remove test dep on htmlunit -Patch1: 0002-Remove-htmlunit-dependency.patch - # provide compatibility for maven3 -Patch2: 0003-Fix-maven3-compatibility.patch +Patch0: 0003-Fix-maven3-compatibility.patch BuildArch: noarch BuildRequires: ant @@ -60,9 +54,6 @@ Requires: maven-shared-common-artifact-filters Requires: junit Requires: plexus-utils -Requires(post): jpackage-utils >= 0:1.7.2 -Requires(postun): jpackage-utils >= 0:1.7.2 - Obsoletes: maven-surefire-booter <= 0:1.5.3 Provides: maven-surefire-booter = %{epoch}:%{version}-%{release} @@ -161,9 +152,7 @@ Javadoc for %{name}. sed -i 's:2.7.2:${project.version}:' \ surefire-integration-tests/pom.xml -#%patch0 -p1 -b .sav -#%patch1 -p1 -b .sav -%patch2 -p1 -b .sav +%patch0 -p1 -b .sav %build # tests turned off because they need jmock @@ -203,7 +192,7 @@ install -pm 644 surefire-providers/common-junit3/pom.xml $RPM_BUILD_ROOT%{_maven install -pm 644 surefire-providers/surefire-junit3/target/original-surefire-junit3-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit.jar install -pm 644 surefire-providers/surefire-junit3/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-junit.pom -%add_maven_depmap JPP.maven-surefire-junit.pom maven-surefire/junit.jar -a "org.apache.maven.surefire:surefire-junit" +%add_maven_depmap JPP.maven-surefire-junit.pom maven-surefire/junit.jar -a "org.apache.maven.surefire:surefire-junit" install -pm 644 surefire-providers/common-junit4/target/common-junit4-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/common-junit4.jar install -pm 644 surefire-providers/common-junit4/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-common-junit4.pom @@ -211,7 +200,7 @@ install -pm 644 surefire-providers/common-junit4/pom.xml $RPM_BUILD_ROOT%{_maven install -pm 644 surefire-providers/surefire-junit4/target/original-surefire-junit4-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit4.jar install -pm 644 surefire-providers/surefire-junit4/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-junit4.pom -%add_to_maven_depmap oJPP.maven-surefire-junit4.pom maven-surefire/junit4.jar +%add_maven_depmap JPP.maven-surefire-junit4.pom maven-surefire/junit4.jar install -pm 644 surefire-providers/surefire-junit47/target/original-surefire-junit47-*.jar $RPM_BUILD_ROOT%{_javadir}/maven-surefire/junit47.jar install -pm 644 surefire-providers/surefire-junit47/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-surefire-junit47.pom @@ -295,6 +284,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %doc %{_javadocdir}/* %changelog +* Wed Oct 5 2011 Stanislav Ochotnicky - 0:2.10-3 +- Fix junit4 depmap provider macro +- Remove unused patches + * Sun Oct 2 2011 Alexander Kurtakov 0:2.10-2 - BR maven-enforcer-plugin.