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

[Alexander Kurtakov]

commit 2533692da454def2cb7ac0c09dd2d3e08c13e855
Author: Alexander Kurtakov <akurtakov at gmail.com>
Date:   Sun Jun 12 14:15:25 2011 +0300

    Build with maven 3.x

 plexus-cdc.spec |   44 ++++++++++----------------------------------
 1 files changed, 10 insertions(+), 34 deletions(-)
---
diff --git a/plexus-cdc.spec b/plexus-cdc.spec
index fe89942..b67954f 100644
--- a/plexus-cdc.spec
+++ b/plexus-cdc.spec
@@ -36,7 +36,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.9.a14%{?dist}
+Release:        0.10.a14%{?dist}
 Epoch:          0
 Summary:        Plexus Component Descriptor Creator
 License:        MIT
@@ -48,26 +48,22 @@ Source0:        %{name}-1.0-alpha-14.tar.gz
 Source1:	%{name}-jpp-depmap.xml
 Patch0:     %{name}-qdox-1.9.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
-BuildRequires:	maven2
+BuildRequires:	maven
 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:	maven2-common-poms >= 1.0
+BuildRequires:	maven-surefire-plugin
 BuildRequires:	jdom
 BuildRequires:	plexus-container-default
 BuildRequires:	plexus-utils
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:	qdox
 Requires:		jdom
-Requires:		maven2-common-poms >= 1.0
 Requires:		plexus-container-default
 Requires:		plexus-utils
 Requires:		qdox
@@ -93,47 +89,27 @@ Javadoc for %{name}.
 %prep
 %setup -q -n %{name}
 
-#mkdir external_repo
-#ln -s %{_javadir} external_repo/JPP
 %patch0 -p1
 
-
 %build
-
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
-        -e \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
         -Dmaven.test.skip=true \
         install javadoc:javadoc
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
 install -pm 644 target/*.jar \
-	  $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-%{version}.jar
+	  $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}.jar
 %add_to_maven_depmap org.codehaus.plexus %{name} 1.0-alpha-14 JPP/%{parent} %{subname}
 
-(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; \
-  do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
-
 # pom
 install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-cp -pr target/site/apidocs/* \
-		$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
 
 %post
 %update_maven_depmap
@@ -142,17 +118,17 @@ rm -rf $RPM_BUILD_ROOT
 %update_maven_depmap
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/plexus
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
-%config(noreplace) /etc/maven/fragments/plexus-cdc
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc %{_javadocdir}/*
 
 %changelog
+* Sun Jun 12 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.10.a14
+- Build with maven 3.x
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.9.a14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild