wip

apache · Nov 15, 2024 · 5eeaaaf · 5eeaaaf
1 parent d125404
commit 5eeaaaf
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 32 deletions.
diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/CopyMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/CopyMojo.java
@@ -97,17 +97,19 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException {
 
         List<ArtifactItem> theArtifactItems = getProcessedArtifactItems(
                 new ProcessArtifactItemsRequest(stripVersion, prependGroupId, useBaseVersion, stripClassifier));
-        getLog().info("Checking " + theArtifactItems.size() + " artifact items");
-        Map<String, Integer> copies = new HashMap<>();
-        for (ArtifactItem artifactItem : theArtifactItems) {
-            getLog().info("Found " + artifactItem.getArtifactId());
-            int numCopies = copies.getOrDefault(artifactItem.getArtifactId(), 0);
-            copies.put(artifactItem.getArtifactId(), numCopies + 1);
-        }
-        for (Map.Entry<String, Integer> entry : copies.entrySet()) {
-            getLog().info("File with the name " + entry.getKey() + "; " + entry.getValue() + " copies");
-            if (entry.getValue() > 1) {
-                getLog().warn("Multiple files with the name " + entry.getKey() + "; unpacking is incomplete.");
+        if (!prependGroupId) {
+            getLog().info("Checking " + theArtifactItems.size() + " artifact items");
+            Map<String, Integer> copies = new HashMap<>();
+            for (ArtifactItem artifactItem : theArtifactItems) {
+                getLog().info("Found " + artifactItem.getArtifactId());
+                int numCopies = copies.getOrDefault(artifactItem.getArtifactId(), 0);
+                copies.put(artifactItem.getArtifactId(), numCopies + 1);
+            }
+            for (Map.Entry<String, Integer> entry : copies.entrySet()) {
+                getLog().info("File with the name " + entry.getKey() + "; " + entry.getValue() + " copies");
+                if (entry.getValue() > 1) {
+                    getLog().warn("Multiple files with the name " + entry.getKey() + "; unpacking is incomplete.");
+                }
             }
         }
 

diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java
@@ -21,6 +21,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
@@ -108,6 +109,20 @@ protected void doExecute() throws MojoExecutionException {
         Set<Artifact> artifacts = dss.getResolvedDependencies();
 
         if (!useRepositoryLayout) {
+            getLog().info("Checking " + artifacts.size() + " artifact items");
+            Map<String, Integer> copies = new HashMap<>();
+            for (Artifact artifactItem : artifacts) {
+                getLog().info("Found " + artifactItem.getArtifactId());
+                int numCopies = copies.getOrDefault(artifactItem.getArtifactId(), 0);
+                copies.put(artifactItem.getArtifactId(), numCopies + 1);
+            }
+            for (Map.Entry<String, Integer> entry : copies.entrySet()) {
+                getLog().info("File with the name " + entry.getKey() + "; " + entry.getValue() + " copies");
+                if (entry.getValue() > 1) {
+                    getLog().warn("Multiple files with the name " + entry.getKey() + "; unpacking is incomplete.");
+                }
+            }
+
             for (Artifact artifact : artifacts) {
                 copyArtifact(
                         artifact, isStripVersion(), this.prependGroupId, this.useBaseVersion, this.stripClassifier);
@@ -126,11 +141,8 @@ protected void doExecute() throws MojoExecutionException {
 
         if (isCopyPom() && !useRepositoryLayout) {
             copyPoms(getOutputDirectory(), artifacts, this.stripVersion);
-            copyPoms(getOutputDirectory(), skippedArtifacts, this.stripVersion, this.stripClassifier); // Artifacts
-            // that already
-            // exist may
-            // not yet have
-            // poms
+            copyPoms(getOutputDirectory(), skippedArtifacts, this.stripVersion, this.stripClassifier);
+            // Artifacts that already exist may not yet have poms
         }
     }
 

diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java
@@ -690,22 +690,6 @@ public void testCopyFileWithOverideLocalRepo() throws Exception {
         assertFilesExist(list, true);
     }
 
-    public void testConflictingArtifacts() throws MojoExecutionException, MojoFailureException {
-        List<ArtifactItem> list = new ArrayList<>(2);
-        ArtifactItem jdom = new ArtifactItem();
-        jdom.setGroupId("jdom");
-        jdom.setArtifactId("jdom");
-        jdom.setVersion("1.1.3");
-        list.add(jdom);
-        ArtifactItem lucee = new ArtifactItem();
-        lucee.setGroupId("org.lucee");
-        lucee.setArtifactId("jdom");
-        lucee.setVersion("1.1.3");
-        list.add(lucee);
-        mojo.setArtifactItems(list);
-        mojo.execute();
-    }
-
     private List<Dependency> createDependencyArtifacts(List<Dependency> items) throws IOException {
         stubFactory.setCreateFiles(true);
         for (Dependency item : items) {