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

Alexander Kurtakov akurtakov at fedoraproject.org
Sun Jun 12 12:16:37 UTC 2011


commit f3f84a73f026c4982fb436d0ad7686aecc626a72
Author: Alexander Kurtakov <akurtakov at gmail.com>
Date:   Sun Jun 12 15:15:42 2011 +0300

    Build with maven 3.x

 plexus-naming-1.0-build.xml  |  164 ------------------------------------------
 plexus-naming-1.0-pom.patch  |   15 ----
 plexus-naming-components.xml |   13 ----
 plexus-naming.spec           |  108 ++++++++--------------------
 4 files changed, 30 insertions(+), 270 deletions(-)
---
diff --git a/plexus-naming.spec b/plexus-naming.spec
index 9548374..4641c2f 100644
--- a/plexus-naming.spec
+++ b/plexus-naming.spec
@@ -28,16 +28,14 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define with_maven 0
+%global namedversion 1.0-alpha-3
 
-%define namedversion 1.0-alpha-3
-
-%define parent plexus
-%define subname naming
+%global parent plexus
+%global subname naming
 
 Name:           plexus-naming
 Version:        1.0
-Release:        0.6.a3%{?dist}
+Release:        0.7.a3%{?dist}
 Epoch:          0
 Summary:        Plexus Naming Component
 License:        ASL 2.0
@@ -48,60 +46,51 @@ URL:            http://plexus.codehaus.org/
 # http://svn.codehaus.org/plexus/plexus-components/tags/plexus-naming-1.0-alpha-3/
 # tar czf plexus-naming-1.0-alpha-3-src.tar.gz plexus-naming-1.0-alpha-3
 Source0:        %{name}-%{namedversion}-src.tar.gz
-Source1:        plexus-naming-1.0-build.xml
 Source3:        plexus-naming-1.0-jpp-depmap.xml
-Source4:        plexus-naming-components.xml
 
-Patch0:         plexus-naming-1.0-pom.patch
 # Some license headers were missing from the .java files.  They have
 # been added in SVN trunk and we've back-ported that fix.
 # http://jira.codehaus.org/browse/PLXCOMP-144
 # http://jira.codehaus.org/secure/attachment/44043/plexus-naming-addlicenseheaders.patch
 Patch1:         %{name}-addlicenseheaders.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  jpackage-utils >= 0:1.7.3
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  ant >= 0:1.6.5
 BuildRequires:  junit
 BuildRequires:  hsqldb
-BuildRequires:  jakarta-commons-logging
-%if %{with_maven}
-BuildRequires:  maven2
-BuildRequires:  maven2-common-poms
-BuildRequires:  maven2-plugin-compiler
-BuildRequires:  maven2-plugin-install
-BuildRequires:  maven2-plugin-jar
-BuildRequires:  maven2-plugin-javadoc
-BuildRequires:  maven2-plugin-resources
-BuildRequires:  maven2-plugin-release
-BuildRequires:  maven2-plugin-surefire = 2.3
-BuildRequires:  maven-surefire-provider-junit = 2.3
+BuildRequires:  apache-commons-logging
+BuildRequires:  maven
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-resources-plugin
+BuildRequires:  maven-release-plugin
+BuildRequires:  maven-surefire-plugin
+BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  plexus-maven-plugin >= 1.3.5
 BuildRequires:  maven-doxia
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  plexus-maven-plugin >= 1.3.5
 BuildRequires:  qdox >= 1.5
-BuildRequires:  tomcat5
-BuildRequires:  tomcat5-servlet-2.4-api
+BuildRequires:  servlet25
 BuildRequires:  avalon-logkit
 BuildRequires:  avalon-framework
-%endif
 BuildRequires:  directory-naming
 BuildRequires:  avalon-framework
-BuildRequires:  jakarta-commons-collections
-BuildRequires:  jakarta-commons-dbcp
-BuildRequires:  jakarta-commons-digester
-BuildRequires:  jakarta-commons-pool
+BuildRequires:  apache-commons-collections
+BuildRequires:  apache-commons-dbcp
+BuildRequires:  apache-commons-digester
+BuildRequires:  apache-commons-pool
 BuildRequires:  plexus-cdc
 BuildRequires:  plexus-classworlds
 BuildRequires:  plexus-containers-container-default 
 BuildRequires:  plexus-utils >= 1.4.5
 
 Requires:  directory-naming
-Requires:  jakarta-commons-pool
+Requires:  apache-commons-pool
 Requires:  plexus-classworlds
 Requires:  plexus-container-default 
 Requires:  plexus-utils >= 1.4.5
@@ -122,70 +111,34 @@ is like a J2EE application server, without all the baggage.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
+Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}-%{namedversion}
-cp %{SOURCE1} build.xml
-mkdir -p target/classes/META-INF/plexus/
-cp %{SOURCE4} target/classes/META-INF/plexus/components.xml
-%patch0 -b .sav0
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-%if %{with_maven}
-    mvn-jpp \
-        -Dmaven.test.failure.ignore=true \
-        -Dmaven2.jpp.depmap.file=%{SOURCE3} \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+    mvn-rpmbuild \
+        -Dmaven.local.depmap.file=%{SOURCE3} \
         install javadoc:javadoc
 
-%else
-export CLASSPATH=$(build-classpath \
-commons-collections \
-commons-logging \
-commons-dbcp \
-commons-pool \
-directory-naming/naming-config \
-directory-naming/naming-core \
-directory-naming/naming-factory \
-directory-naming/naming-java \
-hsqldb \
-plexus/classworlds \
-plexus/containers-container-default \
-plexus/utils \
-)
-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}/%{parent}/%{subname}-%{version}.jar
+  $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}.jar
 %add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
 
-(cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; do \
-  ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
-
 # poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 pom.xml \
-    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
+    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-ln -s %{name} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_maven_depmap
@@ -194,17 +147,17 @@ rm -rf $RPM_BUILD_ROOT
 %update_maven_depmap
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/%{parent}/*
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
 %{_mavendepmapfragdir}
 
 %files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Sun Jun 12 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.7.a3
+- Build with maven 3.x
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.6.a3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -233,4 +186,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Fri Nov 30 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a3.1jpp
 - First JPP release
-


More information about the java-sig-commits mailing list