Replaced the @Component annotations on the MavenProject, MavenSession and Settings fields with the equivalent @Parameter syntax
git-svn-id: https://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk@1854804 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
index 55938c9..43ea809 100644
--- a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
+++ b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
@@ -75,7 +75,7 @@
/**
* The current build session instance. This is used for plugin manager API calls.
*/
- @Component
+ @Parameter( defaultValue = "${session}", readonly = true )
private MavenSession session;
/**
diff --git a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java
index ed4ff24..1c6bd38 100644
--- a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java
+++ b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java
@@ -33,7 +33,7 @@
public abstract class AbstractTomcat7Mojo
extends AbstractMojo
{
- @Component
+ @Parameter( defaultValue = "${settings}", readonly = true )
protected Settings settings;
@Component
diff --git a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
index 23620a4..fff9cb5 100644
--- a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
+++ b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
@@ -275,7 +275,7 @@
*
* @since 1.0
*/
- @Component
+ @Parameter( defaultValue = "${project}", readonly = true )
protected MavenProject project;
/**
diff --git a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java
index 74126fb..1d0b399 100644
--- a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java
+++ b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java
@@ -33,7 +33,7 @@
public abstract class AbstractTomcat8Mojo
extends AbstractMojo
{
- @Component
+ @Parameter( defaultValue = "${settings}", readonly = true )
protected Settings settings;
@Component
diff --git a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
index 9059483..225b3f7 100644
--- a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
+++ b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
@@ -277,7 +277,7 @@
*
* @since 1.0
*/
- @Component
+ @Parameter( defaultValue = "${project}", readonly = true )
protected MavenProject project;
/**
