[java-sig-commits] [plexus-digest] - Drop ant build. - Adapt to new guidelines.

[Alexander Kurtakov]

commit bfb9a1db3ae2cd365e2dd9b7d974b22204cdb1d5
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Dec 8 01:25:16 2010 +0200

    - Drop ant build.
    - Adapt to new guidelines.

 plexus-digest-1.0-build.xml  |  107 ------------------------------------------
 plexus-digest-components.xml |   24 ---------
 plexus-digest.spec           |   65 +++++++------------------
 3 files changed, 18 insertions(+), 178 deletions(-)
---
diff --git a/plexus-digest.spec b/plexus-digest.spec
index f1ca35f..8c2e1d6 100644
--- a/plexus-digest.spec
+++ b/plexus-digest.spec
@@ -28,18 +28,12 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-# If you don't want to build with maven, and use straight ant instead,
-# give rpmbuild option '--without maven'
-
-%define with_maven 1
-%define without_maven 0
-
-%define parent plexus
-%define subname digest
+%global parent plexus
+%global subname digest
 
 Name:           plexus-digest
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Plexus Digest / Hashcode Components
 License:        ASL 2.0
@@ -49,29 +43,22 @@ Source0:        %{name}-%{version}-src.tar.gz
 # svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-digest-1.1/ plexus-digest/
 # tar czf plexus-digest-1.1-src.tar.gz plexus-digest/
 
-Source2:                %{name}-1.0-build.xml
-Source3:                %{name}-components.xml
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant >= 0:1.6
-%if %{with_maven}
 BuildRequires:  maven2 >= 2.0.4-9
-BuildRequires:  maven2-plugin-compiler
-BuildRequires:  maven2-plugin-install
-BuildRequires:  maven2-plugin-jar
-BuildRequires:  maven2-plugin-javadoc
-BuildRequires:  maven2-plugin-resources
+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:  maven-surefire-provider-junit = 2.3
+BuildRequires:  maven-surefire-provider-junit 
 BuildRequires:  maven2-common-poms >= 1.0
 BuildRequires:  maven-doxia
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  qdox >= 1.5
-%endif
 
 BuildRequires:  plexus-maven-plugin
 BuildRequires:  plexus-cdc
@@ -91,6 +78,7 @@ 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}.
@@ -98,15 +86,7 @@ Javadoc for %{name}.
 %prep
 %setup -q -n %{name}
 
-%if ! %{with_maven}
-cp %{SOURCE2} build.xml
-mkdir -p target/classes/META-INF/plexus
-cp %{SOURCE3} target/classes/META-INF/plexus/components.xml
-%endif
-
-
 %build
-%if %{with_maven}
 mkdir external_repo
 ln -s %{_javadir} external_repo/JPP
 
@@ -117,26 +97,15 @@ mvn-jpp \
         -e \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         install javadoc:javadoc
-#       -Dmaven.test.failure.ignore=true \
-
-%else
-export CLASSPATH=$(build-classpath classworlds \
-                   plexus/utils plexus/container-default)
-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/*.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 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 \
@@ -150,9 +119,6 @@ cp -pr target/site/apidocs/* \
 
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 %update_maven_depmap
 
@@ -161,8 +127,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_javadir}/plexus
-%{_datadir}/maven2
+%{_javadir}/plexus/*
+%{_mavenpomdir}
 %{_mavendepmapfragdir}
 
 %files javadoc
@@ -170,6 +136,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Wed Dec 8 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.1-2
+- Drop ant build.
+- Adapt to new guidelines.
+
 * Tue Dec 22 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.1-1
 - Update to upstream 1.1.
 
@@ -211,3 +181,4 @@ rm -rf $RPM_BUILD_ROOT
 
 * Wed Nov 14 2007 Ralph Apel <r.apel @ r-apel.de> - 0:1.0-1jpp
 - Initial build
+