diff --git a/maven-plugin-tools-annotations/pom.xml b/maven-plugin-tools-annotations/pom.xml
index 2e3f0f3..8746ef9 100644
--- a/maven-plugin-tools-annotations/pom.xml
+++ b/maven-plugin-tools-annotations/pom.xml
@@ -57,6 +57,18 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-annotations</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
@@ -108,6 +120,10 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-metadata</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
index 043ed11..395e506 100644
--- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
+++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
@@ -49,6 +49,7 @@ import org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractor;
 import org.codehaus.plexus.archiver.UnArchiver;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
 import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.StringUtils;
 
@@ -69,29 +70,22 @@ import java.util.TreeSet;
  * @author Olivier Lamy
  * @since 3.0
  */
+@Component(role = MojoDescriptorExtractor.class, hint = "java-annotations")
 public class JavaAnnotationsMojoDescriptorExtractor
     extends AbstractLogEnabled
     implements MojoDescriptorExtractor
 {
 
-    /**
-     * @requirement
-     */
+    @org.codehaus.plexus.component.annotations.Requirement
     private MojoAnnotationsScanner mojoAnnotationsScanner;
 
-    /**
-     * @requirement
-     */
+    @org.codehaus.plexus.component.annotations.Requirement
     private ArtifactResolver artifactResolver;
 
-    /**
-     * @requirement
-     */
+    @org.codehaus.plexus.component.annotations.Requirement
     private ArtifactFactory artifactFactory;
 
-    /**
-     * @requirement
-     */
+    @org.codehaus.plexus.component.annotations.Requirement
     private ArchiverManager archiverManager;
 
     public List<MojoDescriptor> execute( MavenProject project, PluginDescriptor pluginDescriptor )
diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
index 51acae8..fb1daef 100644
--- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
+++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
@@ -55,6 +55,7 @@ import java.util.zip.ZipInputStream;
  * @author Olivier Lamy
  * @since 3.0
  */
+@org.codehaus.plexus.component.annotations.Component( role = MojoAnnotationsScanner.class )
 public class DefaultMojoAnnotationsScanner
     extends AbstractLogEnabled
     implements MojoAnnotationsScanner
diff --git a/maven-plugin-tools-annotations/src/main/resources/META-INF/plexus/components.xml b/maven-plugin-tools-annotations/src/main/resources/META-INF/plexus/components.xml
index 9d6aa87..9bf4f3d 100644
--- a/maven-plugin-tools-annotations/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-plugin-tools-annotations/src/main/resources/META-INF/plexus/components.xml
@@ -26,31 +26,6 @@
      | descriptors from java classes with annotations.
      |
      -->
-    <component>
-      <role>org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractor</role>
-      <role-hint>java-annotations</role-hint>
-      <implementation>org.apache.maven.tools.plugin.annotations.JavaAnnotationsMojoDescriptorExtractor</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotationsScanner</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.archiver.manager.ArchiverManager</role>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
-      <role>org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotationsScanner</role>
-      <role-hint>default</role-hint>
-      <implementation>org.apache.maven.tools.plugin.annotations.scanner.DefaultMojoAnnotationsScanner</implementation>
-    </component>
 
   </components>
 </component-set>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f9531f2..9d891c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,6 +223,17 @@
         <artifactId>plexus-utils</artifactId>
         <version>3.0</version>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-annotations</artifactId>
+        <version>1.5.5</version>
+        <exclusions>
+          <exclusion>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-container-default</artifactId>
@@ -308,6 +319,19 @@
             <tagBase>https://svn.apache.org/repos/asf/maven/plugin-tools/tags</tagBase>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-component-metadata</artifactId>
+          <version>1.5.5</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>generate-metadata</goal>
+                <goal>generate-test-metadata</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>