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

[Alexander Kurtakov]

commit be374aadbe5f6c8fb369fae4483ca1c737ee8c84
Author: Alexander Kurtakov <akurtakov at gmail.com>
Date:   Thu Jun 9 22:30:45 2011 +0300

    Build with maven 3.x.
    
    - Use upstream sources.
    - Guidelines fixes.

 .gitignore                       |    1 +
 maven-help-plugin-jpp-depmap.xml |   18 ------------
 maven-help-plugin-pom.patch      |   22 ---------------
 maven-help-plugin.spec           |   54 ++++++++++++-------------------------
 sources                          |    2 +-
 5 files changed, 20 insertions(+), 77 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0ff9bf0..f932697 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 maven-help-plugin-2.1.1.tar.bz2
+/maven-help-plugin-2.1.1-source-release.zip
diff --git a/maven-help-plugin-jpp-depmap.xml b/maven-help-plugin-jpp-depmap.xml
index 5c7aeb7..de14f41 100644
--- a/maven-help-plugin-jpp-depmap.xml
+++ b/maven-help-plugin-jpp-depmap.xml
@@ -1,27 +1,9 @@
 <dependencies>
    <dependency>
       <maven>
-         <groupId>com.thoughtworks.xstream</groupId>
-         <artifactId>xstream</artifactId>
-         <version>1.3</version>
-      </maven>
-      <jpp>
-         <groupId>JPP</groupId>
-         <artifactId>xstream</artifactId>
-         <version>1.2.2</version>
-      </jpp>
-   </dependency>
-
-   <dependency>
-      <maven>
          <groupId>junit-addons</groupId>
          <artifactId>junit-addons</artifactId>
          <version>1.4</version>
       </maven>
-      <jpp>
-         <groupId>JPP/maven2</groupId>
-         <artifactId>empty-dep</artifactId>
-         <version>1.4</version>
-      </jpp>
    </dependency>
 </dependencies>
diff --git a/maven-help-plugin.spec b/maven-help-plugin.spec
index 4c1cb79..c4cc1bb 100644
--- a/maven-help-plugin.spec
+++ b/maven-help-plugin.spec
@@ -1,37 +1,34 @@
 Name:           maven-help-plugin
 Version:        2.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Plugin to to get relative information about a project or the system
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-help-plugin/
-# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-help-plugin-2.1.1/
-# tar jcf maven-help-plugin-2.1.1.tar.bz2 maven-help-plugin-2.1.1
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 Source1:        %{name}-jpp-depmap.xml
 Patch0:         %{name}-pom.patch
-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
 BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
 BuildRequires: maven-surefire-provider-junit
 BuildRequires: maven-plugin-testing-harness
 BuildRequires: maven-jar-plugin
 BuildRequires: maven-javadoc-plugin
 BuildRequires: xstream
 BuildRequires: jpackage-utils
-Requires: ant-nodeps
-Requires: maven2
+Requires: ant
+Requires: maven
 Requires: jpackage-utils
 Requires: java
 Requires: xstream
@@ -58,31 +55,19 @@ API documentation for %{name}.
 
 
 %prep
-%setup -q #You may need to update this according to your Source0
-%patch0 -b .sav
+%setup -q 
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-
 # no junit-addons, skip test
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
+        -Dmaven.local.depmap.file=%{SOURCE1} \
         -Dmaven.test.skip=true \
-        -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}
 
@@ -92,10 +77,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
@@ -103,21 +86,20 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jun 9 2011 Alexander Kurtakov <akurtako at redhat.com> 2.1.1-3
+- Build with maven 3.x.
+- Use upstream sources.
+- Guidelines fixes.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index f799fb5..6b47e12 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fbe50b6d1775e6cf1b4b49d4ee1947c6  maven-help-plugin-2.1.1.tar.bz2
+f09a31f8cb5a6c07de53c1a524b80842  maven-help-plugin-2.1.1-source-release.zip