[java-sig-commits] [maven-ant-plugin] Build with maven 3.

[Alexander Kurtakov]

commit 2dc13832bbdc14fd43173741219e63beb9d93da5
Author: Alexander Kurtakov <akurtakov(a)gmail.com&gt;
Date:   Fri Jun 17 23:04:56 2011 +0300

    Build with maven 3.

 maven-ant-plugin.spec |   41 ++++++++++++-----------------------------
 1 files changed, 12 insertions(+), 29 deletions(-)
---
diff --git a/maven-ant-plugin.spec b/maven-ant-plugin.spec
index 28f1f9d..7b8e3e4 100644
--- a/maven-ant-plugin.spec
+++ b/maven-ant-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-ant-plugin
 Version:        2.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Maven Ant Plugin
 
 Group:          Development/Libraries
@@ -10,34 +10,31 @@ URL:            http://maven.apache.org/plugins/maven-ant-plugin
 #tar jcf maven-ant-plugin-2.3.tar.bz2 maven-ant-plugin-2.3/
 Source0:        %{name}-%{version}.tar.bz2
 Patch0:        %{name}-pom.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: jpackage-utils
-BuildRequires: maven2
+BuildRequires: maven
 BuildRequires: maven-plugin-plugin
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-install-plugin
 BuildRequires: maven-jar-plugin
 BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
 BuildRequires: plexus-utils
 BuildRequires: ant
 BuildRequires: plexus-container-default
 BuildRequires: maven-plugin-testing-harness
-BuildRequires: ant-nodeps
 BuildRequires: junit
 
-Requires:       maven2
+Requires:       maven
 Requires:       java
 Requires:       jpackage-utils
 Requires:       plexus-utils
 Requires:       ant
 Requires:       plexus-container-default
-Requires:       ant-nodeps
 Requires:       junit
 
 Requires(post):       jpackage-utils
@@ -63,22 +60,13 @@ API documentation for %{name}.
 %patch0 -p0
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
         -Dmaven.test.skip=true \
         install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
-install -Dpm 644 target/%{name}-%{version}.jar  
%{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
-    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -Dpm 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
 %add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
 
@@ -86,10 +74,8 @@ install -Dpm 644 target/%{name}-%{version}.jar  
%{buildroot}%{_javadir}/%{name}
 install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %post
 %update_maven_depmap
@@ -97,21 +83,18 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jun 17 2011 Alexander Kurtakov <akurtako(a)redhat.com&gt; 2.3-6
+- Build with maven 3.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; -
2.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -125,4 +108,4 @@ rm -rf %{buildroot}
 - Added epoch 1 in provides
 
 * Fri May 28 2010 Hui Wang <huwang(a)redhat.com&gt; - 2.3-1
-- Initial version of the package
\ No newline at end of file
+- Initial version of the package