PR: MNG-1206

Submitted by: Edwin Punzalan
include all dependencies in reactor projects in the generated assembly

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327855 13f79535-47bb-0310-9956-ffa450edef68

maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java

@@ -26,7 +26,14 @@ import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.project.MavenProject;
 
 /**
  * Base routines for assembly and unpack goals.
@@ -54,14 +61,6 @@ public abstract class AbstractUnpackingMojo
      */
     protected String finalName;
 
-    /**
-     * Project dependencies.
-     *
-     * @parameter expression="${project.artifacts}"
-     * @readonly
-     */
-    protected Set dependencies;
-
     /**
      * Directory to unpack JARs into if needed
      *
@@ -70,7 +69,6 @@ public abstract class AbstractUnpackingMojo
      */
     protected File workDirectory;
 
-
     /**
      * To look up Archiver/UnArchiver implementations
      *
@@ -80,6 +78,67 @@ public abstract class AbstractUnpackingMojo
 
     protected ArchiverManager archiverManager;
 
+    /**
+     * Contains the full list of projects in the reactor.
+     *
+     * @parameter expression="${reactorProjects}"
+     * @required
+     * @readonly
+     */
+    private List reactorProjects;
+
+    /**
+     * Creates a Map of artifacts within the reactor using the groupId:artifactId:version as key
+     *
+     * @return a HashMap of all artifacts available in the reactor
+     */
+    protected Map getMappedReactorArtifacts()
+    {
+        Map mappedReactorArtifacts = new HashMap();
+
+        for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
+        {
+            MavenProject reactorProject = (MavenProject) i.next();
+
+            String key = reactorProject.getGroupId() + ":" + reactorProject.getArtifactId() + ":"
+                + reactorProject.getVersion();
+
+            mappedReactorArtifacts.put( key, reactorProject.getArtifact() );
+        }
+
+        return mappedReactorArtifacts;
+    }
+
+    /**
+     * Retrieves all artifact dependencies within the reactor
+     *
+     * @return A HashSet of artifacts
+     */
+    protected Set getDependencies()
+    {
+        Map reactorArtifacts = getMappedReactorArtifacts();
+
+        Map dependencies = new HashMap();
+
+        for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
+        {
+            MavenProject reactorProject = (MavenProject) i.next();
+
+            for ( Iterator j = reactorProject.getArtifacts().iterator(); j.hasNext(); )
+            {
+                Artifact artifact = (Artifact) j.next();
+
+                String key = artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + artifact.getVersion();
+
+                if ( !reactorArtifacts.containsKey( key ) && !dependencies.containsKey( key ) )
+                {
+                    dependencies.put( key, artifact );
+                }
+            }
+        }
+
+        return new HashSet( dependencies.values() );
+    }
 
     /**
      * Unpacks the archive file.
@@ -87,7 +146,6 @@ public abstract class AbstractUnpackingMojo
      * @param file File to be unpacked.
      * @param location Location where to put the unpacked files.
      */
-
     protected void unpack( File file, File location )
         throws MojoExecutionException, NoSuchArchiverException
     {

maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java

@@ -311,7 +311,7 @@ public class AssemblyMojo
             }
 
             // TODO: includes and excludes
-            for ( Iterator j = dependencies.iterator(); j.hasNext(); )
+            for ( Iterator j = getDependencies().iterator(); j.hasNext(); )
             {
                 Artifact artifact = (Artifact) j.next();
 

maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/ComponentsXmlArchiverFileFilter.java

@@ -13,7 +13,6 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.io.FileWriter;
 import java.util.Map;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 

maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/UnpackMojo.java

@@ -42,7 +42,7 @@ public class UnpackMojo
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {
-        for ( Iterator j = dependencies.iterator(); j.hasNext(); )
+        for ( Iterator j = getDependencies().iterator(); j.hasNext(); )
         {
             Artifact artifact = (Artifact) j.next();