svn commit: r925312 - /maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java

[pg...@apache.org]

Author: pgier
Date: Fri Mar 19 16:37:43 2010
New Revision: 925312

URL: http://svn.apache.org/viewvc?rev=925312&view=rev
Log:
[MANTRUN-47] Fix a couple of issues pointed out by bentmann.  Get the entire dep tree instead of just direct dependnecies.  Use a LinkedHashSet to preserve dependency order.

Modified:
    maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java

Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java?rev=925312&r1=925311&r2=925312&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java Fri Mar 19 16:37:43 2010
@@ -20,7 +20,7 @@ package org.apache.maven.ant.tasks;
  */
 
 import java.io.File;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Iterator;
 import java.util.Set;
 
@@ -97,7 +97,7 @@ public class DependencyFilesetsTask
         MavenProject mavenProject = (MavenProject) this.getProject().getReference( "maven.project" );
 
         // Add filesets for depenedency artifacts
-        Set depArtifacts = filterArtifacts( mavenProject.getDependencyArtifacts() );
+        Set depArtifacts = filterArtifacts( mavenProject.getArtifacts() );
 
         FileSet dependenciesFileSet = new FileSet();
         dependenciesFileSet.setProject( getProject() );
@@ -201,7 +201,7 @@ public class DependencyFilesetsTask
             filter.add( new TypesArtifactFilter( getTypes() ) );
         }
 
-        Set artifactsResult = new HashSet();
+        Set artifactsResult = new LinkedHashSet();
         for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
         {
             Artifact artifact = (Artifact) iter.next();