commit b262ecbd7dc491e580c1d392f2b2434514d6db7d
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Jun 27 16:23:38 2011 +0200
Update to latest upstream (2.9)
- Fix up Requires for juni4 provider
.gitignore | 1 +
0001-Remove-mockito-dependency.patch | 8 +++---
0002-Remove-htmlunit-dependency.patch | 10 ++++----
0003-Fix-maven3-compatibility.patch | 27 ++++++++++++++++++++++
maven-surefire.spec | 40 ++++++++++++++++++++------------
sources | 2 +-
6 files changed, 63 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 20ce40d..22fa7f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ surefire-2.7.1-source-release.zip
/surefire-2.7.2-source-release.zip
/surefire-2.8-source-release.zip
/surefire-2.8.1-source-release.zip
+/surefire-2.9-source-release.zip
diff --git a/0001-Remove-mockito-dependency.patch b/0001-Remove-mockito-dependency.patch
index 3eb0a24..cc267c2 100644
--- a/0001-Remove-mockito-dependency.patch
+++ b/0001-Remove-mockito-dependency.patch
@@ -1,14 +1,14 @@
-From 1432e34bd406b9c9c507f5d02373ff2ef44c97b1 Mon Sep 17 00:00:00 2001
+From f5848da2ad6e95a78bac798f27062f165737610f Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue, 29 Mar 2011 14:44:37 +0200
-Subject: [PATCH 1/2] Remove mockito dependency
+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 604847a..ee11a40 100644
+index 9f4f913..cc68cfd 100644
--- a/surefire-providers/surefire-junit47/pom.xml
+++ b/surefire-providers/surefire-junit47/pom.xml
@@ -43,12 +43,6 @@
@@ -25,5 +25,5 @@ index 604847a..ee11a40 100644
<artifactId>common-junit4</artifactId>
<version>${project.version}</version>
--
-1.7.4.4
+1.7.5.4
diff --git a/0002-Remove-htmlunit-dependency.patch
b/0002-Remove-htmlunit-dependency.patch
index 2a2f497..143e20c 100644
--- a/0002-Remove-htmlunit-dependency.patch
+++ b/0002-Remove-htmlunit-dependency.patch
@@ -1,7 +1,7 @@
-From 2fbf5b756733d623079d9764bb9371742b6bc42b Mon Sep 17 00:00:00 2001
+From 32f70674cf1fed176c7bb0f557846bec1b6ffc30 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon, 18 Apr 2011 15:06:00 +0200
-Subject: [PATCH 2/2] Remove htmlunit dependency
+Subject: [PATCH 2/3] Remove htmlunit dependency
---
surefire-integration-tests/pom.xml | 6 ------
@@ -9,7 +9,7 @@ Subject: [PATCH 2/2] Remove htmlunit dependency
2 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml
-index 594c0dc..79b299e 100644
+index 09d7f08..6484403 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -51,12 +51,6 @@
@@ -26,7 +26,7 @@ index 594c0dc..79b299e 100644
<artifactId>commons-io</artifactId>
<version>2.0.1</version>
diff --git a/surefire-setup-integration-tests/pom.xml
b/surefire-setup-integration-tests/pom.xml
-index 6face0e..fec0de6 100644
+index bc3b206..dc233ad 100644
--- a/surefire-setup-integration-tests/pom.xml
+++ b/surefire-setup-integration-tests/pom.xml
@@ -90,12 +90,6 @@
@@ -43,5 +43,5 @@ index 6face0e..fec0de6 100644
<artifactId>commons-io</artifactId>
<version>2.0.1</version>
--
-1.7.4.4
+1.7.5.4
diff --git a/0003-Fix-maven3-compatibility.patch b/0003-Fix-maven3-compatibility.patch
new file mode 100644
index 0000000..2a102c9
--- /dev/null
+++ b/0003-Fix-maven3-compatibility.patch
@@ -0,0 +1,27 @@
+From 9b6b5f1d2aa0acd775b3bfee11dd2e0e062ea75d Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Mon, 27 Jun 2011 16:15:23 +0200
+Subject: [PATCH 3/3] Fix maven3 compatibility
+
+---
+ maven-surefire-common/pom.xml | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
+index 8bc98f1..e93ea97 100644
+--- a/maven-surefire-common/pom.xml
++++ b/maven-surefire-common/pom.xml
+@@ -40,6 +40,10 @@
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
+ <dependency>
+--
+1.7.5.4
+
diff --git a/maven-surefire.spec b/maven-surefire.spec
index 1fca4c4..978ba90 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -1,6 +1,6 @@
Name: maven-surefire
-Version: 2.8.1
-Release: 4%{?dist}
+Version: 2.9
+Release: 1%{?dist}
Epoch: 0
Summary: Test framework project
License: ASL 2.0
@@ -16,6 +16,9 @@ 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
+
BuildArch: noarch
BuildRequires: ant
BuildRequires: classworlds
@@ -38,7 +41,11 @@ BuildRequires: maven-site-plugin
BuildRequires: maven-shade-plugin
BuildRequires: maven-shared-verifier
BuildRequires: maven-surefire-plugin
-
+BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-toolchain
+BuildRequires: maven-project
+BuildRequires: maven-shared-common-artifact-filters
+BuildRequires: modello
BuildRequires: plexus-containers-component-api >= 1.0-0.a34
BuildRequires: tomcat6-servlet-2.5-api
BuildRequires: maven-plugin-testing-harness
@@ -46,6 +53,9 @@ BuildRequires: bsf
Requires: classworlds
Requires: maven
+Requires: maven-toolchain
+Requires: maven-project
+Requires: maven-shared-common-artifact-filters
Requires: junit
Requires: plexus-utils
@@ -61,7 +71,7 @@ Surefire is a test framework project.
%package plugin
Summary: Surefire plugin for maven
Group: Development/Libraries
-Requires: maven-surefire = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Obsoletes: maven2-plugin-surefire <= 0:2.0.4
Provides: maven2-plugin-surefire = %{epoch}:%{version}-%{release}
Obsoletes: maven-surefire-maven-plugin < 0:2.6
@@ -73,7 +83,7 @@ Maven surefire plugin for running tests via the surefire framework.
%package report-plugin
Summary: Surefire reports plugin for maven
Group: Development/Libraries
-Requires: maven-surefire = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Obsoletes: maven2-plugin-surefire-report <= 0:2.0.4
Provides: maven2-plugin-surefire-report = %{epoch}:%{version}-%{release}
Obsoletes: maven-surefire-report-maven-plugin < 0:2.6
@@ -86,7 +96,7 @@ Plugin for generating reports from surefire test runs.
Summary: JUnit3 provider for Maven Surefire
Group: Development/Libraries
Requires: junit
-Requires: maven-surefire = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Obsoletes: maven2-plugin-surefire-report <= 0:2.0.4O
#Obsoletes: maven-surefire-junit = 2.3.1
Provides: maven2-plugin-surefire-report = %{epoch}:%{version}-%{release}
@@ -98,7 +108,8 @@ JUnit3 provider for Maven Surefire.
%package provider-junit4
Summary: JUnit4 provider for Maven Surefire
Group: Development/Libraries
-Requires: maven-surefire = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-provider-junit = %{epoch}:%{version}-%{release}
Requires: junit4
%description provider-junit4
@@ -107,7 +118,7 @@ JUnit4 provider for Maven Surefire.
%package provider-testng
Summary: TestNG provider for Maven Surefire
Group: Development/Libraries
-Requires: maven-surefire = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: testng
%description provider-testng
@@ -116,7 +127,7 @@ TestNG provider for Maven Surefire.
%package -n maven-failsafe-plugin
Summary: Maven plugin for running integration tests
Group: Development/Libraries
-Requires: maven-surefire = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description -n maven-failsafe-plugin
The Failsafe Plugin is designed to run integration tests while the
@@ -151,6 +162,7 @@ sed -i
's:<version>2.7.2</version>:<version>${project.version}</version>:'
\
%patch0 -p1 -b .sav
%patch1 -p1 -b .sav
+%patch2 -p1 -b .sav
%build
# tests turned off because they need jmock
@@ -245,12 +257,6 @@ ln -s %{_javadir}/maven-surefire/report-maven-plugin.jar \
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%dir %{_javadir}/maven-surefire
%{_javadir}/maven-surefire/api.jar
@@ -290,6 +296,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name}
|| :
%doc %{_javadocdir}/*
%changelog
+* Mon Jun 27 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.9-1
+- Update to latest upstream (2.9)
+- Fix up Requires for juni4 provider
+
* Tue May 24 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.8.1-4
- Fix up providers artifact and report plugin groupid
diff --git a/sources b/sources
index 7b04a29..5d53351 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d45fb94ea990279dd5901ea2baed0b5a surefire-2.8.1-source-release.zip
+a54a56e6dae36aa8dbebcbd186e2d39b surefire-2.9-source-release.zip