rpms/maven-surefire
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to latest upstream version (2.8)

Browse Source
This commit is contained in:
Stanislav Ochotnicky 2011-03-29 15:49:19 +02:00
parent 61183d21f8
commit ccf593e884
7 changed files with 45 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ maven-surefire-2.3-src.tar.gz
/maven-surefire-2.6-src.tar.xz
surefire-2.7.1-source-release.zip
/surefire-2.7.2-source-release.zip
/surefire-2.8-source-release.zip

8
0001-Remove-mockito-dependency.patch
View File

@ -1,14 +1,14 @@
From d8dae0655ef37ca2217250af2c62639092e4e652 Mon Sep 17 00:00:00 2001
From e8c67feb59487de9665aea6f8d7bc2948f5f818a Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Mon, 7 Mar 2011 11:16:28 +0100
Subject: [PATCH 1/3] Remove mockito dependency
Date: Tue, 29 Mar 2011 14:44:37 +0200
Subject: [PATCH 1/2] 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 1565bb2..3885ff8 100644
index 52545bc..54a242d 100644
--- a/surefire-providers/surefire-junit47/pom.xml
+++ b/surefire-providers/surefire-junit47/pom.xml
@@ -43,12 +43,6 @@

25
0002-Fix-failsafe-plugin-dependency-version.patch
View File

@ -1,25 +0,0 @@
From ee2bebae60e63d0fc5de7481aead6bfe6b16dd94 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Mon, 7 Mar 2011 11:17:20 +0100
Subject: [PATCH 2/3] Fix failsafe-plugin dependency version
---
surefire-integration-tests/pom.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml
index 38da051..5bc709f 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -176,7 +176,7 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.7.1</version>
+ <version>${project.version}</version>
<configuration>
<!-- Pass current surefire version to the main suite so that it -->
<!-- can forward to all integration test projects. SUREFIRE-513 -->
--
1.7.4

29
0002-Remove-htmlunit-dependency.patch Normal file
View File

@ -0,0 +1,29 @@
From 979b7e928ab6f0ce4210dafdafb19e5478ba501f Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Tue, 29 Mar 2011 14:32:13 +0200
Subject: [PATCH 2/2] Remove htmlunit dependency
---
surefire-integration-tests/pom.xml | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml
index 24de080..8077f2b 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -91,12 +91,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>
--
1.7.4

29
0003-Remove-htmlunit-dependency.patch
View File

@ -1,29 +0,0 @@
From 7f208bb9e3fe1e81c59e17ef08b14abe56ebd351 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Mon, 7 Mar 2011 11:24:48 +0100
Subject: [PATCH 3/3] Remove htmlunit dependency
---
surefire-integration-tests/pom.xml | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml
index 5bc709f..91cbdf2 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -90,12 +90,6 @@
<artifactId>plexus-utils</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>2.8</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
--
1.7.4

18
maven-surefire.spec
View File

@ -1,5 +1,5 @@
Name: maven-surefire
Version: 2.7.2
Version: 2.8
Release: 1%{?dist}
Epoch: 0
Summary: Test framework project
@ -11,13 +11,10 @@ Source0: http://repo2.maven.org/maven2/org/apache/maven/surefire/surefire
Source1: %{name}-jpp-depmap.xml
# mockito is not available in Fedora yet
Patch1: 0001-Remove-mockito-dependency.patch
# use current version of maven-failsafe-plugin present in maven-surefire
Patch2: 0002-Fix-failsafe-plugin-dependency-version.patch
Patch0: 0001-Remove-mockito-dependency.patch
# remove test dep on htmlunit
Patch3: 0003-Remove-htmlunit-dependency.patch
Patch1: 0002-Remove-htmlunit-dependency.patch
BuildArch: noarch
BuildRequires: ant
@ -150,9 +147,11 @@ Javadoc for %{name}.
%prep
%setup -q -n surefire-%{version}
sed -i 's:<version>2.7.2</version>:<version>${project.version}</version>:' \
surefire-integration-tests/pom.xml
%patch0 -p1 -b .sav
%patch1 -p1 -b .sav
%patch2 -p1 -b .sav
%patch3 -p1 -b .sav
%build
# tests turned off because they need jmock
@ -295,6 +294,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%doc %{_javadocdir}/*
%changelog
* Tue Mar 29 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.8-1
- Update to latest upstream version (2.8)
* Mon Mar 7 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.7.2-1
- Update to latest version (2.7.2)
- Add common-junit* jars to distribution

2
sources
View File

@ -1 +1 @@
ebf5879e9a7faf1c53d64bb70c8657b6 surefire-2.7.2-source-release.zip
0a60ffd58153d2291b318ece3e3b6294 surefire-2.8-source-release.zip