You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/06/02 12:18:48 UTC
svn commit: r1599157 - in /maven/plugin-tools/trunk/maven-plugin-plugin: ./
src/main/java/org/apache/maven/plugin/plugin/
src/main/java/org/apache/maven/plugin/plugin/metadata/
Author: hboutemy
Date: Mon Jun 2 10:18:47 2014
New Revision: 1599157
URL: http://svn.apache.org/r1599157
Log:
avoid @Component for Maven objects: replaced with normal @Parameters
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=1599157&r1=1599156&r2=1599157&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Mon Jun 2 10:18:47 2014
@@ -45,7 +45,7 @@
<doxiaVersion>1.2</doxiaVersion>
<doxia-sitetoolsVersion>1.2</doxia-sitetoolsVersion>
<it.debug>true</it.debug>
- <mavenPluginPluginVersion>3.1</mavenPluginPluginVersion>
+ <mavenPluginPluginVersion>3.3</mavenPluginPluginVersion>
</properties>
<dependencies>
@@ -234,21 +234,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <configuration>
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
+ <version>${mavenPluginPluginVersion}</version>
<executions>
<execution>
- <id>mojo-descriptor</id>
- <goals>
- <goal>descriptor</goal>
- </goals>
+ <id>default-descriptor</id>
+ <phase>process-classes</phase>
</execution>
<execution>
<id>generated-helpmojo</id>
<goals>
<goal>helpmojo</goal>
</goals>
+ <configuration>
+ <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -260,7 +259,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.2</version>
+ <version>${mavenPluginPluginVersion}</version>
<reportSets>
<reportSet>
<reports>
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java?rev=1599157&r1=1599156&r2=1599157&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java Mon Jun 2 10:18:47 2014
@@ -54,7 +54,7 @@ public abstract class AbstractGeneratorM
/**
* The project currently being built.
*/
- @Component
+ @Parameter( defaultValue = "${project}", readonly = true )
protected MavenProject project;
/**
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java?rev=1599157&r1=1599156&r2=1599157&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java Mon Jun 2 10:18:47 2014
@@ -85,7 +85,7 @@ public class PluginReport
/**
* The Maven Project.
*/
- @Component
+ @Parameter( defaultValue = "${project}", readonly = true )
private MavenProject project;
/**
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java?rev=1599157&r1=1599156&r2=1599157&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java Mon Jun 2 10:18:47 2014
@@ -26,7 +26,6 @@ import org.apache.maven.artifact.reposit
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -54,7 +53,7 @@ public class AddPluginArtifactMetadataMo
/**
* The project artifact, which should have the <code>latest</code> metadata added to it.
*/
- @Component
+ @Parameter( defaultValue = "${project}", readonly = true )
private MavenProject project;
/**