Merge pull request #46 from egineering-llc/hotfix/1.5.1

Hotfix/1.5.1

Author: bvarner

pom.xml

@@ -9,7 +9,7 @@
     <groupId>com.e-gineering</groupId>
     <artifactId>gitflow-helper-maven-plugin</artifactId>
 
-    <version>1.5.0</version>
+    <version>1.5.1</version>
     <packaging>maven-plugin</packaging>
 
     <name>gitflow-helper-maven-plugin</name>
@@ -104,6 +104,11 @@
             <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.aether</groupId>
+            <artifactId>aether-util</artifactId>
+            <version>0.9.0.M2</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

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

@@ -17,6 +17,7 @@
 import org.eclipse.aether.resolution.ArtifactRequest;
 import org.eclipse.aether.resolution.ArtifactResolutionException;
 import org.eclipse.aether.resolution.ArtifactResult;
+import org.eclipse.aether.util.repository.AuthenticationBuilder;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -86,6 +87,10 @@ protected ArtifactRepository getDeploymentRepository(final String altRepository)
                     "Invalid syntax for repository. Use \"id::layout::url::unique\".");
         }
 
+        if (getLog().isDebugEnabled()) {
+            getLog().debug("Getting maven deployment repository (to target artifacts) for: " + altRepository);
+        }
+
         String id = matcher.group(1).trim();
         String layout = matcher.group(2).trim();
         String url = matcher.group(3).trim();
@@ -105,20 +110,30 @@ protected ArtifactRepository getDeploymentRepository(final String altRepository)
      * @throws MojoFailureException
      */
     private RemoteRepository getRepository(final String altRepository) throws MojoExecutionException, MojoFailureException {
-        Matcher matcher = ALT_REPO_SYNTAX_PATTERN.matcher(altRepository);
-        if (!matcher.matches()) {
-            throw new MojoFailureException(altRepository, "Invalid syntax for repository.",
-                    "Invalid syntax for repository. Use \"id::layout::url::unique\".");
+        if (getLog().isDebugEnabled()) {
+            getLog().debug("Creating remote Aether repository (to resolve remote artifacts) for: " + altRepository);
         }
+        // Get an appropriate injected ArtifactRepository. (This resolves authentication in the 'normal' manner from Maven)
+        ArtifactRepository remoteArtifactRepo = getDeploymentRepository(altRepository);
 
-        String id = matcher.group(1).trim();
-        String layout = matcher.group(2).trim();
-        String url = matcher.group(3).trim();
-        boolean unique = Boolean.parseBoolean(matcher.group(4).trim());
+        if (getLog().isDebugEnabled()) {
+            getLog().debug("Resolved maven deployment repository. Transcribing to Aether Repository...");
+        }
 
-        ArtifactRepositoryLayout repoLayout = getLayout(layout);
+        RemoteRepository.Builder remoteRepoBuilder = new RemoteRepository.Builder(remoteArtifactRepo.getId(), remoteArtifactRepo.getLayout().getId(), remoteArtifactRepo.getUrl());
+
+        // Add authentication.
+        if (remoteArtifactRepo.getAuthentication() != null) {
+            if (getLog().isDebugEnabled()) {
+                getLog().debug("Maven deployment repsoitory has Authentication. Transcribing to Aether Authentication...");
+            }
+            remoteRepoBuilder.setAuthentication(new AuthenticationBuilder().addUsername(remoteArtifactRepo.getAuthentication().getUsername())
+                    .addPassword(remoteArtifactRepo.getAuthentication().getPassword())
+                    .addPrivateKey(remoteArtifactRepo.getAuthentication().getPrivateKey(), remoteArtifactRepo.getAuthentication().getPassphrase())
+                    .build());
+        }
 
-        return new RemoteRepository.Builder(id, layout, url).build();
+        return remoteRepoBuilder.build();
     }
 
     private String getCoordinates(ArtifactResult result) {