Author: jdcasey
Date: Tue Sep 21 20:38:46 2010
New Revision: 999621
URL: http://svn.apache.org/viewvc?rev=999621&view=rev
Log:
switched to using LinkedHashSet to preserve ordering of dependecy / module /
project sets. Ordering may not be easy to predict in some places, but at least
they should be consistent.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java?rev=999621&r1=999620&r2=999621&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
Tue Sep 21 20:38:46 2010
@@ -52,8 +52,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -159,7 +159,7 @@ public class ModuleSetAssemblyPhase
return;
}
- final Set<MavenProject> moduleProjects = new HashSet<MavenProject>(
projects );
+ final Set<MavenProject> moduleProjects = new
LinkedHashSet<MavenProject>( projects );
for ( final Iterator<MavenProject> it = moduleProjects.iterator();
it.hasNext(); )
{
@@ -536,7 +536,7 @@ public class ModuleSetAssemblyPhase
{
if ( !moduleSet.isIncludeSubModules() )
{
- moduleProjects = new HashSet<MavenProject>(
configSource.getReactorProjects() );
+ moduleProjects = new LinkedHashSet<MavenProject>(
configSource.getReactorProjects() );
}
project = configSource.getReactorProjects()
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java?rev=999621&r1=999620&r2=999621&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
Tue Sep 21 20:38:46 2010
@@ -42,8 +42,8 @@ import org.codehaus.plexus.logging.Logge
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -209,7 +209,7 @@ public class AddDependencySetsTask
protected Set<Artifact> resolveDependencyArtifacts( final DependencySet
dependencySet )
throws InvalidAssemblerConfigurationException
{
- final Set<Artifact> dependencyArtifacts = new HashSet<Artifact>();
+ final Set<Artifact> dependencyArtifacts = new
LinkedHashSet<Artifact>();
if ( resolvedArtifacts != null )
{
dependencyArtifacts.addAll( resolvedArtifacts );
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java?rev=999621&r1=999620&r2=999621&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
Tue Sep 21 20:38:46 2010
@@ -52,6 +52,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -136,7 +137,7 @@ public class DefaultDependencyResolver
{
final List<Artifact> missing = new ArrayList<Artifact>();
- final Set<Artifact> resolved = new HashSet<Artifact>();
+ final Set<Artifact> resolved = new LinkedHashSet<Artifact>();
for ( final Iterator<Artifact> it = dependencyArtifacts.iterator();
it.hasNext(); )
{
final Artifact depArtifact = it.next();
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java?rev=999621&r1=999620&r2=999621&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/UnpackMojo.java
Tue Sep 21 20:38:46 2010
@@ -30,8 +30,8 @@ import org.codehaus.plexus.archiver.mana
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
import java.io.File;
-import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.Set;
/**
@@ -72,9 +72,10 @@ public class UnpackMojo
*
* @throws MojoExecutionException
*/
- public void execute() throws MojoExecutionException, MojoFailureException
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
{
- final Set<Artifact> dependencies = new HashSet<Artifact>();
+ final Set<Artifact> dependencies = new LinkedHashSet<Artifact>();
if ( project.getArtifact() != null && project.getArtifact()
.getFile() != null )
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java?rev=999621&r1=999620&r2=999621&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java
Tue Sep 21 20:38:46 2010
@@ -25,7 +25,6 @@ import org.codehaus.plexus.logging.Logge
import java.io.File;
import java.io.IOException;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
@@ -81,7 +80,7 @@ public final class ProjectUtils
Set<MavenProject> currentPotentialParents;
if ( includeSubModules )
{
- currentPotentialParents = new HashSet<MavenProject>(
modules );
+ currentPotentialParents = new LinkedHashSet<MavenProject>(
modules );
}
else
{
