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

[Stanislav Ochotnicky]

commit b76298a919ec5d6015e4367b7efbbd2935c473c2
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Mon Jan 9 17:50:45 2012 +0100

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

 0003-Migration-to-component-metadata.patch |   34 ++++++++++++++++++++++++++++
 maven-doxia-sitetools.spec                 |   32 ++++++++++++++------------
 2 files changed, 51 insertions(+), 15 deletions(-)
---
diff --git a/0003-Migration-to-component-metadata.patch b/0003-Migration-to-component-metadata.patch
new file mode 100644
index 0000000..7d8a22b
--- /dev/null
+++ b/0003-Migration-to-component-metadata.patch
@@ -0,0 +1,34 @@
+diff -Naur doxia-sitetools-1.2.orig/doxia-decoration-model/pom.xml doxia-sitetools-1.2/doxia-decoration-model/pom.xml
+--- doxia-sitetools-1.2.orig/doxia-decoration-model/pom.xml	2011-04-26 22:48:04.000000000 +0200
++++ doxia-sitetools-1.2/doxia-decoration-model/pom.xml	2012-01-09 17:25:20.704405788 +0100
+@@ -77,11 +77,11 @@
+       </plugin>
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+-        <artifactId>plexus-maven-plugin</artifactId>
++        <artifactId>plexus-component-metadata</artifactId>
+         <executions>
+           <execution>
+             <goals>
+-              <goal>descriptor</goal>
++              <goal>generate-metadata</goal>
+             </goals>
+           </execution>
+         </executions>
+diff -Naur doxia-sitetools-1.2.orig/doxia-doc-renderer/pom.xml doxia-sitetools-1.2/doxia-doc-renderer/pom.xml
+--- doxia-sitetools-1.2.orig/doxia-doc-renderer/pom.xml	2011-04-26 22:48:20.000000000 +0200
++++ doxia-sitetools-1.2/doxia-doc-renderer/pom.xml	2012-01-09 17:26:26.943959066 +0100
+@@ -154,11 +154,11 @@
+     <plugins>
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+-        <artifactId>plexus-maven-plugin</artifactId>
++        <artifactId>plexus-component-metadata</artifactId>
+         <executions>
+           <execution>
+             <goals>
+-              <goal>descriptor</goal>
++              <goal>generate-metadata</goal>
+             </goals>
+           </execution>
+         </executions>
diff --git a/maven-doxia-sitetools.spec b/maven-doxia-sitetools.spec
index 588b873..fffd9b8 100644
--- a/maven-doxia-sitetools.spec
+++ b/maven-doxia-sitetools.spec
@@ -33,19 +33,20 @@
 
 Name:           %{parent}-%{subproj}
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Doxia content generation framework
 License:        ASL 2.0
 Group:          Development/Tools
 URL:            http://maven.apache.org/doxia/
 
-Source0: http://repo2.maven.org/maven2/org/apache/maven/doxia/doxia-sitetools/%{version}/doxia-%{subproj}-%{version}-source-release.zip
+Source0:        http://repo2.maven.org/maven2/org/apache/maven/doxia/doxia-sitetools/%{version}/doxia-%{subproj}-%{version}-source-release.zip
 
 # Point it at the correct plexus-container-default
-Source1:    maven-doxia-depmap.xml
+Source1:        maven-doxia-depmap.xml
 
 Patch0:         0001-Remove-clirr-dependency.patch
 Patch1:         0002-Remove-htmlunit-dependency.patch
+Patch2:         0003-Migration-to-component-metadata.patch
 
 BuildRequires:  itext
 BuildRequires:  jpackage-utils
@@ -72,6 +73,7 @@ BuildRequires:  jakarta-oro
 BuildRequires:  plexus-container-default
 BuildRequires:  plexus-containers-container-default
 BuildRequires:  plexus-containers-component-javadoc
+BuildRequires:  plexus-containers-component-metadata
 BuildRequires:  plexus-i18n
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-velocity
@@ -94,8 +96,6 @@ Requires:       velocity
 
 Requires:       java >= 1:1.6.0
 Requires:       jpackage-utils
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
 
 BuildArch:      noarch
 
@@ -122,6 +122,9 @@ API documentation for %{name}.
 # Disable tests that need htmlunit, until we get it in Fedora
 %patch1 -p1
 
+%patch2 -p1
+
+
 %build
 
 # tests can't run because of missing deps
@@ -141,11 +144,6 @@ install -m 644 -p doxia-decoration-model/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/
 install -m 644 -p doxia-site-renderer/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-site-renderer.pom
 install -m 644 -p doxia-doc-renderer/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-doc-renderer.pom
 
-%add_to_maven_depmap org.apache.maven.doxia doxia-sitetools %{version} JPP/%{parent} sitetools
-%add_to_maven_depmap org.apache.maven.doxia doxia-decoration-model %{version} JPP/%{parent} decoration-model
-%add_to_maven_depmap org.apache.maven.doxia doxia-site-renderer %{version} JPP/%{parent} site-renderer
-%add_to_maven_depmap org.apache.maven.doxia doxia-doc-renderer %{version} JPP/%{parent} doc-renderer
-
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{parent}
 
 install -m 644 -p doxia-decoration-model/target/doxia-decoration-model-%{version}.jar \
@@ -158,16 +156,16 @@ install -m 644 -p doxia-doc-renderer/target/doxia-doc-renderer-%{version}.jar \
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
 
+%add_maven_depmap JPP.%{parent}-sitetools.pom
+%add_maven_depmap JPP.%{parent}-decoration-model.pom %{parent}/decoration-model.jar
+%add_maven_depmap JPP.%{parent}-site-renderer.pom %{parent}/site-renderer.jar
+%add_maven_depmap JPP.%{parent}-doc-renderer.pom %{parent}/doc-renderer.jar
+
 %pre javadoc
 # workaround for rpm bug, can be removed in F-18
 [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
 rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
 
 %files
 %{_javadir}/%{parent}/*.jar
@@ -178,6 +176,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Jan 09 2012 Jaromir Capik <jcapik at redhat.com> - 1.2-2
+- Migration from plexus-maven-plugin to plexus-containers-component-metadata
+- Minor spec file changes according to the latest guidelines
+
 * Fri May  6 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.2-1
 - Update to latest version (1.2)
 - Use maven 3 to build