[java-sig-commits] [plexus-interactivity] Build with maven 3.

[Alexander Kurtakov]

commit b0a89ac051c0327d8dde18a8a8310591ae4a1768
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Tue Nov 29 10:52:06 2011 +0200

    Build with maven 3.
    
    Adapt to current guidelines.

 plexus-interactivity.spec |   31 ++++++++++---------------------
 1 files changed, 10 insertions(+), 21 deletions(-)
---
diff --git a/plexus-interactivity.spec b/plexus-interactivity.spec
index 47ad8ff..13a624a 100644
--- a/plexus-interactivity.spec
+++ b/plexus-interactivity.spec
@@ -33,7 +33,7 @@
 
 Name:           plexus-interactivity
 Version:        1.0
-Release:        0.4.a6.7%{?dist}
+Release:        0.4.a6.8%{?dist}
 Epoch:          0
 Summary:        Plexus Interactivity Handler Component
 License:        MIT
@@ -45,13 +45,10 @@ URL:            http://plexus.codehaus.org/
 #   plexus-interactivity-1.0-alpha-6
 Source0:        plexus-interactivity-1.0-alpha-6-src.tar.xz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
-BuildRequires:  ant-nodeps
-BuildRequires:  maven2
+BuildRequires:  maven
 BuildRequires:  maven-compiler-plugin
 BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-site-plugin
@@ -87,11 +84,7 @@ API documentation for %{name}.
 %setup -q -n plexus-interactivity-1.0-alpha-6
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild -e \
         -Dmaven.test.skip=true \
         install javadoc:aggregate
 
@@ -115,9 +108,9 @@ install -pm 644 \
 plexus-interactivity-jline/pom.xml \
  	$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-interactivity-jline.pom
 
-%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
-%add_to_maven_depmap org.codehaus.plexus %{name}-api %{version} JPP/%{parent} interactivity-api
-%add_to_maven_depmap org.codehaus.plexus %{name}-jline %{version} JPP/%{parent} interactivity-jline
+%add_maven_depmap JPP.%{parent}-%{subname}.pom
+%add_maven_depmap JPP.%{parent}-interactivity-api.pom  plexus/interactivity-api.jar
+%add_maven_depmap JPP.%{parent}-interactivity-jline.pom  plexus/interactivity-jline.jar
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -128,24 +121,20 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
 rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc %{_javadocdir}/*
 
 
 %changelog
+* Tue Nov 29 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.4.a6.8
+- Build with maven 3.
+- Adapt to current guidelines.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.4.a6.7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild