From b693f804e30072ea5d2e0edb9f0b69e503749c44 Mon Sep 17 00:00:00 2001
From: Jaromir Capik <jcapik@redhat.com>
Date: Nov 15 2011 15:21:21 +0000
Subject: migration to plexus-containers-component-metadata


---

diff --git a/007_maven-scm_migration-to-component-metadata.patch b/007_maven-scm_migration-to-component-metadata.patch
new file mode 100644
index 0000000..a39150f
--- /dev/null
+++ b/007_maven-scm_migration-to-component-metadata.patch
@@ -0,0 +1,324 @@
+diff -Naur maven-scm-1.5.orig/maven-scm-client/pom.xml maven-scm-1.5/maven-scm-client/pom.xml
+--- maven-scm-1.5.orig/maven-scm-client/pom.xml	2011-03-28 22:40:54.000000000 +0200
++++ maven-scm-1.5/maven-scm-client/pom.xml	2011-11-15 15:43:14.201177167 +0100
+@@ -103,7 +103,7 @@
+     <plugins>
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+-        <artifactId>plexus-maven-plugin</artifactId>
++        <artifactId>plexus-component-metadata</artifactId>
+         <executions>
+           <execution>
+             <id>merge</id>
+@@ -114,7 +114,7 @@
+             </configuration>
+             <phase>generate-resources</phase>
+             <goals>
+-              <goal>merge-descriptors</goal>
++              <goal>merge-metadata</goal>
+             </goals>
+           </execution>
+         </executions>
+diff -Naur maven-scm-1.5.orig/maven-scm-managers/maven-scm-manager-plexus/pom.xml maven-scm-1.5/maven-scm-managers/maven-scm-manager-plexus/pom.xml
+--- maven-scm-1.5.orig/maven-scm-managers/maven-scm-manager-plexus/pom.xml	2011-03-28 22:40:36.000000000 +0200
++++ maven-scm-1.5/maven-scm-managers/maven-scm-manager-plexus/pom.xml	2011-11-15 15:47:10.186164414 +0100
+@@ -48,13 +48,13 @@
+     <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>
+           </execution>        
+         </executions>
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-accurev/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-accurev/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-accurev/pom.xml	2011-11-15 15:13:08.000000000 +0100
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-accurev/pom.xml	2011-11-15 15:44:34.857169286 +0100
+@@ -54,13 +54,13 @@
+     <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>
+           </execution>        
+         </executions>        
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-bazaar/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-bazaar/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-bazaar/pom.xml	2011-03-28 22:40:52.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-bazaar/pom.xml	2011-11-15 15:46:26.137170177 +0100
+@@ -44,13 +44,13 @@
+     <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>
+           </execution>        
+         </executions>        
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-clearcase/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-clearcase/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-clearcase/pom.xml	2011-03-28 22:40:46.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-clearcase/pom.xml	2011-11-15 15:46:12.985169695 +0100
+@@ -44,13 +44,13 @@
+     <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>
+           </execution>        
+         </executions>        
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-hg/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-hg/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-hg/pom.xml	2011-03-28 22:40:52.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-hg/pom.xml	2011-11-15 15:46:55.321166386 +0100
+@@ -59,13 +59,13 @@
+     <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>
+           </execution>        
+         </executions>        
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-local/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-local/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-local/pom.xml	2011-03-28 22:40:50.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-local/pom.xml	2011-11-15 15:44:55.670171684 +0100
+@@ -37,13 +37,13 @@
+     <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>
+           </execution>        
+         </executions>        
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-perforce/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-perforce/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-perforce/pom.xml	2011-03-28 22:40:38.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-perforce/pom.xml	2011-11-15 15:45:58.216174509 +0100
+@@ -44,13 +44,13 @@
+     <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>
+           </execution>        
+         </executions>        
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml	2011-03-28 22:40:44.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe/pom.xml	2011-11-15 15:48:06.029164052 +0100
+@@ -51,13 +51,13 @@
+     <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>
+           </execution>        
+         </executions>        
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml	2011-03-28 22:40:46.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/pom.xml	2011-11-15 15:47:53.069170354 +0100
+@@ -62,13 +62,13 @@
+     <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>
+           </execution>        
+         </executions>        
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml	2011-03-28 22:40:40.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml	2011-11-15 15:47:38.668164651 +0100
+@@ -55,13 +55,13 @@
+     <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>
+           </execution>        
+         </executions>        
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml	2011-03-28 22:40:50.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml	2011-11-15 15:47:23.660165096 +0100
+@@ -55,13 +55,13 @@
+     <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>
+           </execution>        
+         </executions>        
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-starteam/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-starteam/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-starteam/pom.xml	2011-03-28 22:40:46.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-starteam/pom.xml	2011-11-15 15:45:27.658178294 +0100
+@@ -37,13 +37,13 @@
+     <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>
+           </execution>        
+         </executions>        
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-synergy/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-synergy/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-synergy/pom.xml	2011-03-28 22:40:54.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-synergy/pom.xml	2011-11-15 15:45:43.945169938 +0100
+@@ -37,13 +37,13 @@
+     <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>
+           </execution>        
+         </executions>        
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-tfs/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-tfs/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-tfs/pom.xml	2011-03-28 22:40:52.000000000 +0200
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-tfs/pom.xml	2011-11-15 15:45:12.151173627 +0100
+@@ -72,13 +72,13 @@
+     <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>
+           </execution>        
+         </executions>        
+diff -Naur maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-vss/pom.xml maven-scm-1.5/maven-scm-providers/maven-scm-provider-vss/pom.xml
+--- maven-scm-1.5.orig/maven-scm-providers/maven-scm-provider-vss/pom.xml	2011-11-15 15:13:08.000000000 +0100
++++ maven-scm-1.5/maven-scm-providers/maven-scm-provider-vss/pom.xml	2011-11-15 15:46:42.123173058 +0100
+@@ -37,13 +37,13 @@
+     <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>
+           </execution>        
+         </executions>        
+diff -Naur maven-scm-1.5.orig/src/site/apt/guide/new_provider.apt maven-scm-1.5/src/site/apt/guide/new_provider.apt
+--- maven-scm-1.5.orig/src/site/apt/guide/new_provider.apt	2011-03-28 22:40:54.000000000 +0200
++++ maven-scm-1.5/src/site/apt/guide/new_provider.apt	2011-11-15 15:48:41.388159931 +0100
+@@ -84,12 +84,11 @@
+     <plugins>
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+-        <artifactId>plexus-maven-plugin</artifactId>
+-        <version>1.3.8</version>
++        <artifactId>plexus-component-metadata</artifactId>
+         <executions>
+           <execution>
+             <goals>
+-              <goal>descriptor</goal>
++              <goal>generate-metadata</goal>
+             </goals>
+           </execution>
+         </executions>
diff --git a/maven-scm.spec b/maven-scm.spec
index 2b8fa4b..8563930 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -30,8 +30,7 @@
 
 Name:           maven-scm
 Version:        1.5
-Release:        1%{?dist}
-Epoch:          0
+Release:        2%{?dist}
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -47,7 +46,7 @@ Patch1:         004_maven-scm_fix-svn-provider-java.patch
 # fix modello configuration in vss provider pom and the cast as above
 Patch2:         005_maven-scm_fix-vss-provider-pom.patch
 Patch3:         006_maven-scm_fix-vss-provider-java.patch
-
+Patch4:         007_maven-scm_migration-to-component-metadata.patch
 
 BuildArch:      noarch
 
@@ -74,7 +73,7 @@ BuildRequires:  maven-doxia-sitetools
 BuildRequires:  plexus-interpolation
 BuildRequires:  bzr
 BuildRequires:  subversion
-BuildRequires:  plexus-maven-plugin
+BuildRequires:  plexus-containers-component-metadata
 BuildRequires:  plexus-classworlds
 
 Requires:       junit >= 3.8.2
@@ -115,11 +114,14 @@ Javadoc for %{name}.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # We dont have mockito, needed for accurev tests, disable for now
 find maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev -type f -name "*Test*" -exec rm -f '{}' \;
 
 %build
+
+#        -Dmaven.test.skip=true \
 mvn-rpmbuild \
         -Dmaven.test.failure.ignore=true \
         -Dmaven.local.depmap.file=%{SOURCE1} \
@@ -157,14 +159,7 @@ cp -p pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-scm-scm.pom
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
-%defattr(-,root,root,-)
 %dir %{_javadir}/%{name}
 %{_javadir}/%{name}/api*
 %{_javadir}/%{name}/client*
@@ -175,16 +170,17 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_mavendepmapfragdir}/*
 
 %files test
-%defattr(-,root,root,-)
 %{_javadir}/%{name}/provider-cvstest*
 %{_javadir}/%{name}/provider-svntest*
 %{_javadir}/%{name}/test*
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/*
 
 %changelog
+* Tue Nov 15 2011 Jaromir Capik <jcapik@redhat.com> 1.5-2
+- Migration from plexus-maven-plugin to plexus-containers-component-metadata
+
 * Tue Apr 5 2011 Alexander Kurtakov <akurtako@redhat.com> 0:1.5-1
 - Update to upstream 1.5 release.
 - Build with maven 3.