You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2014/08/10 17:25:25 UTC
svn commit: r1617125 - in
/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc:
AbstractFixJavadocMojo.java AbstractJavadocMojo.java
Author: khmarbaise
Date: Sun Aug 10 15:25:24 2014
New Revision: 1617125
URL: http://svn.apache.org/r1617125
Log:
[MJAVADOC-403]
- Injection via @Parameter instead of @Component
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java?rev=1617125&r1=1617124&r2=1617125&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractFixJavadocMojo.java Sun Aug 10 15:25:24 2014
@@ -350,13 +350,13 @@ public abstract class AbstractFixJavadoc
/**
* The Maven Project Object.
*/
- @Component
+ @Parameter( defaultValue = "${project}", readonly = true, required = true )
private MavenProject project;
/**
* The current user system settings for use in Maven.
*/
- @Component
+ @Parameter( defaultValue = "${settings}", readonly = true, required = true )
private Settings settings;
// ----------------------------------------------------------------------
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1617125&r1=1617124&r2=1617125&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Sun Aug 10 15:25:24 2014
@@ -320,7 +320,7 @@ public abstract class AbstractJavadocMoj
* The current build session instance. This is used for
* toolchain manager API calls.
*/
- @Component
+ @Parameter( defaultValue = "${session}", readonly = true, required = true )
protected MavenSession session;
/**
@@ -328,13 +328,13 @@ public abstract class AbstractJavadocMoj
*
* @since 2.3
*/
- @Component
+ @Parameter( defaultValue = "${settings}", readonly = true, required = true )
private Settings settings;
/**
* The Maven Project Object
*/
- @Component
+ @Parameter( defaultValue = "${project}", readonly = true, required = true )
protected MavenProject project;
/**