From 087dfe865fa347ec40ad12c2e9c6a7e8c83aad96 Mon Sep 17 00:00:00 2001 From: weli Date: Dec 10 2012 09:04:58 +0000 Subject: remove patches for maven3 --- diff --git a/0001-Fix-up-dependencies-for-maven-3.patch b/0001-Fix-up-dependencies-for-maven-3.patch deleted file mode 100644 index 9078a3e..0000000 --- a/0001-Fix-up-dependencies-for-maven-3.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8bb6f84a0b48ca569cf046e48500e2c04f1d9223 Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -Date: Mon, 5 Dec 2011 17:36:35 +0100 -Subject: [PATCH] Fix up dependencies for maven 3 - ---- - pom.xml | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 36754e2..8d6d1b5 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -57,6 +57,11 @@ under the License. - - - org.apache.maven -+ maven-compat -+ ${mavenVersion} -+ -+ -+ org.apache.maven - maven-plugin-api - ${mavenVersion} - -@@ -76,6 +81,10 @@ under the License. - ${mavenVersion} - - -+ org.apache.maven.wagon -+ wagon-provider-api -+ -+ - org.apache.maven - maven-artifact - ${mavenVersion} --- -1.7.7.3 - diff --git a/maven-install-plugin.spec b/maven-install-plugin.spec index c3c69b2..ff4e9e8 100644 --- a/maven-install-plugin.spec +++ b/maven-install-plugin.spec @@ -7,7 +7,6 @@ Group: Development/Libraries License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-install-plugin Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip -Patch0: 0001-Fix-up-dependencies-for-maven-3.patch BuildArch: noarch @@ -28,6 +27,7 @@ BuildRequires: plexus-digest BuildRequires: junit BuildRequires: maven-archiver BuildRequires: maven-shared-reporting-impl +BuildRequires: maven-artifact Requires: maven Requires: jpackage-utils @@ -52,8 +52,6 @@ API documentation for %{name}. %prep %setup -q -#Add dependency to make this work properly with maven 3 -%patch0 -p1 %build mvn-rpmbuild \