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

[Alexander Kurtakov]

commit 208e227c6ecec31c61a0f970338d026d860d4e2a
Author: Alexander Kurtakov <akurtakov at gmail.com>
Date:   Thu Jun 9 23:00:25 2011 +0300

    Build with maven 3.x.
    
    Guidelines fixes.

 maven-one-plugin.spec |   46 ++++++++++++++++------------------------------
 1 files changed, 16 insertions(+), 30 deletions(-)
---
diff --git a/maven-one-plugin.spec b/maven-one-plugin.spec
index 627cd89..80561b2 100644
--- a/maven-one-plugin.spec
+++ b/maven-one-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-one-plugin
 Version:        1.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Plugin provides some integration tasks with Maven 1.x
 
 Group:          Development/Libraries
@@ -10,26 +10,25 @@ URL:            http://maven.apache.org/plugins/maven-one-plugin/
 # tar jcf maven-one-plugin-1.2.tar.bz2 maven-one-plugin-1.2/
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}-jpp-depmap.xml
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: plexus-utils
-BuildRequires: ant-nodeps
-BuildRequires: maven2
+BuildRequires: ant
+BuildRequires: maven
 BuildRequires: maven-install-plugin
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-plugin-plugin
 BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
 BuildRequires: maven-surefire-provider-junit
 BuildRequires: maven-jar-plugin
 BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-shared-model-converter
 BuildRequires: jpackage-utils
-Requires: ant-nodeps
-Requires: maven2
+Requires: ant
+Requires: maven
 Requires: maven-shared-model-converter
 Requires: jpackage-utils
 Requires: java
@@ -59,26 +58,17 @@ API documentation for %{name}.
 
 
 %prep
-%setup -q #You may need to update this according to your Source0
+%setup -q 
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
+        -Dmaven.local.depmap.file=%{SOURCE1} \
         install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -m 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 -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
 %add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
 
@@ -88,10 +78,8 @@ install -pm 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
@@ -99,21 +87,19 @@ 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
+* Thu Jun 9 2011 Alexander Kurtakov <akurtako at redhat.com> 1.2-6
+- Build with maven 3.x.
+- Guidelines fixes.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild