Replace old @component with @Inject

apache · Mar 12, 2023 · 6af220b · 6af220b
1 parent b54efd4
commit 6af220b
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 97 deletions.
diff --git a/...manager/src/main/java/org/apache/maven/shared/release/phase/AbstractMapVersionsPhase.java b/...manager/src/main/java/org/apache/maven/shared/release/phase/AbstractMapVersionsPhase.java
@@ -38,8 +38,6 @@
 import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
 import org.apache.maven.shared.release.util.ReleaseUtil;
 import org.apache.maven.shared.release.versions.VersionParseException;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.components.interactivity.Prompter;
 import org.codehaus.plexus.components.interactivity.PrompterException;
 import org.codehaus.plexus.util.StringUtils;
@@ -75,15 +73,13 @@
  * @author <a href="mailto:[email protected]">Brett Porter</a>
  * @author Robert Scholte
  */
-@Component( role = ReleasePhase.class, hint = "map-release-versions" )
 public abstract class AbstractMapVersionsPhase
         extends AbstractReleasePhase
 {
     /**
      * Tool that gets a configured SCM repository from release configuration.
      */
-    @Requirement
-    private ScmRepositoryConfigurator scmRepositoryConfigurator;
+    private final ScmRepositoryConfigurator scmRepositoryConfigurator;
 
     /**
      * Component used to prompt for input.
@@ -105,9 +101,11 @@ public abstract class AbstractMapVersionsPhase
      */
     private final boolean convertToBranch;
 
-    public AbstractMapVersionsPhase( Prompter prompter, Map<String, VersionPolicy> versionPolicies,
+    public AbstractMapVersionsPhase( ScmRepositoryConfigurator scmRepositoryConfigurator,
+                                     Prompter prompter, Map<String, VersionPolicy> versionPolicies,
                                      boolean convertToSnapshot, boolean convertToBranch )
     {
+        this.scmRepositoryConfigurator = requireNonNull( scmRepositoryConfigurator );
         this.prompter = requireNonNull( prompter );
         this.versionPolicies = requireNonNull( versionPolicies );
         this.convertToSnapshot = convertToSnapshot;

diff --git a/...e-manager/src/main/java/org/apache/maven/shared/release/phase/MapBranchVersionsPhase.java b/...e-manager/src/main/java/org/apache/maven/shared/release/phase/MapBranchVersionsPhase.java
@@ -26,6 +26,7 @@
 import java.util.Map;
 
 import org.apache.maven.shared.release.policy.version.VersionPolicy;
+import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
 import org.codehaus.plexus.components.interactivity.Prompter;
 
 /**
@@ -61,8 +62,9 @@ public class MapBranchVersionsPhase
         extends AbstractMapVersionsPhase
 {
     @Inject
-    public MapBranchVersionsPhase( Prompter prompter, Map<String, VersionPolicy> versionPolicies )
+    public MapBranchVersionsPhase( ScmRepositoryConfigurator scmRepositoryConfigurator,
+                                   Prompter prompter, Map<String, VersionPolicy> versionPolicies )
     {
-        super( prompter, versionPolicies, true, true );
+        super( scmRepositoryConfigurator, prompter, versionPolicies, true, true );
     }
 }
diff --git a/...ager/src/main/java/org/apache/maven/shared/release/phase/MapDevelopmentVersionsPhase.java b/...ager/src/main/java/org/apache/maven/shared/release/phase/MapDevelopmentVersionsPhase.java
@@ -26,6 +26,7 @@
 import java.util.Map;
 
 import org.apache.maven.shared.release.policy.version.VersionPolicy;
+import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
 import org.codehaus.plexus.components.interactivity.Prompter;
 
 /**
@@ -61,8 +62,9 @@ public class MapDevelopmentVersionsPhase
         extends AbstractMapVersionsPhase
 {
     @Inject
-    public MapDevelopmentVersionsPhase( Prompter prompter, Map<String, VersionPolicy> versionPolicies )
+    public MapDevelopmentVersionsPhase( ScmRepositoryConfigurator scmRepositoryConfigurator,
+                                        Prompter prompter, Map<String, VersionPolicy> versionPolicies )
     {
-        super( prompter, versionPolicies, true, false );
+        super( scmRepositoryConfigurator, prompter, versionPolicies, true, false );
     }
 }
diff --git a/...-manager/src/main/java/org/apache/maven/shared/release/phase/MapReleaseVersionsPhase.java b/...-manager/src/main/java/org/apache/maven/shared/release/phase/MapReleaseVersionsPhase.java
@@ -26,6 +26,7 @@
 import java.util.Map;
 
 import org.apache.maven.shared.release.policy.version.VersionPolicy;
+import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
 import org.codehaus.plexus.components.interactivity.Prompter;
 
 /**
@@ -61,8 +62,9 @@ public class MapReleaseVersionsPhase
         extends AbstractMapVersionsPhase
 {
     @Inject
-    public MapReleaseVersionsPhase( Prompter prompter, Map<String, VersionPolicy> versionPolicies )
+    public MapReleaseVersionsPhase( ScmRepositoryConfigurator scmRepositoryConfigurator,
+                                    Prompter prompter, Map<String, VersionPolicy> versionPolicies )
     {
-        super( prompter, versionPolicies, false, false );
+        super( scmRepositoryConfigurator, prompter, versionPolicies, false, false );
     }
 }