[java-sig-commits] [maven-assembly-plugin] Update to final release.

[Alexander Kurtakov]

commit f1b6a7fd7214cf5fc25ea9d6b67c485f3a014a88
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Dec 29 07:15:21 2010 +0200

    Update to final release.

 .gitignore                 |    1 +
 maven-assembly-plugin.spec |   44 +++++++++++++++++---------------------------
 sources                    |    1 +
 3 files changed, 19 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3bb37c4..2622ee9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 maven-assembly-plugin-2.2-beta-5-src.tar.gz
+maven-assembly-plugin-2.2-source-release.zip
diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec
index 2505361..7badc47 100644
--- a/maven-assembly-plugin.spec
+++ b/maven-assembly-plugin.spec
@@ -1,18 +1,13 @@
-%global project_version 2.2-beta-5
-
 Name:           maven-assembly-plugin
 Version:        2.2
-Release:        0.4.beta5%{?dist}
+Release:        1%{?dist}
 Summary:        Maven Assembly Plugin
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-assembly-plugin/
-#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.2-beta-5/
-#tar zcvf maven-assembly-plugin-2.2-beta-5-src.tar.gz maven-assembly-plugin-2.2-beta-5/
-Source0:        %{name}-%{project_version}-src.tar.gz
+Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 Source1:        %{name}-jpp-depmap.xml
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
@@ -23,16 +18,16 @@ BuildRequires: java >= 1:1.6.0
 BuildRequires: jpackage-utils >= 0:1.7.2
 BuildRequires:  ant, ant-nodeps
 BuildRequires:  maven2 >= 0:2.0.4-9
-BuildRequires:  maven2-plugin-assembly
-BuildRequires:  maven2-plugin-compiler
-BuildRequires:  maven2-plugin-install
-BuildRequires:  maven2-plugin-jar
-BuildRequires:  maven2-plugin-resources
-BuildRequires:  maven2-plugin-site
-BuildRequires:  maven2-plugin-plugin
+BuildRequires:  maven-assembly-plugin
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-resources-plugin
+BuildRequires:  maven-site-plugin
+BuildRequires:  maven-plugin-plugin
 BuildRequires:  maven-surefire-maven-plugin
 BuildRequires:  maven-surefire-provider-junit
-BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-shared-filtering
 BuildRequires:  maven-doxia
 BuildRequires:  maven-doxia-sitetools
@@ -88,7 +83,7 @@ API documentation for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{project_version}
+%setup -q -n %{name}-%{version}
 mkdir -p target/classes/
 cp -pr src/main/resources/META-INF/ target/classes/
 
@@ -108,10 +103,7 @@ rm -rf %{buildroot}
 
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{project_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 maven-assembly-plugin %{version} JPP maven-assembly-plugin
 
@@ -121,9 +113,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}
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 rm -rf target/site/api*
 
 %post
@@ -132,9 +123,6 @@ rm -rf target/site/api*
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %{_javadir}/*
@@ -143,10 +131,12 @@ rm -rf %{buildroot}
 
 %files javadoc
 %defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Dec 29 2010 Alexander Kurtakov <akurtako at redhat.com> 2.2-1
+- Update to final release.
+
 * Tue Jun 15 2010 Alexander Kurtakov <akurtako at redhat.com> 2.2-0.4.beta5
 - Add missing BuildRequires.
 
diff --git a/sources b/sources
index e54d1a8..b70937d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 db8cff1a3bf57fca8ba3899d053d48f2  maven-assembly-plugin-2.2-beta-5-src.tar.gz
+eec14f1ba55f53710542e85562a7b003  maven-assembly-plugin-2.2-source-release.zip