[maven-ear-plugin] Fixed dep patch

Tomas Radej tradej at fedoraproject.org
Thu Jan 19 16:17:30 UTC 2012


commit 2b03f311d021eb8c92b70989557f7ae85447cb2b
Author: Tomas Radej <tradej at redhat.com>
Date:   Thu Jan 19 15:01:50 2012 +0100

    Fixed dep patch

 maven-ear-plugin-plexus-dep.patch |   38 ++++++++++++------------------------
 maven-ear-plugin.spec             |    2 +-
 2 files changed, 14 insertions(+), 26 deletions(-)
---
diff --git a/maven-ear-plugin-plexus-dep.patch b/maven-ear-plugin-plexus-dep.patch
index 9748608..6efb1bf 100644
--- a/maven-ear-plugin-plexus-dep.patch
+++ b/maven-ear-plugin-plexus-dep.patch
@@ -1,28 +1,16 @@
 diff --git a/pom.xml b/pom.xml
-index 65bc2b0..7adf7ec 100644
+index b82cee0..1e1d877 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -63,6 +63,11 @@ under the License.
-       <version>${mavenVersion}</version>
-     </dependency>
-     <dependency>
-+      <groupId>org.codehaus.plexus</groupId>
-+      <artifactId>plexus-container-default</artifactId>
-+      <version>1.0-alpha-9-stable-1</version>
-+    </dependency>
-+   <dependency>
-       <groupId>org.apache.maven</groupId>
-       <artifactId>maven-plugin-api</artifactId>
-       <version>${mavenVersion}</version>
-@@ -89,11 +94,6 @@ under the License.
-     </dependency>
-     <dependency>
-       <groupId>org.codehaus.plexus</groupId>
--      <artifactId>plexus-container-default</artifactId>
--      <version>1.0-alpha-9-stable-1</version>
--    </dependency>
--    <dependency>
--      <groupId>org.codehaus.plexus</groupId>
-       <artifactId>plexus-utils</artifactId>
-       <version>2.0.5</version>
-     </dependency>
+@@ -60,6 +60,11 @@ under the License.
+ 
+   <dependencies>
+     <dependency>
++      <groupId>org.codehaus.plexus</groupId>
++      <artifactId>plexus-container-default</artifactId>
++      <version>1.0-alpha-9-stable-1</version>
++    </dependency>
++    <dependency>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-project</artifactId>
+       <version>${mavenVersion}</version>
diff --git a/maven-ear-plugin.spec b/maven-ear-plugin.spec
index d3f91dd..2b4f7b1 100644
--- a/maven-ear-plugin.spec
+++ b/maven-ear-plugin.spec
@@ -57,7 +57,7 @@ API documentation for %{name}.
 
 %prep
 %setup -q 
-%patch0 -p1
+%patch0 -p1 -F3
 
 %build
 mvn-rpmbuild \


More information about the scm-commits mailing list