Import cleanup. and odds and ends

Author: bvarner

pom.xml

@@ -81,12 +81,6 @@
             <version>3.6.0</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.maven.shared</groupId>
-            <artifactId>maven-artifact-transfer</artifactId>
-            <version>0.11.0</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.maven.scm</groupId>
             <artifactId>maven-scm-api</artifactId>

src/main/java/com/e_gineering/maven/gitflowhelper/AbstractBranchDetectingExtension.java

@@ -5,8 +5,6 @@
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.lifecycle.internal.MojoDescriptorCreator;
 import org.apache.maven.model.Plugin;
-import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException;
-import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.scm.manager.ScmManager;
 import org.codehaus.plexus.component.annotations.Requirement;
@@ -15,9 +13,6 @@
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Properties;
 
 public abstract class AbstractBranchDetectingExtension extends AbstractMavenLifecycleParticipant {

src/main/java/com/e_gineering/maven/gitflowhelper/AbstractGitflowBasedRepositoryMojo.java

@@ -2,17 +2,13 @@
 
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.InvalidRepositoryException;
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.bridge.MavenRepositorySystem;
-import org.apache.maven.model.DeploymentRepository;
 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.Parameter;
 import org.apache.maven.project.MavenProjectHelper;
 import org.apache.maven.shared.utils.StringUtils;
-import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.FileUtils;
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystem;
@@ -38,7 +34,6 @@
 import java.io.PrintWriter;
 import java.nio.file.Files;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;

src/main/java/com/e_gineering/maven/gitflowhelper/AttachDeployedArtifactsMojo.java

@@ -1,7 +1,5 @@
 package com.e_gineering.maven.gitflowhelper;
 
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.InvalidRepositoryException;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Execute;

src/main/java/com/e_gineering/maven/gitflowhelper/OtherBranchVersionExtension.java

@@ -19,7 +19,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/com/e_gineering/maven/gitflowhelper/PromoteMasterMojo.java

@@ -1,7 +1,5 @@
 package com.e_gineering.maven.gitflowhelper;
 
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.InvalidRepositoryException;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;

src/main/java/com/e_gineering/maven/gitflowhelper/RetargetDeployMojo.java

@@ -1,34 +1,16 @@
 package com.e_gineering.maven.gitflowhelper;
 
 import org.apache.maven.model.DistributionManagement;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.io.ModelReader;
-import org.apache.maven.model.io.ModelWriter;
 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.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Set the target repository for deployment based upon the GIT_BRANCH being built.
  */
 @Mojo(name = "retarget-deploy", defaultPhase = LifecyclePhase.VALIDATE)
 public class RetargetDeployMojo extends AbstractGitflowBasedRepositoryMojo {
-    
-    @Component
-    ModelWriter modelWriter;
-    
-    @Component
-    ModelReader modelReader;
-    
-    
-    
     @Override
     protected void execute(final GitBranchInfo gitBranchInfo) throws MojoExecutionException, MojoFailureException {
         // Ensure we have a 'null' distribution management for other plugins which expect it.
@@ -65,18 +47,6 @@ protected void execute(final GitBranchInfo gitBranchInfo) throws MojoExecutionEx
         }
     }
 
-    /**
-     * Given a String version (which may be a final or -SNAPSHOT version) return a
-     * version version string mangled to include a `+normalized-branch-name-SNAPSHOT format version.
-     *
-     * @param version The base version (ie, 1.0.2-SNAPSHOT)
-     * @param branchName to be normalized
-     * @return A mangled version string with the branchname and -SNAPSHOT.
-     */
-    private String getAsBranchSnapshotVersion(final String version, final String branchName) {
-        return version.replace("-SNAPSHOT", "") + otherBranchVersionDelimiter + branchName.replaceAll("[^0-9A-Za-z-.]", "-") + "-SNAPSHOT";
-    }
-
     private void setTargetSnapshots() throws MojoExecutionException, MojoFailureException {
         getLog().info("Setting snapshot artifact repository to: [" + snapshotDeploymentRepository + "]");
         project.setSnapshotArtifactRepository(getDeploymentRepository(snapshotDeploymentRepository));

src/main/java/com/e_gineering/maven/gitflowhelper/UpdateStageDependenciesMojo.java

@@ -2,7 +2,6 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.RepositoryUtils;
-import org.apache.maven.artifact.InvalidRepositoryException;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Component;
@@ -15,16 +14,13 @@
 import org.eclipse.aether.DefaultRepositoryCache;
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.graph.DependencyFilter;
-import org.eclipse.aether.graph.DependencyNode;
 import org.eclipse.aether.repository.LocalArtifactRequest;
 import org.eclipse.aether.repository.LocalArtifactResult;
 import org.eclipse.aether.repository.LocalRepositoryManager;
 import org.eclipse.aether.repository.RemoteRepository;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 

src/main/java/com/e_gineering/maven/gitflowhelper/properties/CircularDefinitionPreventer.java

@@ -19,7 +19,11 @@
  * under the License.
  */
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
 
 /**
  * Shamelessly cribbed from https://raw.githubusercontent.com/mojohaus/properties-maven-plugin/master/src/main/java/org/codehaus/mojo/properties/CircularDefinitionPreventer.java