stephenc
/
maven-plugin-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avoid @Component for Maven objects: replaced with normal @Parameters 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1599157 13f79535-47bb-0310-9956-ffa450edef68
master
Herve Boutemy 2014-06-02 10:18:47 +00:00
parent f0a8bb4b3a
commit a2602cf139
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
maven-plugin-plugin/pom.xml
View File

@ -45,7 +45,7 @@
<doxiaVersion>1.2</doxiaVersion> <doxiaVersion>1.2</doxiaVersion>
<doxia-sitetoolsVersion>1.2</doxia-sitetoolsVersion> <doxia-sitetoolsVersion>1.2</doxia-sitetoolsVersion>
<it.debug>true</it.debug> <it.debug>true</it.debug>
<mavenPluginPluginVersion>3.1</mavenPluginPluginVersion> <mavenPluginPluginVersion>3.3</mavenPluginPluginVersion>
</properties> </properties>
<dependencies> <dependencies>
@ -234,21 +234,20 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId> <artifactId>maven-plugin-plugin</artifactId>
<configuration> <version>${mavenPluginPluginVersion}</version>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
<executions> <executions>
<execution> <execution>
<id>mojo-descriptor</id> <id>default-descriptor</id>
<goals> <phase>process-classes</phase>
<goal>descriptor</goal>
</goals>
</execution> </execution>
<execution> <execution>
<id>generated-helpmojo</id> <id>generated-helpmojo</id>
<goals> <goals>
<goal>helpmojo</goal> <goal>helpmojo</goal>
</goals> </goals>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@ -260,7 +259,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId> <artifactId>maven-plugin-plugin</artifactId>
<version>3.2</version> <version>${mavenPluginPluginVersion}</version>
<reportSets> <reportSets>
<reportSet> <reportSet>
<reports> <reports>

2
maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
View File

@ -54,7 +54,7 @@ public abstract class AbstractGeneratorMojo
/** /**
* The project currently being built. * The project currently being built.
*/ */
@Component @Parameter( defaultValue = "${project}", readonly = true )
protected MavenProject project; protected MavenProject project;
/** /**

2
maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
View File

@ -85,7 +85,7 @@ public class PluginReport
/** /**
* The Maven Project. * The Maven Project.
*/ */
@Component @Parameter( defaultValue = "${project}", readonly = true )
private MavenProject project; private MavenProject project;
/** /**

3
maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
View File

@ -26,7 +26,6 @@ import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.descriptor.PluginDescriptor; 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.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.Parameter;
@ -54,7 +53,7 @@ public class AddPluginArtifactMetadataMojo
/** /**
* The project artifact, which should have the <code>latest</code> metadata added to it. * The project artifact, which should have the <code>latest</code> metadata added to it.
*/ */
@Component @Parameter( defaultValue = "${project}", readonly = true )
private MavenProject project; private MavenProject project;
/** /**