[java-sig-commits] [maven-repository-plugin] Build with maven 3.x.

Alexander Kurtakov akurtakov at fedoraproject.org
Wed Jun 8 08:02:06 UTC 2011


commit 2c322a3ae884619407d7a883f508ce9e6cf745fb
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Jun 8 11:01:48 2011 +0300

    Build with maven 3.x.
    
    Adapt to current guidelines.

 maven-repository-plugin.spec |   43 +++++++++++++----------------------------
 1 files changed, 14 insertions(+), 29 deletions(-)
---
diff --git a/maven-repository-plugin.spec b/maven-repository-plugin.spec
index ed54a5f..1e25b37 100644
--- a/maven-repository-plugin.spec
+++ b/maven-repository-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-repository-plugin
 Version:        2.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Plugin to create bundles of artifacts for manual uploaded to repository
 
 Group:          Development/Libraries
@@ -8,14 +8,12 @@ License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-repository-plugin/
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: plexus-utils
-BuildRequires: ant-nodeps
-BuildRequires: maven2
+BuildRequires: ant
+BuildRequires: maven
 BuildRequires: maven-install-plugin
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-plugin-plugin
@@ -29,8 +27,8 @@ BuildRequires: maven-javadoc-plugin
 BuildRequires: jpackage-utils
 BuildRequires: junit4
 BuildRequires: maven-shared-verifier
-Requires: ant-nodeps
-Requires: maven2
+Requires: ant
+Requires: maven
 Requires: jpackage-utils
 Requires: java
 Requires(post): jpackage-utils
@@ -53,28 +51,19 @@ API documentation for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q 
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-
 #FIXME: test gets java.lang.NullPointerException
-mvn-jpp \
+mvn-rpmbuild \
         -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         -Dmaven.test.failure.ignore=true \
         install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
-    do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
 %add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
 
@@ -84,10 +73,8 @@ install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %post
 %update_maven_depmap
@@ -95,23 +82,21 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE.txt
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Jun 8 2011 Alexander Kurtakov <akurtako at redhat.com> 2.3.1-3
+- Build with maven 3.x.
+- Adapt to current guidelines.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the java-sig-commits mailing list