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/08 23:26:00 UTC
svn commit: r1616885 - in
/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant:
AntCleanMojo.java AntMojo.java
Author: khmarbaise
Date: Fri Aug 8 21:25:59 2014
New Revision: 1616885
URL: http://svn.apache.org/r1616885
Log:
[MANT-76]
- Injections of MavenProject/MavenSession as parameter
instead of component.
Modified:
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntCleanMojo.java
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java
Modified: maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntCleanMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntCleanMojo.java?rev=1616885&r1=1616884&r2=1616885&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntCleanMojo.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntCleanMojo.java Fri Aug 8 21:25:59 2014
@@ -19,15 +19,14 @@ package org.apache.maven.plugin.ant;
* under the License.
*/
+import java.io.File;
+
import org.apache.maven.plugin.AbstractMojo;
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 java.io.File;
-
/**
* Clean all Ant build files.
*
@@ -49,7 +48,7 @@ public class AntCleanMojo
/**
* The working project.
*/
- @Component
+ @Parameter( defaultValue = "${project}", readonly = true, required = true )
private MavenProject project;
/**
Modified: maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java?rev=1616885&r1=1616884&r2=1616885&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java Fri Aug 8 21:25:59 2014
@@ -19,6 +19,10 @@ package org.apache.maven.plugin.ant;
* under the License.
*/
+import java.io.IOException;
+import java.util.List;
+import java.util.Properties;
+
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolver;
@@ -32,10 +36,6 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
-import java.io.IOException;
-import java.util.List;
-import java.util.Properties;
-
/**
* Generate Ant build files.
*
@@ -70,7 +70,7 @@ public class AntMojo
/**
* The project to create a build for.
*/
- @Component
+ @Parameter( defaultValue = "${project}", readonly = true, required = true )
private MavenProject project;
/**
@@ -100,7 +100,7 @@ public class AntMojo
/**
* The current Maven session.
*/
- @Component
+ @Parameter( defaultValue = "${session}", readonly = true, required = true )
private MavenSession session;
/**