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

[Stanislav Ochotnicky]

commit 85e23f59cf85b7890550883d117da1531f0ae9f7
Author: Jaromír Cápík <jcapik at redhat.com>
Date:   Tue Jul 19 13:38:49 2011 +0200

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

 ...es-plugin-migration-to-component-metadata.patch |   29 ++++++++++++++++++++
 maven-changes-plugin.spec                          |   11 +++++--
 2 files changed, 37 insertions(+), 3 deletions(-)
---
diff --git a/maven-changes-plugin-migration-to-component-metadata.patch b/maven-changes-plugin-migration-to-component-metadata.patch
new file mode 100644
index 0000000..0f28625
--- /dev/null
+++ b/maven-changes-plugin-migration-to-component-metadata.patch
@@ -0,0 +1,29 @@
+diff -Naur maven-changes-plugin-2.6.orig/pom.xml maven-changes-plugin-2.6/pom.xml
+--- maven-changes-plugin-2.6.orig/pom.xml	2011-06-19 08:07:34.000000000 +0200
++++ maven-changes-plugin-2.6/pom.xml	2011-07-15 12:54:07.256409156 +0200
+@@ -383,14 +383,13 @@
+       </plugin>
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+-        <artifactId>plexus-maven-plugin</artifactId>
+-        <version>1.3.8</version>
++        <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>
+           </execution>
+           <execution>
+@@ -404,7 +403,7 @@
+             </configuration>
+             <phase>generate-resources</phase>
+             <goals>
+-              <goal>merge-descriptors</goal>
++              <goal>merge-metadata</goal>
+             </goals>
+           </execution>
+         </executions>
diff --git a/maven-changes-plugin.spec b/maven-changes-plugin.spec
index 2bd9d4b..22a826b 100644
--- a/maven-changes-plugin.spec
+++ b/maven-changes-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-changes-plugin
 Version:        2.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plugin to support reporting of changes between releases
 
 Group:          Development/Libraries
@@ -10,6 +10,7 @@ Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%
 Source1:        %{name}.depmap
 
 Patch0:         0001-Fix-Maven-3-compatibility.patch
+Patch1:         %{name}-migration-to-component-metadata.patch
 
 BuildArch:      noarch
 
@@ -35,7 +36,7 @@ BuildRequires: maven-shared-reporting-api
 BuildRequires: maven-shared-reporting-impl
 BuildRequires: modello
 BuildRequires: plexus-containers-container-default
-BuildRequires: plexus-maven-plugin
+BuildRequires: plexus-containers-component-metadata
 BuildRequires: plexus-mail-sender
 BuildRequires: plexus-i18n
 BuildRequires: plexus-interpolation
@@ -98,12 +99,13 @@ API documentation for %{name}.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 mvn-rpmbuild -e \
         -Dmaven.local.depmap.file=%{SOURCE1} \
         -Dmaven.test.failure.ignore=true \
-        install javadoc:javadoc
+        install javadoc:aggregate
 
 %install
 
@@ -133,6 +135,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jul 15 2011 Jaromir Capik <jcapik at redhat.com> 2.6-2
+- Migration from plexus-maven-plugin to plexus-containers-component-metadata
+
 * Mon Jun 27 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.6-1
 - Update to latest upstream (2.6)
 - Properly complete BR/R