guicify (#229)

Author: elharo

maven-scm-plugin/pom.xml

@@ -129,6 +129,12 @@
       <artifactId>maven-plugin-annotations</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+      <scope>provided</scope>
+    </dependency>
 
     <!-- Test -->
     <dependency>

maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java

@@ -31,7 +31,6 @@
 import org.apache.commons.lang3.StringUtils;
 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.Parameter;
 import org.apache.maven.scm.ScmBranch;
 import org.apache.maven.scm.ScmException;
@@ -138,12 +137,6 @@ public abstract class AbstractScmMojo extends AbstractMojo {
     @Parameter(property = "excludes")
     private String excludes;
 
-    @Component
-    private ScmManager manager;
-
-    @Component
-    private SettingsDecrypter settingsDecrypter;
-
     /**
      * The base directory.
      */
@@ -186,6 +179,15 @@ public abstract class AbstractScmMojo extends AbstractMojo {
     @Deprecated
     private String workItem;
 
+    private final ScmManager manager;
+
+    private final SettingsDecrypter settingsDecrypter;
+
+    protected AbstractScmMojo(ScmManager manager, SettingsDecrypter settingsDecrypter) {
+        this.manager = manager;
+        this.settingsDecrypter = settingsDecrypter;
+    }
+
     /** {@inheritDoc} */
     public void execute() throws MojoExecutionException {
         if (systemProperties != null) {

maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java

@@ -18,13 +18,17 @@
  */
 package org.apache.maven.scm.plugin;
 
+import javax.inject.Inject;
+
 import java.io.IOException;
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.command.add.AddScmResult;
+import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
 
 /**
  * Add a file set to the project.
@@ -33,6 +37,12 @@
  */
 @Mojo(name = "add", aggregator = true)
 public class AddMojo extends AbstractScmMojo {
+
+    @Inject
+    public AddMojo(ScmManager manager, SettingsDecrypter settingsDecrypter) {
+        super(manager, settingsDecrypter);
+    }
+
     /** {@inheritDoc} */
     public void execute() throws MojoExecutionException {
         super.execute();

maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java

@@ -18,6 +18,8 @@
  */
 package org.apache.maven.scm.plugin;
 
+import javax.inject.Inject;
+
 import java.io.File;
 
 import org.apache.commons.lang3.StringUtils;
@@ -26,6 +28,8 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.scm.ScmResult;
 import org.apache.maven.scm.command.checkout.CheckOutScmResult;
+import org.apache.maven.scm.manager.ScmManager;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
 import org.codehaus.plexus.util.Os;
 import org.codehaus.plexus.util.cli.CommandLineException;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
@@ -40,6 +44,7 @@
  */
 @Mojo(name = "bootstrap", requiresProject = false)
 public class BootstrapMojo extends CheckoutMojo {
+
     /**
      * The goals to run on the clean checkout of a project for the bootstrap goal.
      * If none are specified, then the default goal for the project is executed.
@@ -69,6 +74,11 @@ public class BootstrapMojo extends CheckoutMojo {
     @Parameter(property = "mavenHome", defaultValue = "${maven.home}")
     private File mavenHome;
 
+    @Inject
+    public BootstrapMojo(ScmManager manager, SettingsDecrypter settingsDecrypter) {
+        super(manager, settingsDecrypter);
+    }
+
     /** {@inheritDoc} */
     public void execute() throws MojoExecutionException {
         super.execute();

maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java

@@ -18,6 +18,8 @@
  */
 package org.apache.maven.scm.plugin;
 
+import javax.inject.Inject;
+
 import java.io.IOException;
 
 import org.apache.maven.plugin.MojoExecutionException;
@@ -26,8 +28,10 @@
 import org.apache.maven.scm.ScmBranchParameters;
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.command.branch.BranchScmResult;
+import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.provider.ScmProvider;
 import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
 
 /**
  * Branch the project.
@@ -68,6 +72,11 @@ public class BranchMojo extends AbstractScmMojo {
     @Parameter(property = "pinExternals", defaultValue = "false")
     private boolean pinExternals;
 
+    @Inject
+    public BranchMojo(ScmManager manager, SettingsDecrypter settingsDecrypter) {
+        super(manager, settingsDecrypter);
+    }
+
     /** {@inheritDoc} */
     public void execute() throws MojoExecutionException {
         super.execute();

maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java

@@ -18,6 +18,8 @@
  */
 package org.apache.maven.scm.plugin;
 
+import javax.inject.Inject;
+
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -33,8 +35,10 @@
 import org.apache.maven.scm.command.changelog.ChangeLogScmRequest;
 import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
 import org.apache.maven.scm.command.changelog.ChangeLogSet;
+import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.provider.ScmProvider;
 import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
 
 /**
  * Dump changelog contents to console. It is mainly used to test maven-scm-api's changelog command.
@@ -125,6 +129,11 @@ public class ChangeLogMojo extends AbstractScmMojo {
     @Parameter(property = "numDays")
     private Integer numDays;
 
+    @Inject
+    public ChangeLogMojo(ScmManager manager, SettingsDecrypter settingsDecrypter) {
+        super(manager, settingsDecrypter);
+    }
+
     /**
      * {@inheritDoc}
      */

maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckLocalModificationsMojo.java

@@ -18,14 +18,18 @@
  */
 package org.apache.maven.scm.plugin;
 
+import javax.inject.Inject;
+
 import java.io.IOException;
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.command.status.StatusScmResult;
+import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
 
 /**
  * This mojo will fail the build if there is any local modifications
@@ -50,6 +54,11 @@ public class CheckLocalModificationsMojo extends AbstractScmMojo {
     @Parameter(property = "scm.checkLocalModification.skip", defaultValue = "false")
     private boolean skip;
 
+    @Inject
+    public CheckLocalModificationsMojo(ScmManager manager, SettingsDecrypter settingsDecrypter) {
+        super(manager, settingsDecrypter);
+    }
+
     public void execute() throws MojoExecutionException {
         if (skip) {
             getLog().info("check-local-modification execution has been skipped");

maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckinMojo.java

@@ -18,14 +18,18 @@
  */
 package org.apache.maven.scm.plugin;
 
+import javax.inject.Inject;
+
 import java.io.IOException;
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.command.checkin.CheckInScmResult;
+import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
 
 /**
  * Commit changes to the configured scm url.
@@ -58,6 +62,11 @@ public class CheckinMojo extends AbstractScmMojo {
     @Parameter(property = "scmVersion")
     private String scmVersion;
 
+    @Inject
+    public CheckinMojo(ScmManager manager, SettingsDecrypter settingsDecrypter) {
+        super(manager, settingsDecrypter);
+    }
+
     /** {@inheritDoc} */
     public void execute() throws MojoExecutionException {
         super.execute();

maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java

@@ -18,6 +18,8 @@
  */
 package org.apache.maven.scm.plugin;
 
+import javax.inject.Inject;
+
 import java.io.File;
 import java.io.IOException;
 
@@ -27,7 +29,9 @@
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmResult;
+import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
 import org.codehaus.plexus.util.FileUtils;
 
 /**
@@ -72,6 +76,11 @@ public class CheckoutMojo extends AbstractScmMojo {
      */
     private ScmResult checkoutResult;
 
+    @Inject
+    public CheckoutMojo(ScmManager manager, SettingsDecrypter settingsDecrypter) {
+        super(manager, settingsDecrypter);
+    }
+
     /** {@inheritDoc} */
     public void execute() throws MojoExecutionException {
         super.execute();

maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java

@@ -18,6 +18,8 @@
  */
 package org.apache.maven.scm.plugin;
 
+import javax.inject.Inject;
+
 import java.io.File;
 import java.io.IOException;
 
@@ -26,7 +28,9 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.command.diff.DiffScmResult;
+import org.apache.maven.scm.manager.ScmManager;
 import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
 import org.codehaus.plexus.util.FileUtils;
 
 /**
@@ -66,6 +70,11 @@ public class DiffMojo extends AbstractScmMojo {
     @Parameter(property = "outputFile", defaultValue = "${project.artifactId}.diff")
     private File outputFile;
 
+    @Inject
+    public DiffMojo(ScmManager manager, SettingsDecrypter settingsDecrypter) {
+        super(manager, settingsDecrypter);
+    }
+
     /** {@inheritDoc} */
     public void execute() throws MojoExecutionException {
         super.execute();