commit fa7a6045a99d8ec72de5119ed1490bce5463f588
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Apr 18 15:17:44 2011 +0200
Update to latest upstream version (2.8.1)
.gitignore | 1 +
0001-Remove-mockito-dependency.patch | 6 +++---
0002-Remove-htmlunit-dependency.patch | 32 +++++++++++++++++++++++++-------
maven-surefire.spec | 5 ++++-
sources | 2 +-
5 files changed, 34 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c0ab6b8..20ce40d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ maven-surefire-2.3-src.tar.gz
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
diff --git a/0001-Remove-mockito-dependency.patch b/0001-Remove-mockito-dependency.patch
index ee61db0..3eb0a24 100644
--- a/0001-Remove-mockito-dependency.patch
+++ b/0001-Remove-mockito-dependency.patch
@@ -1,4 +1,4 @@
-From e8c67feb59487de9665aea6f8d7bc2948f5f818a Mon Sep 17 00:00:00 2001
+From 1432e34bd406b9c9c507f5d02373ff2ef44c97b1 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
@@ -8,7 +8,7 @@ Subject: [PATCH 1/2] Remove mockito dependency
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/surefire-providers/surefire-junit47/pom.xml
b/surefire-providers/surefire-junit47/pom.xml
-index 52545bc..54a242d 100644
+index 604847a..ee11a40 100644
--- a/surefire-providers/surefire-junit47/pom.xml
+++ b/surefire-providers/surefire-junit47/pom.xml
@@ -43,12 +43,6 @@
@@ -25,5 +25,5 @@ index 52545bc..54a242d 100644
<artifactId>common-junit4</artifactId>
<version>${project.version}</version>
--
-1.7.4
+1.7.4.4
diff --git a/0002-Remove-htmlunit-dependency.patch
b/0002-Remove-htmlunit-dependency.patch
index c6d44b3..2a2f497 100644
--- a/0002-Remove-htmlunit-dependency.patch
+++ b/0002-Remove-htmlunit-dependency.patch
@@ -1,17 +1,35 @@
-From 979b7e928ab6f0ce4210dafdafb19e5478ba501f Mon Sep 17 00:00:00 2001
+From 2fbf5b756733d623079d9764bb9371742b6bc42b Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
-Date: Tue, 29 Mar 2011 14:32:13 +0200
+Date: Mon, 18 Apr 2011 15:06:00 +0200
Subject: [PATCH 2/2] Remove htmlunit dependency
---
- surefire-integration-tests/pom.xml | 6 ------
- 1 files changed, 0 insertions(+), 6 deletions(-)
+ 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 24de080..8077f2b 100644
+index 594c0dc..79b299e 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
-@@ -91,12 +91,6 @@
+@@ -51,12 +51,6 @@
+ <scope>test</scope>
+ </dependency -->
+ <dependency>
+- <groupId>net.sourceforge.htmlunit</groupId>
+- <artifactId>htmlunit</artifactId>
+- <version>2.8</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+ <groupId>commons-io</groupId>
+ <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
+--- a/surefire-setup-integration-tests/pom.xml
++++ b/surefire-setup-integration-tests/pom.xml
+@@ -90,12 +90,6 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -25,5 +43,5 @@ index 24de080..8077f2b 100644
<artifactId>commons-io</artifactId>
<version>2.0.1</version>
--
-1.7.4
+1.7.4.4
diff --git a/maven-surefire.spec b/maven-surefire.spec
index 9428d68..02d029f 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -1,5 +1,5 @@
Name: maven-surefire
-Version: 2.8
+Version: 2.8.1
Release: 1%{?dist}
Epoch: 0
Summary: Test framework project
@@ -294,6 +294,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} ||
:
%doc %{_javadocdir}/*
%changelog
+* Mon Apr 18 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.8.1-1
+- Update to latest upstream version (2.8.1)
+
* Tue Mar 29 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.8-1
- Update to latest upstream version (2.8)
diff --git a/sources b/sources
index be62938..7b04a29 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0a60ffd58153d2291b318ece3e3b6294 surefire-2.8-source-release.zip
+d45fb94ea990279dd5901ea2baed0b5a surefire-2.8.1-source-release.zip
Show replies by date