You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/05/12 23:21:01 UTC

svn commit: r1337676 - in /maven/plugin-tools/trunk/maven-plugin-tools-ant: pom.xml src/main/java/org/apache/maven/tools/plugin/extractor/ant/AntMojoDescriptorExtractor.java src/main/resources/META-INF/plexus/components.xml

Author: olamy
Date: Sat May 12 21:21:01 2012
New Revision: 1337676

URL: http://svn.apache.org/viewvc?rev=1337676&view=rev
Log:
generate components.xml rather than writing it manually ant module

Removed:
    maven/plugin-tools/trunk/maven-plugin-tools-ant/src/main/resources/META-INF/plexus/components.xml
Modified:
    maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml
    maven/plugin-tools/trunk/maven-plugin-tools-ant/src/main/java/org/apache/maven/tools/plugin/extractor/ant/AntMojoDescriptorExtractor.java

Modified: maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml?rev=1337676&r1=1337675&r2=1337676&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-ant/pom.xml Sat May 12 21:21:01 2012
@@ -61,6 +61,25 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-annotations</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-metadata</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>

Modified: maven/plugin-tools/trunk/maven-plugin-tools-ant/src/main/java/org/apache/maven/tools/plugin/extractor/ant/AntMojoDescriptorExtractor.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-ant/src/main/java/org/apache/maven/tools/plugin/extractor/ant/AntMojoDescriptorExtractor.java?rev=1337676&r1=1337675&r2=1337676&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-ant/src/main/java/org/apache/maven/tools/plugin/extractor/ant/AntMojoDescriptorExtractor.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-ant/src/main/java/org/apache/maven/tools/plugin/extractor/ant/AntMojoDescriptorExtractor.java Sat May 12 21:21:01 2012
@@ -36,6 +36,8 @@ import org.apache.maven.project.path.Pat
 import org.apache.maven.tools.plugin.PluginToolsRequest;
 import org.apache.maven.tools.plugin.extractor.AbstractScriptedMojoDescriptorExtractor;
 import org.apache.maven.tools.plugin.extractor.ExtractionException;
+import org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractor;
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.repository.ComponentRequirement;
 import org.codehaus.plexus.util.StringUtils;
 
@@ -44,8 +46,10 @@ import org.codehaus.plexus.util.StringUt
  *
  * @version $Id$
  */
+@Component( role = MojoDescriptorExtractor.class, hint = "ant")
 public class AntMojoDescriptorExtractor
     extends AbstractScriptedMojoDescriptorExtractor
+    implements MojoDescriptorExtractor
 {
     /** Default metadata file extension */
     private static final String METADATA_FILE_EXTENSION = ".mojos.xml";