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:13:25 UTC
svn commit: r1337657 - in /maven/plugin-tools/trunk: ./
maven-plugin-tools-annotations/
maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/
maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/a...
Author: olamy
Date: Sat May 12 21:13:24 2012
New Revision: 1337657
URL: http://svn.apache.org/viewvc?rev=1337657&view=rev
Log:
generate components.xml rather than writing it manually
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/resources/META-INF/plexus/components.xml
maven/plugin-tools/trunk/pom.xml
Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml?rev=1337657&r1=1337656&r2=1337657&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml Sat May 12 21:13:24 2012
@@ -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>
@@ -109,6 +121,10 @@
</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>
<executions>
Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java?rev=1337657&r1=1337656&r2=1337657&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java Sat May 12 21:13:24 2012
@@ -49,6 +49,7 @@ import org.apache.maven.tools.plugin.ext
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 )
Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java?rev=1337657&r1=1337656&r2=1337657&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java Sat May 12 21:13:24 2012
@@ -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
Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/resources/META-INF/plexus/components.xml?rev=1337657&r1=1337656&r2=1337657&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/resources/META-INF/plexus/components.xml Sat May 12 21:13:24 2012
@@ -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
Modified: maven/plugin-tools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/pom.xml?rev=1337657&r1=1337656&r2=1337657&view=diff
==============================================================================
--- maven/plugin-tools/trunk/pom.xml (original)
+++ maven/plugin-tools/trunk/pom.xml Sat May 12 21:13:24 2012
@@ -225,6 +225,17 @@
</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>
<version>1.0-alpha-9-stable-1</version>
</dependency>
@@ -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>