svn commit: r1620202 - in /maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help: DescribeMojo.java EffectivePomMojo.java EvaluateMojo.java

[hboutemy]

Author: hboutemy
Date: Sun Aug 24 21:56:37 2014
New Revision: 1620202

URL: http://svn.apache.org/r1620202
Log:
Injection via @Parameter instead of @Component

Modified:
    
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
    
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
    
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java

Modified: 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java?rev=1620202&r1=1620201&r2=1620202&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
 Sun Aug 24 21:56:37 2014
@@ -133,14 +133,14 @@ public class DescribeMojo
      * parameter is empty at execution time, this Mojo will instead use the
      * super-project.
      */
-    @Component
+    @org.apache.maven.plugins.annotations.Parameter( defaultValue = 
"${project}", readonly = true, required = true )
     private MavenProject project;
 
     /**
      * The current build session instance. This is used for
      * plugin manager API calls.
      */
-    @Component
+    @org.apache.maven.plugins.annotations.Parameter( defaultValue = 
"${session}", readonly = true, required = true )
     private MavenSession session;
 
     /**

Modified: 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java?rev=1620202&r1=1620201&r2=1620202&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
 Sun Aug 24 21:56:37 2014
@@ -22,7 +22,6 @@ package org.apache.maven.plugins.help;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
@@ -61,7 +60,7 @@ public class EffectivePomMojo
      *
      * @since 2.0.2
      */
-    @Component
+    @Parameter( defaultValue = "${project}", readonly = true, required = true )
     private MavenProject project;
 
     /**

Modified: 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java?rev=1620202&r1=1620201&r2=1620202&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
 Sun Aug 24 21:56:37 2014
@@ -144,7 +144,7 @@ public class EvaluateMojo
     /**
      * The current Maven project or the super pom.
      */
-    @Component
+    @Parameter( defaultValue = "${project}", readonly = true, required = true )
     protected MavenProject project;
 
     /**
@@ -156,13 +156,13 @@ public class EvaluateMojo
     /**
      * The system settings for Maven.
      */
-    @Component
+    @Parameter( defaultValue = "${settings}", readonly = true, required = true 
)
     protected Settings settings;
 
     /**
      * The current Maven session.
      */
-    @Component
+    @Parameter( defaultValue = "${session}", readonly = true, required = true )
     private MavenSession session;
 
     // ----------------------------------------------------------------------