[MENFORCER-201]
- MavenProject, MavenSession must be injected
as parameters and not as Components.
git-svn-id: https://svn.apache.org/repos/asf/maven/enforcer/trunk@1616867 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/AbstractEnforceMojo.java b/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/AbstractEnforceMojo.java
index 83ad939..b5e4afb 100644
--- a/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/AbstractEnforceMojo.java
+++ b/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/AbstractEnforceMojo.java
@@ -22,6 +22,7 @@
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
+
import org.apache.maven.enforcer.rule.api.EnforcerRule;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
@@ -58,12 +59,12 @@
/**
* The MavenSession
*/
- @Component
+ @Parameter( defaultValue = "${session}", readonly = true, required = true )
protected MavenSession session;
/**
* POM
*/
- @Component
+ @Parameter( defaultValue = "${project}", readonly = true, required = true )
protected MavenProject project;
/**
* Flag to easily skip all checks
diff --git a/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java b/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java
index 478ee75..25dac5c 100644
--- a/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java
+++ b/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java
@@ -26,6 +26,7 @@
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;
import org.apache.maven.project.path.PathTranslator;
import org.codehaus.plexus.PlexusConstants;
@@ -56,13 +57,13 @@
/**
* The MavenSession
*/
- @Component
+ @Parameter( defaultValue = "${session}", readonly = true, required = true )
protected MavenSession session;
/**
* POM
*/
- @Component
+ @Parameter( defaultValue = "${project}", readonly = true, required = true )
protected MavenProject project;
// set by the contextualize method. Only way to get the
