[maven-ant-plugin] Fix compile in pure maven 3(without maven 2 installed).
Alexander Kurtakov
akurtakov at fedoraproject.org
Mon Dec 5 17:18:02 UTC 2011
commit 447cee5567b3fe87118a9cd143eb506cb86c8f32
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date: Mon Dec 5 19:17:46 2011 +0200
Fix compile in pure maven 3(without maven 2 installed).
maven-ant-plugin-pom.patch | 7 ++++++-
maven-ant-plugin.spec | 15 ++++++---------
2 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/maven-ant-plugin-pom.patch b/maven-ant-plugin-pom.patch
index cca6a5e..5cc40a2 100644
--- a/maven-ant-plugin-pom.patch
+++ b/maven-ant-plugin-pom.patch
@@ -1,6 +1,6 @@
--- pom.xml.orig 2009-11-07 22:29:37.000000000 +0800
+++ pom.xml 2010-05-31 14:23:19.000000000 +0800
-@@ -120,12 +120,6 @@
+@@ -120,12 +120,11 @@
<scope>test</scope>
</dependency>
<dependency>
@@ -10,6 +10,11 @@
- <scope>test</scope>
- </dependency>
- <dependency>
++ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>3.0.2</version>
++ </dependency>
++ <dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
<version>${antVersion}</version>
diff --git a/maven-ant-plugin.spec b/maven-ant-plugin.spec
index 7b8e3e4..a1f5d98 100644
--- a/maven-ant-plugin.spec
+++ b/maven-ant-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-ant-plugin
Version: 2.3
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Maven Ant Plugin
Group: Development/Libraries
@@ -68,21 +68,15 @@ mvn-rpmbuild \
# jars
install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
-
# poms
install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%{_javadir}/*
%{_mavenpomdir}/*
@@ -92,6 +86,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Mon Dec 5 2011 Alexander Kurtakov <akurtako at redhat.com> 2.3-7
+- Fix compile in pure maven 3(without maven 2 installed).
+
* Fri Jun 17 2011 Alexander Kurtakov <akurtako at redhat.com> 2.3-6
- Build with maven 3.
More information about the scm-commits
mailing list