You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/06/16 22:07:34 UTC
svn commit: r785362 -
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Author: bentmann
Date: Tue Jun 16 20:07:34 2009
New Revision: 785362
URL: http://svn.apache.org/viewvc?rev=785362&view=rev
Log:
[MNG-4203] [regression] Dependency exclusions are not applied transitively
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=785362&r1=785361&r2=785362&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Tue Jun 16 20:07:34 2009
@@ -176,6 +176,8 @@
dependencyArtifact.setFile( new File( d.getSystemPath() ) );
}
+ ArtifactFilter newFilter = dependencyFilter;
+
if ( !d.getExclusions().isEmpty() )
{
List<String> exclusions = new ArrayList<String>();
@@ -185,14 +187,15 @@
exclusions.add( e.getGroupId() + ":" + e.getArtifactId() );
}
- ArtifactFilter newFilter = new ExcludesArtifactFilter( exclusions );
+ newFilter = new ExcludesArtifactFilter( exclusions );
if ( dependencyFilter != null )
{
newFilter = new AndArtifactFilter( Arrays.asList( dependencyFilter, newFilter ) );
}
- dependencyArtifact.setDependencyFilter( newFilter );
}
+ dependencyArtifact.setDependencyFilter( newFilter );
+
artifacts.add( dependencyArtifact );
}
}