diff -Naur maven-assembly-plugin-2.2.1.orig/pom.xml maven-assembly-plugin-2.2.1/pom.xml
--- maven-assembly-plugin-2.2.1.orig/pom.xml	2011-02-24 21:03:42.000000000 +0100
+++ maven-assembly-plugin-2.2.1/pom.xml	2011-06-22 18:13:32.000000000 +0200
@@ -212,23 +212,23 @@
     <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>
             <configuration>
-              <outputDirectory>${project.build.directory}/generated-resources/plexus</outputDirectory>
+              <generatedMetadata>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</generatedMetadata>
             </configuration>
           </execution>
           <execution>
             <id>merge-metadata</id>
             <phase>process-resources</phase>
             <goals>
-              <goal>merge-descriptors</goal>
+              <goal>merge-metadata</goal>
             </goals>
             <configuration>
               <!-- <output>${project.build.outputDirectory}/META-INF/plexus/components.xml</output> -->