[java-sig-commits] [maven-rar-plugin] Add patch to fix build with maven 3.

[Alexander Kurtakov]

commit 5ccb247ab417b0c2aa17383c3efcf0cecbdf956a
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Jun 21 13:03:55 2011 +0300

    Add patch to fix build with maven 3.

 add-maven-core.patch  |   14 ++++++++++++++
 maven-rar-plugin.spec |    8 ++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/add-maven-core.patch b/add-maven-core.patch
new file mode 100644
index 0000000..47323a8
--- /dev/null
+++ b/add-maven-core.patch
@@ -0,0 +1,14 @@
+--- pom.xml.sav	2007-02-14 05:11:03.000000000 +0200
++++ pom.xml	2011-06-21 13:01:08.675267319 +0300
+@@ -55,6 +55,11 @@ under the License.
+     </dependency>
+     <dependency>
+       <groupId>org.apache.maven</groupId>
++      <artifactId>maven-core</artifactId>
++      <version>3.0.3</version>
++    </dependency>
++    <dependency>
++      <groupId>org.apache.maven</groupId>
+       <artifactId>maven-archiver</artifactId>
+       <version>2.2</version>
+     </dependency>
diff --git a/maven-rar-plugin.spec b/maven-rar-plugin.spec
index 65fb1b8..943b4a3 100644
--- a/maven-rar-plugin.spec
+++ b/maven-rar-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-rar-plugin
 Version:        2.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Plugin to create Resource Adapter Archive which can be deployed to a J2EE server
 
 Group:          Development/Libraries
@@ -9,6 +9,7 @@ URL:            http://maven.apache.org/plugins/maven-rar-plugin/
 # svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-rar-plugin-2.2/
 # tar jcf maven-rar-plugin-2.2.tar.bz2 maven-rar-plugin-2.2/
 Source0:        %{name}-%{version}.tar.bz2
+Patch0:         add-maven-core.patch
 
 BuildArch: noarch
 
@@ -54,9 +55,9 @@ API documentation for %{name}.
 
 %prep
 %setup -q 
+%patch0
 
 %build
-#FIXME: mvn-jpp doesn't build jar "maven-rar-plugin-2.2/target/unit/basic-rar-test/target/test-rar.rar", why?
 mvn-rpmbuild \
         -Dmaven.test.failure.ignore=true \
         install javadoc:javadoc
@@ -92,6 +93,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jun 21 2011 Alexander Kurtakov <akurtako at redhat.com> 2.2-6
+- Add patch to fix build with maven 3.
+
 * Fri Jun 17 2011 Alexander Kurtakov <akurtako at redhat.com> 2.2-5
 - Build with maven 3.x.