[java-sig-commits] [plexus-cipher] Migration from plexus-maven-plugin to plexus-containers-component-metadata

[Jaromír Cápík]

commit 9e818d5e8915627a847861d8b1695fc3d31840f0
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Fri Nov 4 17:37:32 2011 +0100

    Migration from plexus-maven-plugin to plexus-containers-component-metadata

 ...us-cipher-migration-to-component-metadata.patch |   18 +++++++++
 plexus-cipher.spec                                 |   38 ++++++++-----------
 2 files changed, 34 insertions(+), 22 deletions(-)
---
diff --git a/plexus-cipher-migration-to-component-metadata.patch b/plexus-cipher-migration-to-component-metadata.patch
new file mode 100644
index 0000000..ecedade
--- /dev/null
+++ b/plexus-cipher-migration-to-component-metadata.patch
@@ -0,0 +1,18 @@
+diff -Naur plexus-cipher-1.5.orig/pom.xml plexus-cipher-1.5/pom.xml
+--- plexus-cipher-1.5.orig/pom.xml	2009-09-14 13:50:04.000000000 +0200
++++ plexus-cipher-1.5/pom.xml	2011-07-26 18:05:06.195978918 +0200
+@@ -25,12 +25,11 @@
+     <plugins>
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+-        <artifactId>plexus-maven-plugin</artifactId>
+-        <version>1.3.5</version>
++        <artifactId>plexus-component-metadata</artifactId>
+         <executions>
+           <execution>
+             <goals>
+-              <goal>descriptor</goal>
++              <goal>generate-metadata</goal>
+             </goals>
+           </execution>
+         </executions>
diff --git a/plexus-cipher.spec b/plexus-cipher.spec
index 9d741d9..371c9f8 100644
--- a/plexus-cipher.spec
+++ b/plexus-cipher.spec
@@ -1,6 +1,6 @@
 Name:           plexus-cipher
 Version:        1.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Plexus Cipher: encryption/decryption Component
 
 Group:          Development/Libraries
@@ -10,6 +10,8 @@ URL:            http://spice.sonatype.org
 #tar zcf plexus-cipher-1.5.tar.gz plexus-cipher-1.5
 Source0:        %{name}-%{version}.tar.gz
 
+Patch0:         %{name}-migration-to-component-metadata.patch
+
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
@@ -26,7 +28,7 @@ BuildRequires: maven-doxia-sitetools
 BuildRequires: plexus-container-default
 BuildRequires: forge-parent
 BuildRequires: spice-parent
-BuildRequires: plexus-maven-plugin
+BuildRequires: plexus-containers-component-metadata
 BuildRequires: junit
 BuildRequires: maven-shared-reporting-impl
 BuildRequires: plexus-digest
@@ -34,8 +36,6 @@ BuildRequires: plexus-digest
 Requires: plexus-containers
 Requires: jpackage-utils
 Requires: java
-Requires(post):       jpackage-utils
-Requires(postun):     jpackage-utils
 
 
 %description
@@ -51,47 +51,41 @@ API documentation for %{name}.
 
 
 %prep
-%setup -q 
+%setup -q
+
+%patch0 -p1
 
 %build
-mvn-rpmbuild \
-            -Dmaven.test.failure.ignore=true \
-            install javadoc:javadoc
+mvn-rpmbuild -Dmaven.test.failure.ignore=true \
+             install javadoc:aggregate
 
 %install
 # jars
-install -d -m 0755 %{buildroot}%{_javadir}/plexus
-install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/plexus/%{name}.jar
-
-%add_to_maven_depmap org.sonatype.plexus %{name} %{version} JPP/plexus %{name}
+install -Dm 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/plexus/%{name}.jar
 
 # poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
-    %{buildroot}%{_mavenpomdir}/JPP.plexus-%{name}.pom
+install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.plexus-%{name}.pom
 
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}/
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP.plexus-%{name}.pom plexus/%{name}.jar
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/plexus/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 %doc NOTICE.txt
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/plexus/%{name}
 
 %changelog
+* Tue Jul 26 2011 Jaromir Capik <jcapik at redhat.com> - 1.5-6
+- Migration from plexus-maven-plugin to plexus-containers-component-metadata
+- Minor spec file changes according to the latest guidelines
+
 * Fri Jun 3 2011 Alexander Kurtakov <akurtako at redhat.com> 1.5-5
 - Do not require maven2.
 - Build with maven (v. 3) by default.