From c288a5164dd7291992aa9dae8c445b1c18d51cb0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 23 Jan 2013 15:04:54 +0100 Subject: [PATCH] Update to upstream version 2.13 --- .gitignore | 2 ++ maven-surefire.spec | 21 +++++++++++---------- sources | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 4d469a7..20c4cb8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ surefire-2.7.1-source-release.zip surefire-2.10-source-release.zip /surefire-2.12-source-release.zip /surefire-2.12.1-source-release.zip +/surefire-2.13-source-release.zip +/cpl-v10.html diff --git a/maven-surefire.spec b/maven-surefire.spec index f0afcb7..49833d5 100644 --- a/maven-surefire.spec +++ b/maven-surefire.spec @@ -1,6 +1,6 @@ Name: maven-surefire -Version: 2.12.4 -Release: 7%{?dist} +Version: 2.13 +Release: 1%{?dist} Epoch: 0 Summary: Test framework project License: ASL 2.0 and CPL @@ -32,6 +32,7 @@ BuildRequires: maven-plugin-plugin BuildRequires: maven-resources-plugin BuildRequires: maven-site-plugin BuildRequires: maven-shade-plugin +BuildRequires: maven-shared-utils BuildRequires: maven-shared-verifier BuildRequires: maven-enforcer-plugin BuildRequires: maven-failsafe-plugin @@ -89,12 +90,6 @@ Summary: TestNG provider for Maven Surefire %description provider-testng TestNG provider for Maven Surefire. -%package tests -Summary: Integration tests for Maven Surefire - -%description tests -Integration tests for Maven Surefire. - %package -n maven-failsafe-plugin Summary: Maven plugin for running integration tests @@ -131,13 +126,17 @@ cp -p %{SOURCE2} . %build # tests turned off because they need jmock -%mvn_build -f -D %{SOURCE3} -L "(surefire-plugin|report-plugin|junit|testng|tests|failsafe-plugin)=>@1" +%mvn_package ":*{surefire-plugin,report-plugin,junit,testng,failsafe-plugin}*" @1 +%mvn_package ":*tests*" __noinstall +export XMVN_RESOLV_DEPMAPS=",%{SOURCE3}" +%mvn_build -f %install %mvn_install %files -f .mfiles +%doc README.TXT %doc LICENSE NOTICE cpl-v10.html %dir %{_javadir}/maven-surefire @@ -145,13 +144,15 @@ cp -p %{SOURCE2} . %files report-plugin -f .mfiles-report-plugin %files provider-junit -f .mfiles-junit %files provider-testng -f .mfiles-testng -%files tests -f .mfiles-tests %files -n maven-failsafe-plugin -f .mfiles-failsafe-plugin %files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE cpl-v10.html %changelog +* Wed Jan 23 2013 Mikolaj Izdebski - 0:2.13-1 +- Update to upstream version 2.13 + * Fri Dec 14 2012 Mikolaj Izdebski - 0:2.12.4-7 - Fix Provides: maven-surefire-provider-junit4 diff --git a/sources b/sources index a4832a3..8c781a0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c3f8e9b9a171403d882e4f6c9a789414 surefire-2.12.4-source-release.zip +e0a9902ea8fe2b9b37b9385b28fe3901 surefire-2.13-source-release.zip 67a4b75d42edcbd82d2878eba913691b cpl-v10.html