[mercury] Build with maven 3.

[Alexander Kurtakov]

commit 1c5e85f5bf32eb0ed89a762951881b25029c523e
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Mar 15 14:15:17 2011 +0200

    Build with maven 3.
    
    Adapt to current guidelines.

 mercury.spec |   62 ++++++++++++++++++++++-----------------------------------
 1 files changed, 24 insertions(+), 38 deletions(-)
---
diff --git a/mercury.spec b/mercury.spec
index 47a5257..ac6d8a0 100644
--- a/mercury.spec
+++ b/mercury.spec
@@ -1,6 +1,6 @@
 Name:           mercury
 Version:        1.0
-Release:        0.3.alpha6%{?dist}
+Release:        0.4.alpha6%{?dist}
 Summary:        Replacement for the Maven Artifact subsystem
 
 Group:          Development/Tools
@@ -11,30 +11,29 @@ URL:            http://maven.apache.org/mercury/mercury-artifact/
 Source0:        mercury-%{version}-alpha-6.tar.gz
 Patch0:         0001-Make-it-build.patch
 Patch1:         0001-Replace-plexus.lang-dependency-with-plexus.i18n.patch
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  classworlds
-BuildRequires:  jakarta-commons-collections
-BuildRequires:  jakarta-commons-lang
-BuildRequires:  jakarta-commons-logging
-BuildRequires:  java-devel-openjdk
+BuildRequires:  apache-commons-collections
+BuildRequires:  apache-commons-lang
+BuildRequires:  apache-commons-logging
+BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils
 BuildRequires:  junit4
 BuildRequires:  log4j
-BuildRequires:  maven2
+BuildRequires:  maven
 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-site
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-resources-plugin
+BuildRequires:  maven-site-plugin
 BuildRequires:  maven-doxia
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  maven-shared
-BuildRequires:  maven-shared-archiver
+BuildRequires:  maven-archiver
 BuildRequires:  maven-surefire
-BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-wagon
 BuildRequires:  plexus-archiver
 BuildRequires:  plexus-compiler
@@ -44,7 +43,6 @@ BuildRequires:  plexus-i18n
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-velocity
 BuildRequires:  servlet_2_4_api
-BuildRequires:  tomcat5
 BuildRequires:  velocity
 
 Requires:       jpackage-utils
@@ -80,50 +78,38 @@ Javadoc HTML documentation for %{name}.
 find -name '*.java' -exec grep -l org.codehaus.plexus.lang '{}' \; |
         xargs perl -ni mercury-lang-i18n.pl
 
-MAVEN_REPO_LOCAL=$PWD/.m2/repository
-rm -rf $MAVEN_REPO_LOCAL
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp install javadoc:javadoc \
+mvn-rpmbuild install javadoc:aggregate \
         -Dmaven.test.skip=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT%{_javadir}/mercury
 for S in logging artifact external event
 do
         # Code
         install -p -m644 mercury-$S/target/mercury-$S-%{version}-alpha-6.jar \
-                $RPM_BUILD_ROOT%{_javadir}/mercury/$S-%{version}-alpha-6.jar
-        ln -s $S-%{version}-alpha-6.jar \
                 $RPM_BUILD_ROOT%{_javadir}/mercury/$S.jar
-
-        # Javadoc
-        install -d $RPM_BUILD_ROOT%{_javadir}/mercury-%{version}/$S
-        cp -a mercury-$S/target/site/apidocs/* \
-                $RPM_BUILD_ROOT%{_javadir}/mercury-%{version}/$S
 done
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+# Javadoc
+install -d $RPM_BUILD_ROOT%{_javadocdir}/mercury
+cp -a target/site/apidocs/* \
+    $RPM_BUILD_ROOT%{_javadocdir}/mercury
 
 %files
 %defattr(-,root,root,-)
 %{_javadir}/mercury
 %doc release.notes.txt ./src/licenses/apache.txt
 
-
 %files javadoc
 %defattr(-,root,root,-)
-%{_javadir}/mercury-%{version}
+%{_javadocdir}/mercury
 
 
 %changelog
+* Tue Mar 15 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.4.alpha6
+- Build with maven 3.
+- Adapt to current guidelines.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.3.alpha6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild