diff -Naur maven-scm-1.5.orig/maven-scm-client/pom.xml maven-scm-1.5/maven-scm-client/pom.xml
--- maven-scm-1.6.orig/pom.xml	2011-11-29 09:12:02.000000000 +1100
+++ maven-scm-1.6/pom.xml	2012-04-09 11:52:46.413000191 +1000
@@ -305,8 +305,8 @@
       <plugins>
         <plugin>
           <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-maven-plugin</artifactId>
-          <version>1.3.8</version>
+          <artifactId>plexus-component-metadata</artifactId>
+          <version>1.5.5</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
--- maven-scm-1.6.orig/maven-scm-providers/maven-scm-provider-integrity/pom.xml	2011-11-29 09:11:54.000000000 +1100
+++ maven-scm-1.6/maven-scm-providers/maven-scm-provider-integrity/pom.xml	2012-04-09 11:57:23.708000156 +1000
@@ -68,13 +68,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>
--- 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>