Author: khmarbaise Date: Wed Aug 13 15:51:09 2014 New Revision: 1617742 URL: http://svn.apache.org/r1617742 Log: [MSCMPUB-16] - Injection via @Parameter instead of @Component - Reordered imports.
Modified: maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java Modified: maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java?rev=1617742&r1=1617741&r2=1617742&view=diff ============================================================================== --- maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java (original) +++ maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java Wed Aug 13 15:51:09 2014 @@ -201,7 +201,7 @@ public abstract class AbstractScmPublish /** */ - @Component + @Parameter( defaultValue = "${settings}", readonly = true, required = true ) protected Settings settings; @Component Modified: maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java?rev=1617742&r1=1617741&r2=1617742&view=diff ============================================================================== --- maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java (original) +++ maven/plugins/trunk/maven-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishScmMojo.java Wed Aug 13 15:51:09 2014 @@ -19,18 +19,6 @@ package org.apache.maven.plugins.scmpubl * under the License. */ -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.apache.commons.io.filefilter.NameFileFilter; -import org.apache.commons.io.filefilter.NotFileFilter; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; -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.codehaus.plexus.util.MatchPatterns; - import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -47,6 +35,17 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.io.filefilter.NameFileFilter; +import org.apache.commons.io.filefilter.NotFileFilter; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.project.MavenProject; +import org.codehaus.plexus.util.MatchPatterns; + /** * Publish a content to scm. By default, content is taken from default site staging directory * <code>${project.build.directory}/staging</code>. @@ -64,7 +63,7 @@ public class ScmPublishPublishScmMojo /** */ - @Component + @Parameter( defaultValue = "${project}", readonly = true, required = true ) protected MavenProject project; private List<File> deleted = new ArrayList<File>();