svn commit: r1716944 - in /maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection: AbstractArtifactFeatureFilter.java AbstractArtifactsFilter.java

[kh...@apache.org]

Author: khmarbaise
Date: Sat Nov 28 10:51:58 2015
New Revision: 1716944

URL: http://svn.apache.org/viewvc?rev=1716944&view=rev
Log:
[MSHARED-466] Filtering dependencies does not retain the order of the unfiltered list

Modified:
    maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java
    maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java

Modified: maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java?rev=1716944&r1=1716943&r2=1716944&view=diff
==============================================================================
--- maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java (original)
+++ maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java Sat Nov 28 10:51:58 2015
@@ -20,7 +20,7 @@ package org.apache.maven.shared.artifact
  */
 
 import java.util.Arrays;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -82,7 +82,7 @@ public abstract class AbstractArtifactFe
      */
     private Set<Artifact> filterIncludes( Set<Artifact> artifacts, List<String> theIncludes )
     {
-        Set<Artifact> result = new HashSet<Artifact>();
+        Set<Artifact> result = new LinkedHashSet<Artifact>();
 
         for ( String include : theIncludes )
         {
@@ -110,7 +110,7 @@ public abstract class AbstractArtifactFe
      */
     private Set<Artifact> filterExcludes( Set<Artifact> artifacts, List<String> theExcludes )
     {
-        Set<Artifact> result = new HashSet<Artifact>();
+        Set<Artifact> result = new LinkedHashSet<Artifact>();
 
         for ( Artifact artifact : artifacts )
         {

Modified: maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java?rev=1716944&r1=1716943&r2=1716944&view=diff
==============================================================================
--- maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java (original)
+++ maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java Sat Nov 28 10:51:58 2015
@@ -1,6 +1,6 @@
 package org.apache.maven.shared.artifact.filter.collection;
 
-/*
+/* 
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,10 +16,10 @@ package org.apache.maven.shared.artifact
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License. 
+ * under the License.    
  */
 
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.apache.maven.artifact.Artifact;
@@ -38,7 +38,7 @@ public abstract class AbstractArtifactsF
     public boolean isArtifactIncluded( Artifact artifact )
         throws ArtifactFilterException
     {
-        Set<Artifact> set = new HashSet<Artifact>();
+        Set<Artifact> set = new LinkedHashSet<Artifact>();
         set.add( artifact );
 
         set = filter( set );