You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2006/06/22 04:46:22 UTC
svn commit: r416226 -
/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AssemblyIncludesArtifactFilter.java
Author: jdcasey
Date: Wed Jun 21 19:46:22 2006
New Revision: 416226
URL: http://svn.apache.org/viewvc?rev=416226&view=rev
Log:
Fixing transitive dependency in/exclusions in filter so they don't require a full artifact id for a match.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AssemblyIncludesArtifactFilter.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AssemblyIncludesArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AssemblyIncludesArtifactFilter.java?rev=416226&r1=416225&r2=416226&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AssemblyIncludesArtifactFilter.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AssemblyIncludesArtifactFilter.java Wed Jun 21 19:46:22 2006
@@ -18,8 +18,8 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.codehaus.plexus.util.StringUtils;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -72,10 +72,18 @@
List depTrail = artifact.getDependencyTrail();
if ( depTrail != null && !depTrail.isEmpty() )
{
- depTrail = new ArrayList( depTrail );
- depTrail.retainAll( patterns );
+ String trailStr = StringUtils.join( depTrail.iterator(), "," );
- matched = !depTrail.isEmpty();
+ for ( Iterator it = patterns.iterator(); it.hasNext(); )
+ {
+ String pattern = (String) it.next();
+
+ if ( trailStr.indexOf( pattern ) > -1 )
+ {
+ matched = true;
+ break;
+ }
+ }
}
}