[maven-assembly-plugin] Migration from plexus-maven-plugin to plexus-containers-component-metadata

[Jaromír Cápík]

commit 030cd4232c362d777ad36ca577fc2c8fddfb6057
Author: Jaromír Cápík <jcapik at redhat.com>
Date:   Fri Jul 15 11:10:50 2011 +0200

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

 ...ly-plugin-migration-to-component-metadata.patch |   31 ++++++++++++++++++++
 maven-assembly-plugin.spec                         |   24 ++++++++++++---
 2 files changed, 50 insertions(+), 5 deletions(-)
---
diff --git a/maven-assembly-plugin-migration-to-component-metadata.patch b/maven-assembly-plugin-migration-to-component-metadata.patch
new file mode 100644
index 0000000..20d32c4
--- /dev/null
+++ b/maven-assembly-plugin-migration-to-component-metadata.patch
@@ -0,0 +1,31 @@
+diff -Naur maven-assembly-plugin-2.2.1.orig/pom.xml maven-assembly-plugin-2.2.1/pom.xml
+--- maven-assembly-plugin-2.2.1.orig/pom.xml	2011-02-24 21:03:42.000000000 +0100
++++ maven-assembly-plugin-2.2.1/pom.xml	2011-06-22 18:13:32.000000000 +0200
+@@ -212,23 +212,23 @@
+     <plugins>
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+-        <artifactId>plexus-maven-plugin</artifactId>
++        <artifactId>plexus-component-metadata</artifactId>
+         <executions>
+           <execution>
+             <id>create-component-descriptor</id>
+             <phase>generate-resources</phase>
+             <goals>
+-              <goal>descriptor</goal>
++              <goal>generate-metadata</goal>
+             </goals>
+             <configuration>
+-              <outputDirectory>${project.build.directory}/generated-resources/plexus</outputDirectory>
++              <generatedMetadata>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</generatedMetadata>
+             </configuration>
+           </execution>
+           <execution>
+             <id>merge-metadata</id>
+             <phase>process-resources</phase>
+             <goals>
+-              <goal>merge-descriptors</goal>
++              <goal>merge-metadata</goal>
+             </goals>
+             <configuration>
+               <!-- <output>${project.build.outputDirectory}/META-INF/plexus/components.xml</output> -->
diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec
index 8736fc1..8239cf6 100644
--- a/maven-assembly-plugin.spec
+++ b/maven-assembly-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-assembly-plugin
 Version:        2.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Maven Assembly Plugin
 
 Group:          Development/Libraries
@@ -9,6 +9,8 @@ URL:            http://maven.apache.org/plugins/maven-assembly-plugin/
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 Source1:        %{name}-jpp-depmap.xml
 
+Patch0:         %{name}-migration-to-component-metadata.patch
+
 BuildArch: noarch
 
 Obsoletes: maven2-plugin-assembly <= 0:2.0.8
@@ -35,7 +37,7 @@ BuildRequires:  maven-doxia-sitetools
 BuildRequires: plexus-container-default
 BuildRequires: plexus-utils
 BuildRequires: plexus-active-collections
-BuildRequires: plexus-maven-plugin
+BuildRequires: plexus-containers-component-metadata
 BuildRequires: plexus-io
 BuildRequires: plexus-interpolation
 BuildRequires: plexus-archiver
@@ -50,6 +52,10 @@ BuildRequires: jaxen
 BuildRequires: saxpath
 BuildRequires: junit
 
+BuildRequires: modello
+
+Requires: modello
+
 Requires: java >= 1:1.6.0
 Requires: easymock
 Requires: jdom
@@ -84,6 +90,9 @@ API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}-%{version}
+
+%patch0 -p1
+
 mkdir -p target/classes/
 cp -pr src/main/resources/META-INF/ target/classes/
 
@@ -93,7 +102,9 @@ mvn-rpmbuild \
         -e \
         -Dmaven.local.depmap.file=%{SOURCE1} \
         -Dmaven.test.skip=true \
-        install javadoc:javadoc
+        install javadoc:aggregate
+
+
 
 %install
 # jars
@@ -119,16 +130,19 @@ rm -rf target/site/api*
 %update_maven_depmap
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu May 23 2011 Jaromir Capik <jcapik at redhat.com> 2.2.1-2
+- Migration from plexus-maven-plugin to plexus-containers-component-metadata
+- Missing modello dependency added
+- Minor spec file changes according to the latest guidelines
+
 * Thu Mar 17 2011 Alexander Kurtakov <akurtako at redhat.com> 2.2.1-1
 - Update to upstream 2.2.1 release.