[java-sig-commits] [maven-shared] Migration to plexus-containers-component-metadata

[Stanislav Ochotnicky]

commit e5f29a11f0ced74f83e0fcb13f6541b9f089cd1f
Author: Jaromir Capik <jcapik(a)redhat.com&gt;
Date:   Mon Aug 29 18:25:50 2011 +0200

    Migration to plexus-containers-component-metadata
    
    - Migration from plexus-maven-plugin to plexus-containers-component-metadata
    - Minor spec file changes according to the latest guidelines

 maven-shared-maven-model-v3-removal.patch          |   22 ++
 maven-shared-migration-to-component-metadata.patch |  233 ++++++++++++++++++++
 maven-shared.spec                                  |  164 ++++++++------
 3 files changed, 346 insertions(+), 73 deletions(-)
---
diff --git a/maven-shared-maven-model-v3-removal.patch
b/maven-shared-maven-model-v3-removal.patch
new file mode 100644
index 0000000..66a085d
--- /dev/null
+++ b/maven-shared-maven-model-v3-removal.patch
@@ -0,0 +1,22 @@
+diff -Naur maven-shared-components-15.orig/maven-model-converter/pom.xml
maven-shared-components-15/maven-model-converter/pom.xml
+--- maven-shared-components-15.orig/maven-model-converter/pom.xml	2009-09-16
19:12:28.000000000 +0200
++++ maven-shared-components-15/maven-model-converter/pom.xml	2011-08-22
16:46:28.955052422 +0200
+@@ -43,15 +43,15 @@
+   </issueManagement>
+ 
+   <dependencies>
+-    <dependency>
++<!--    <dependency>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-model-v3</artifactId>
+       <version>2.0</version>
+-    </dependency>
++    </dependency>  -->
+     <dependency>
+       <groupId>org.apache.maven</groupId>
+       <artifactId>maven-model</artifactId>
+-      <version>2.0.6</version>
++      <version>3.0.3</version>
+     </dependency>
+     <dependency>
+       <groupId>org.codehaus.plexus</groupId>
diff --git a/maven-shared-migration-to-component-metadata.patch
b/maven-shared-migration-to-component-metadata.patch
new file mode 100644
index 0000000..667d8cb
--- /dev/null
+++ b/maven-shared-migration-to-component-metadata.patch
@@ -0,0 +1,233 @@
+diff -Naur maven-shared-components-15.orig/maven-artifact-resolver/pom.xml
maven-shared-components-15/maven-artifact-resolver/pom.xml
+--- maven-shared-components-15.orig/maven-artifact-resolver/pom.xml	2011-08-22
16:52:40.000000000 +0200
++++ maven-shared-components-15/maven-artifact-resolver/pom.xml	2011-08-23
15:39:01.647010748 +0200
+@@ -118,14 +118,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>
+         </executions>
+diff -Naur maven-shared-components-15.orig/maven-dependency-analyzer/pom.xml
maven-shared-components-15/maven-dependency-analyzer/pom.xml
+--- maven-shared-components-15.orig/maven-dependency-analyzer/pom.xml	2009-09-16
19:12:28.000000000 +0200
++++ maven-shared-components-15/maven-dependency-analyzer/pom.xml	2011-08-23
15:36:57.807015664 +0200
+@@ -105,11 +105,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 maven-shared-components-15.orig/maven-dependency-tree/pom.xml
maven-shared-components-15/maven-dependency-tree/pom.xml
+--- maven-shared-components-15.orig/maven-dependency-tree/pom.xml	2011-08-22
16:52:40.000000000 +0200
++++ maven-shared-components-15/maven-dependency-tree/pom.xml	2011-08-23
15:36:52.030018058 +0200
+@@ -86,11 +86,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 -Naur maven-shared-components-15.orig/maven-downloader/pom.xml
maven-shared-components-15/maven-downloader/pom.xml
+--- maven-shared-components-15.orig/maven-downloader/pom.xml	2011-08-22
16:52:40.000000000 +0200
++++ maven-shared-components-15/maven-downloader/pom.xml	2011-08-23 15:35:59.710026929
+0200
+@@ -73,11 +73,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 -Naur maven-shared-components-15.orig/maven-doxia-tools/pom.xml
maven-shared-components-15/maven-doxia-tools/pom.xml
+--- maven-shared-components-15.orig/maven-doxia-tools/pom.xml	2009-12-08
23:34:57.000000000 +0100
++++ maven-shared-components-15/maven-doxia-tools/pom.xml	2011-08-23 15:32:43.210030395
+0200
+@@ -145,12 +145,12 @@
+     <plugins>
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+-        <artifactId>plexus-maven-plugin</artifactId>
++        <artifactId>plexus-component-metadata</artifactId>
+         <executions>
+           <execution>
+             <id>create-component-descriptor</id>
+             <goals>
+-              <goal>descriptor</goal>
++              <goal>generate-metadata</goal>
+             </goals>
+           </execution>
+         </executions>
+diff -Naur maven-shared-components-15.orig/maven-filtering/pom.xml
maven-shared-components-15/maven-filtering/pom.xml
+--- maven-shared-components-15.orig/maven-filtering/pom.xml	2009-09-16 19:12:28.000000000
+0200
++++ maven-shared-components-15/maven-filtering/pom.xml	2011-08-23 15:39:11.391012592
+0200
+@@ -120,12 +120,11 @@
+     <plugins>
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+-        <artifactId>plexus-maven-plugin</artifactId>
+-        <version>1.3.4</version>
++        <artifactId>plexus-component-metadata</artifactId>
+         <executions>
+           <execution>
+             <goals>
+-              <goal>descriptor</goal>
++              <goal>generate-metadata</goal>
+             </goals>
+           </execution>
+         </executions>
+diff -Naur maven-shared-components-15.orig/maven-invoker/pom.xml
maven-shared-components-15/maven-invoker/pom.xml
+--- maven-shared-components-15.orig/maven-invoker/pom.xml	2009-09-20 16:08:22.000000000
+0200
++++ maven-shared-components-15/maven-invoker/pom.xml	2011-08-23 15:39:05.119009947 +0200
+@@ -78,14 +78,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>
+         </executions>
+diff -Naur maven-shared-components-15.orig/maven-model-converter/pom.xml
maven-shared-components-15/maven-model-converter/pom.xml
+--- maven-shared-components-15.orig/maven-model-converter/pom.xml	2011-08-22
16:52:40.000000000 +0200
++++ maven-shared-components-15/maven-model-converter/pom.xml	2011-08-23
15:36:24.830018547 +0200
+@@ -80,11 +80,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 -Naur maven-shared-components-15.orig/maven-osgi/pom.xml
maven-shared-components-15/maven-osgi/pom.xml
+--- maven-shared-components-15.orig/maven-osgi/pom.xml	2009-09-16 19:12:28.000000000
+0200
++++ maven-shared-components-15/maven-osgi/pom.xml	2011-08-23 15:33:14.779028815 +0200
+@@ -55,11 +55,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 -Naur maven-shared-components-15.orig/maven-repository-builder/pom.xml
maven-shared-components-15/maven-repository-builder/pom.xml
+--- maven-shared-components-15.orig/maven-repository-builder/pom.xml	2011-08-22
16:52:40.000000000 +0200
++++ maven-shared-components-15/maven-repository-builder/pom.xml	2011-08-23
15:35:51.181022277 +0200
+@@ -108,12 +108,12 @@
+       
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+-        <artifactId>plexus-maven-plugin</artifactId>
++        <artifactId>plexus-component-metadata</artifactId>
+         <executions>
+           <execution>
+             <id>create-component-descriptor</id>
+             <goals>
+-              <goal>descriptor</goal>
++              <goal>generate-metadata</goal>
+             </goals>
+           </execution>
+         </executions>
+diff -Naur maven-shared-components-15.orig/maven-runtime/pom.xml
maven-shared-components-15/maven-runtime/pom.xml
+--- maven-shared-components-15.orig/maven-runtime/pom.xml	2009-11-08 16:38:27.000000000
+0100
++++ maven-shared-components-15/maven-runtime/pom.xml	2011-08-23 15:39:18.928010249 +0200
+@@ -102,12 +102,11 @@
+       </plugin>
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+-        <artifactId>plexus-maven-plugin</artifactId>
+-        <version>1.3.2</version>
++        <artifactId>plexus-component-metadata</artifactId>
+         <executions>
+           <execution>
+             <goals>
+-              <goal>descriptor</goal>
++              <goal>generate-metadata</goal>
+             </goals>
+           </execution>
+         </executions>
+diff -Naur maven-shared-components-15.orig/maven-shared-jar/pom.xml
maven-shared-components-15/maven-shared-jar/pom.xml
+--- maven-shared-components-15.orig/maven-shared-jar/pom.xml	2009-12-15
00:44:29.000000000 +0100
++++ maven-shared-components-15/maven-shared-jar/pom.xml	2011-08-23 15:39:15.535007743
+0200
+@@ -83,12 +83,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 -Naur maven-shared-components-15.orig/maven-filtering/src/test/resources/pom.xml
maven-shared-components-15/maven-filtering/src/test/resources/pom.xml
+--- maven-shared-components-15.orig/maven-filtering/src/test/resources/pom.xml	2009-02-28
13:41:44.000000000 +0100
++++ maven-shared-components-15/maven-filtering/src/test/resources/pom.xml	2011-08-23
16:48:53.297804847 +0200
+@@ -43,12 +43,11 @@
+     <plugins>
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+-        <artifactId>plexus-maven-plugin</artifactId>
+-        <version>1.3.4</version>
++        <artifactId>plexus-component-metadata</artifactId>
+         <executions>
+           <execution>
+             <goals>
+-              <goal>descriptor</goal>
++              <goal>generate-metadata</goal>
+             </goals>
+           </execution>
+         </executions>
diff --git a/maven-shared.spec b/maven-shared.spec
index 0ce96d6..7cc713d 100644
--- a/maven-shared.spec
+++ b/maven-shared.spec
@@ -67,7 +67,7 @@ Summary:        Maven Shared Components
 URL:            http://maven.apache.org/shared/
 Name:           maven-shared
 Version:        15
-Release:        16%{?dist}
+Release:        17%{?dist}
 License:        ASL 2.0
 Group:          Development/Libraries
 
@@ -79,6 +79,8 @@ Source1:        %{name}-jpp-depmap.xml
 
 Patch0:        %{name}-pom.patch
 Patch1:        %{name}-maven3.patch
+Patch2:        %{name}-maven-model-v3-removal.patch
+Patch3:        %{name}-migration-to-component-metadata.patch
 Patch6:        maven-runtime-XMLMavenRuntimeVisitor.patch
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
@@ -101,7 +103,7 @@ BuildRequires:  maven-shared-reporting-impl
 BuildRequires:  maven-shared-file-management
 BuildRequires:  maven-plugin-testing-tools
 BuildRequires:  maven-test-tools
-BuildRequires:  plexus-maven-plugin
+BuildRequires:  plexus-containers-component-metadata
 BuildRequires:  plexus-component-api
 BuildRequires:  maven-plugin-cobertura
 BuildRequires:  junit
@@ -411,6 +413,8 @@ chmod -R go=u-w *
 %patch0 -b .sav0
 %patch1 -p1 -b .sav1
 %patch6 -b .sav6
+%patch2 -p1
+%patch3 -p1
 
 # need namespace for new version modello
 sed -i "s|<model>|<model
xmlns=\"http://modello.codehaus.org/MODELLO/1.3.0\"
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
xsi:schemaLocation=\"http://modello.codehaus.org/MODELLO/1.3.0
http://modello.codehaus.org/xsd/modello-1.3.0.xsd\" xml.namespace=\"..\"
xml.schemaLocation=\"..\" xsd.namespace=\"..\"
xsd.targetNamespace=\"..\">|" file-management/src/main/mdo/fileset.mdo
@@ -426,7 +430,7 @@ rm -f
maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency
 
 %build
 export MAVEN_OPTS="-XX:MaxPermSize=256m"
-mvn-rpmbuild -X \
+mvn-rpmbuild \
         -Dmaven.local.depmap.file=%{SOURCE1} \
         -Dmaven.test.skip=true \
         install javadoc:aggregate
@@ -439,103 +443,102 @@ install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
 
 # poms and jars
 install -pm 644 pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-components-parent.pom
-%add_to_maven_depmap org.apache.maven.shared maven-shared-components
%{shared_components_version} JPP/maven-shared components-parent
+%add_maven_depmap JPP.%{name}-components-parent.pom
 
 install -pm 644 maven-downloader/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-downloader.pom
-%add_to_maven_depmap org.apache.maven.shared maven-downloader %{downloader_version}
JPP/maven-shared downloader
 install -p -m 0644
maven-downloader/target/maven-downloader-%{downloader_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/downloader.jar
+%add_maven_depmap -f downloader JPP.%{name}-downloader.pom %{name}/downloader.jar
 
 install -pm 644 maven-dependency-analyzer/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-dependency-analyzer.pom
-%add_to_maven_depmap org.apache.maven.shared maven-dependency-analyzer
%{dependency_analyzer_version} JPP/maven-shared dependency-analyzer
 install -p -m 0644
maven-dependency-analyzer/target/maven-dependency-analyzer-%{dependency_analyzer_version}-SNAPSHOT.jar
\
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/dependency-analyzer.jar
+%add_maven_depmap -f dependency-analyzer JPP.%{name}-dependency-analyzer.pom
%{name}/dependency-analyzer.jar
 
 install -pm 644 maven-dependency-tree/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-dependency-tree.pom
-%add_to_maven_depmap org.apache.maven.shared maven-dependency-tree
%{dependency_tree_version} JPP/maven-shared dependency-tree
 install -p -m 0644
maven-dependency-tree/target/maven-dependency-tree-%{dependency_tree_version}-SNAPSHOT.jar
\
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/dependency-tree.jar
+%add_maven_depmap -f dependency-tree JPP.%{name}-dependency-tree.pom
%{name}/dependency-tree.jar
 
 install -pm 644 maven-verifier/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-verifier.pom
-%add_to_maven_depmap org.apache.maven.shared maven-verifier %{verifier_version}
JPP/maven-shared verifier
 install -p -m 0644 maven-verifier/target/maven-verifier-%{verifier_version}-SNAPSHOT.jar
\
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/verifier.jar
+%add_maven_depmap -f verifier JPP.%{name}-verifier.pom %{name}/verifier.jar
 
 install -pm 644 maven-shared-monitor/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-monitor.pom
-%add_to_maven_depmap org.apache.maven.shared maven-shared-monitor %{monitor_version}
JPP/maven-shared monitor
 install -p -m 0644
maven-shared-monitor/target/maven-shared-monitor-%{monitor_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/monitor.jar
+%add_maven_depmap -f monitor JPP.%{name}-monitor.pom %{name}/monitor.jar
 
 install -pm 644 maven-shared-io/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-io.pom
-%add_to_maven_depmap org.apache.maven.shared maven-shared-io %{io_version}
JPP/maven-shared io
 install -p -m 0644 maven-shared-io/target/maven-shared-io-%{io_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/io.jar
+%add_maven_depmap -f io JPP.%{name}-io.pom %{name}/io.jar
 
 install -pm 644 maven-shared-jar/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-jar.pom
-%add_to_maven_depmap org.apache.maven.shared maven-shared-jar %{jar_version}
JPP/maven-shared jar
 install -p -m 0644 maven-shared-jar/target/maven-shared-jar-%{jar_version}-SNAPSHOT.jar
\
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/jar.jar
+%add_maven_depmap -f jar JPP.%{name}-jar.pom %{name}/jar.jar
 
 install -pm 644 maven-repository-builder/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-repository-builder.pom
-%add_to_maven_depmap org.apache.maven.shared maven-repository-builder
%{repository_builder_version} JPP/maven-shared repository-builder
 install -p -m 0644
maven-repository-builder/target/maven-repository-builder-%{repository_builder_version}-alpha-3-SNAPSHOT.jar
\
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/repository-builder.jar
+%add_maven_depmap -f repository-builder JPP.%{name}-repository-builder.pom
%{name}/repository-builder.jar
 
 install -pm 644 maven-reporting-impl/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-reporting-impl.pom
-%add_to_maven_depmap org.apache.maven.reporting maven-reporting-impl
%{reporting_impl_version} JPP/maven-shared reporting-impl
 install -p -m 0644
maven-reporting-impl/target/maven-reporting-impl-%{reporting_impl_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/reporting-impl.jar
+%add_maven_depmap -f reporting-impl JPP.%{name}-reporting-impl.pom
%{name}/reporting-impl.jar
 
 install -pm 644 maven-model-converter/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-model-converter.pom
-%add_to_maven_depmap org.apache.maven.shared maven-model-converter
%{model_converter_version} JPP/maven-shared model-converter
 install -p -m 0644
maven-model-converter/target/maven-model-converter-%{model_converter_version}-SNAPSHOT.jar
\
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/model-converter.jar
+%add_maven_depmap -f model-converter JPP.%{name}-model-converter.pom
%{name}/model-converter.jar
 
 install -pm 644 maven-invoker/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-invoker.pom
-%add_to_maven_depmap org.apache.maven.shared maven-invoker %{invoker_version}
JPP/maven-shared invoker
 install -p -m 0644 maven-invoker/target/maven-invoker-%{invoker_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/invoker.jar
+%add_maven_depmap -f invoker JPP.%{name}-invoker.pom %{name}/invoker.jar
 
 install -pm 644 maven-common-artifact-filters/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-common-artifact-filters.pom
-%add_to_maven_depmap org.apache.maven.shared maven-common-artifact-filters
%{common_artifact_filters_version} JPP/maven-shared common-artifact-filters
 install -p -m 0644
maven-common-artifact-filters/target/maven-common-artifact-filters-%{common_artifact_filters_version}-SNAPSHOT.jar
\
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/common-artifact-filters.jar
+%add_maven_depmap -f common-artifact-filters JPP.%{name}-common-artifact-filters.pom
%{name}/common-artifact-filters.jar
 
 install -pm 644 maven-ant/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-ant.pom
-%add_to_maven_depmap org.apache.maven.shared maven-ant %{ant_version} JPP/maven-shared
ant
 install -p -m 0644 maven-ant/target/maven-ant-%{ant_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/ant.jar
+%add_maven_depmap -f ant JPP.%{name}-ant.pom %{name}/ant.jar
 
 install -pm 644 maven-osgi/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-osgi.pom
-%add_to_maven_depmap org.apache.maven.shared maven-osgi %{osgi_version} JPP/maven-shared
osgi
 install -p -m 0644 maven-osgi/target/maven-osgi-%{osgi_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/osgi.jar
+%add_maven_depmap -f osgi JPP.%{name}-osgi.pom %{name}/osgi.jar
 
 install -pm 644 file-management/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-file-management.pom
-%add_to_maven_depmap org.apache.maven.shared file-management %{file_management_version}
JPP/maven-shared file-management
 install -p -m 0644
file-management/target/file-management-%{file_management_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/file-management.jar
+%add_maven_depmap -f file-management JPP.%{name}-file-management.pom
%{name}/file-management.jar
 
 install -pm 644 maven-artifact-resolver/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-artifact-resolver.pom
-%add_to_maven_depmap org.apache.maven.shared maven-artifact-resolver
%{artifact_resolver_version} JPP/maven-shared artifact-resolver
 install -p -m 0644
maven-artifact-resolver/target/maven-artifact-resolver-%{artifact_resolver_version}-SNAPSHOT.jar
\
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/artifact-resolver.jar
+%add_maven_depmap -f artifact-resolver JPP.%{name}-artifact-resolver.pom
%{name}/artifact-resolver.jar
 
 install -pm 644 maven-filtering/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-filtering.pom
-%add_to_maven_depmap org.apache.maven.shared maven-filtering %{filtering_version}
JPP/maven-shared filtering
 install -p -m 0644
maven-filtering/target/maven-filtering-%{filtering_version}-beta-4-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/filtering.jar
+%add_maven_depmap -f filtering JPP.%{name}-filtering.pom %{name}/filtering.jar
 
 install -pm 644 maven-reporting-api/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-reporting-api.pom
 install -p -m 0644
maven-reporting-api/target/maven-reporting-api-%{reporting_api_version}-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/reporting-api.jar
-%add_to_maven_depmap org.apache.maven.shared maven-reporting-api %{reporting_api_version}
JPP/maven-shared reporting-api
-%add_to_maven_depmap org.apache.maven.reporting maven-reporting-api
%{reporting_api_version} JPP/maven-shared reporting-api
+%add_maven_depmap -f reporting-api -a
"org.apache.maven.reporting:maven-reporting-api" JPP.%{name}-reporting-api.pom
%{name}/reporting-api.jar
 
 install -pm 644 maven-runtime/pom.xml
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-runtime.pom
-%add_to_maven_depmap org.apache.maven.shared maven-runtime %{runtime_version}
JPP/maven-shared runtime
 install -p -m 0644
maven-runtime/target/maven-runtime-%{runtime_version}-alpha-3-SNAPSHOT.jar \
         $RPM_BUILD_ROOT%{_javadir}/maven-shared/runtime.jar
+%add_maven_depmap -f runtime JPP.%{name}-runtime.pom %{name}/runtime.jar
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -547,99 +550,114 @@ cp -pr target/site/apidocs/* \
 [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
 rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
-%dir %{_javadir}/maven-shared
-%dir %{_mavenpomdir}
-%{_mavenpomdir}/JPP.maven-shared-components-parent.pom
-%{_mavendepmapfragdir}
+%dir %{_javadir}/%{name}
+%{_mavenpomdir}/JPP.%{name}-components-parent.pom
+%{_mavendepmapfragdir}/%{name}
 
 %files file-management
-%{_javadir}/maven-shared/file-management*.jar
-%{_mavenpomdir}/JPP.maven-shared-file-management.pom
+%{_javadir}/%{name}/file-management.jar
+%{_mavenpomdir}/JPP.%{name}-file-management.pom
+%{_mavendepmapfragdir}/%{name}-file-management
 
 %files osgi
-%{_javadir}/maven-shared/osgi*.jar
-%{_mavenpomdir}/JPP.maven-shared-osgi.pom
+%{_javadir}/%{name}/osgi.jar
+%{_mavenpomdir}/JPP.%{name}-osgi.pom
+%{_mavendepmapfragdir}/%{name}-osgi
 
 %files ant
-%{_javadir}/maven-shared/ant*.jar
-%{_mavenpomdir}/JPP.maven-shared-ant.pom
+%{_javadir}/%{name}/ant.jar
+%{_mavenpomdir}/JPP.%{name}-ant.pom
+%{_mavendepmapfragdir}/%{name}-ant
 
 %files common-artifact-filters
-%{_javadir}/maven-shared/common-artifact-filters*.jar
-%{_mavenpomdir}/JPP.maven-shared-common-artifact-filters.pom
+%{_javadir}/%{name}/common-artifact-filters.jar
+%{_mavenpomdir}/JPP.%{name}-common-artifact-filters.pom
+%{_mavendepmapfragdir}/%{name}-common-artifact-filters
 
 %files dependency-analyzer
-%{_javadir}/maven-shared/dependency-analyzer*.jar
-%{_mavenpomdir}/JPP.maven-shared-dependency-analyzer.pom
+%{_javadir}/%{name}/dependency-analyzer.jar
+%{_mavenpomdir}/JPP.%{name}-dependency-analyzer.pom
+%{_mavendepmapfragdir}/%{name}-dependency-analyzer
 
 %files dependency-tree
-%{_javadir}/maven-shared/dependency-tree*.jar
-%{_mavenpomdir}/JPP.maven-shared-dependency-tree.pom
+%{_javadir}/%{name}/dependency-tree.jar
+%{_mavenpomdir}/JPP.%{name}-dependency-tree.pom
+%{_mavendepmapfragdir}/%{name}-dependency-tree
 
 %files downloader
-%{_javadir}/maven-shared/downloader*.jar
-%{_mavenpomdir}/JPP.maven-shared-downloader.pom
+%{_javadir}/%{name}/downloader.jar
+%{_mavenpomdir}/JPP.%{name}-downloader.pom
+%{_mavendepmapfragdir}/%{name}-downloader
 
 %files invoker
-%{_javadir}/maven-shared/invoker*.jar
-%{_mavenpomdir}/JPP.maven-shared-invoker.pom
+%{_javadir}/%{name}/invoker.jar
+%{_mavenpomdir}/JPP.%{name}-invoker.pom
+%{_mavendepmapfragdir}/%{name}-invoker
 
 %files model-converter
-%{_javadir}/maven-shared/model-converter*.jar
-%{_mavenpomdir}/JPP.maven-shared-model-converter.pom
-
+%{_javadir}/%{name}/model-converter.jar
+%{_mavenpomdir}/JPP.%{name}-model-converter.pom
+%{_mavendepmapfragdir}/%{name}-model-converter
 
 %files reporting-impl
-%{_javadir}/maven-shared/reporting-impl*.jar
-%{_mavenpomdir}/JPP.maven-shared-reporting-impl.pom
+%{_javadir}/%{name}/reporting-impl.jar
+%{_mavenpomdir}/JPP.%{name}-reporting-impl.pom
+%{_mavendepmapfragdir}/%{name}-reporting-impl
 
 %files repository-builder
-%{_javadir}/maven-shared/repository-builder*.jar
-%{_mavenpomdir}/JPP.maven-shared-repository-builder.pom
+%{_javadir}/%{name}/repository-builder.jar
+%{_mavenpomdir}/JPP.%{name}-repository-builder.pom
+%{_mavendepmapfragdir}/%{name}-repository-builder
 
 %files io
-%{_javadir}/maven-shared/io*.jar
-%{_mavenpomdir}/JPP.maven-shared-io.pom
+%{_javadir}/%{name}/io.jar
+%{_mavenpomdir}/JPP.%{name}-io.pom
+%{_mavendepmapfragdir}/%{name}-io
 
 %files jar
-%{_javadir}/maven-shared/jar*.jar
-%{_mavenpomdir}/JPP.maven-shared-jar.pom
+%{_javadir}/%{name}/jar.jar
+%{_mavenpomdir}/JPP.%{name}-jar.pom
+%{_mavendepmapfragdir}/%{name}-jar
 
 %files monitor
-%{_javadir}/maven-shared/monitor*.jar
-%{_mavenpomdir}/JPP.maven-shared-monitor.pom
+%{_javadir}/%{name}/monitor.jar
+%{_mavenpomdir}/JPP.%{name}-monitor.pom
+%{_mavendepmapfragdir}/%{name}-monitor
 
 %files verifier
-%{_javadir}/maven-shared/verifier*.jar
-%{_mavenpomdir}/JPP.maven-shared-verifier.pom
+%{_javadir}/%{name}/verifier.jar
+%{_mavenpomdir}/JPP.%{name}-verifier.pom
+%{_mavendepmapfragdir}/%{name}-verifier
 
 %files artifact-resolver
-%{_javadir}/maven-shared/artifact-resolver*.jar
-%{_mavenpomdir}/JPP.maven-shared-artifact-resolver.pom
+%{_javadir}/%{name}/artifact-resolver.jar
+%{_mavenpomdir}/JPP.%{name}-artifact-resolver.pom
+%{_mavendepmapfragdir}/%{name}-artifact-resolver
 
 %files filtering
-%{_javadir}/maven-shared/filtering*.jar
-%{_mavenpomdir}/JPP.maven-shared-filtering.pom
+%{_javadir}/%{name}/filtering.jar
+%{_mavenpomdir}/JPP.%{name}-filtering.pom
+%{_mavendepmapfragdir}/%{name}-filtering
 
 %files reporting-api
-%{_javadir}/maven-shared/reporting-api*.jar
-%{_mavenpomdir}/JPP.maven-shared-reporting-api.pom
+%{_javadir}/%{name}/reporting-api.jar
+%{_mavenpomdir}/JPP.%{name}-reporting-api.pom
+%{_mavendepmapfragdir}/%{name}-reporting-api
 
 %files runtime
-%{_javadir}/maven-shared/runtime*.jar
-%{_mavenpomdir}/JPP.maven-shared-runtime.pom
+%{_javadir}/%{name}/runtime.jar
+%{_mavenpomdir}/JPP.%{name}-runtime.pom
+%{_mavendepmapfragdir}/%{name}-runtime
 
 %files javadoc
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Aug 22 2011 Jaromir Capik <jcapik(a)redhat.com&gt; - 15-17
+- Migration from plexus-maven-plugin to plexus-containers-component-metadata
+- Minor spec file changes according to the latest guidelines
+
 * Thu Jun 23 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; - 15-16
 - Add second groupId for reporting-api to add compatibility
 - Versionless javadocs and remove defattr macros (not needed anymore)