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

[Alexander Kurtakov]

commit 25575ccec7acf4990e4b0701a7720508985f9edd
Author: Alexander Kurtakov <akurtakov at gmail.com>
Date:   Sun Jun 12 14:27:42 2011 +0300

    Build with maven 3.x

 plexus-cli.spec |   96 +++++++++++++++---------------------------------------
 1 files changed, 27 insertions(+), 69 deletions(-)
---
diff --git a/plexus-cli.spec b/plexus-cli.spec
index 327a687..e9526e1 100644
--- a/plexus-cli.spec
+++ b/plexus-cli.spec
@@ -28,15 +28,12 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define with_maven 0
-
-%define parent plexus
-%define subname cli
-%define namedversion 1.2
+%global parent plexus
+%global subname cli
 
 Name:           %{parent}-%{subname}
 Version:        1.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Epoch:          0
 Summary:        Command Line Interface facilitator for Plexus
 License:        ASL 2.0 and Plexus
@@ -45,40 +42,32 @@ URL:            http://plexus.codehaus.org/
 # svn export http://svn.codehaus.org/plexus/archive/plexus-tools/tags/plexus-cli-1.2
 # tar czf plexus-cli-%{version}-src.tar.gz plexus-cli-%{version}
 # Note: Exported revision 8188.
-Source0:        %{name}-%{namedversion}-src.tar.gz
-
-Source1:        plexus-cli-1.2-build.xml
-Source2:        plexus-cli-settings.xml
-Source3:        plexus-cli-1.2-jpp-depmap.xml
+Source0:        %{name}-%{version}-src.tar.gz
 
 # License headers missing from some files
 # http://jira.codehaus.org/browse/PLX-418
 Patch0:         plexus-cli-licenseheaders.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 
 BuildRequires:  jpackage-utils >= 0:1.7.3
 BuildRequires:  ant >= 0:1.6.5
 BuildRequires:  junit
-%if %{with_maven}
-BuildRequires:  maven2 >= 2.0.4-10jpp
-BuildRequires:  maven2-plugin-compiler
-BuildRequires:  maven2-plugin-install
-BuildRequires:  maven2-plugin-jar
-BuildRequires:  maven2-plugin-javadoc
-BuildRequires:  maven2-plugin-resources
-BuildRequires:  maven2-plugin-surefire = 2.3
-BuildRequires:  maven-surefire-provider-junit = 2.3
+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-plugin
+BuildRequires:  maven-surefire-provider-junit 
 BuildRequires:  maven-doxia
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  maven-release
-%endif
 BuildRequires:  plexus-classworlds
 BuildRequires:  plexus-containers-container-default
 BuildRequires:  plexus-utils 
-BuildRequires:  jakarta-commons-cli
+BuildRequires:  apache-commons-cli
 
 Requires:  plexus-classworlds
 Requires:  plexus-containers-container-default
@@ -97,67 +86,35 @@ is like a J2EE application server, without all the baggage.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
+Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
 
 %prep
-%setup -q -n %{name}-%{namedversion}
+%setup -q
 find . -name "*.jar" -exec rm -f {} \;
-#for j in $(find . -name "*.jar" ); do
-#        mv $j $j.no
-#done
 
 %patch0 -p3
 
-cp %{SOURCE1} build.xml
-cp %{SOURCE2} settings.xml
-
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-%if %{with_maven}
-mvn-jpp \
-        -e \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        -Dmaven2.jpp.depmap.file=%{SOURCE3} \
+mvn-rpmbuild \
         install javadoc:javadoc
 
-%else
-export CLASSPATH=$(build-classpath \
-plexus/classworlds \
-plexus/containers-container-default \
-plexus/utils  \
-commons-cli \
-)
-CLASSPATH=$CLASSPATH:target/classes:target/test-classes
-
-ant -Dbuild.sysclasspath=only jar javadoc
-%endif
-
-
 %install
-rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
-install -pm 644 target/%{name}-%{namedversion}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}-%{version}.jar
+install -pm 644 target/%{name}-%{version}.jar \
+  $RPM_BUILD_ROOT%{_javadir}/plexus/%{subname}.jar
 %add_to_maven_depmap org.codehaus.plexus %{name} %{namedversion} 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 -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 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}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %post
 %update_maven_depmap
@@ -166,17 +123,18 @@ rm -rf $RPM_BUILD_ROOT
 %update_maven_depmap
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/%{parent}/*
-%{_datadir}/maven2
-%{_mavendepmapfragdir}
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc %{_javadocdir}/*
 
 
 %changelog
+* Sun Jun 12 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-10
+- Build with maven 3.x
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild