Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-4203] [regression] Dependency exclusions are not applied transitively 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@785362 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-06-16 20:07:34 +00:00
parent 25c795c4ac
commit be6ec8844e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
View File

@ -176,6 +176,8 @@ public class MavenMetadataSource
dependencyArtifact.setFile( new File( d.getSystemPath() ) ); dependencyArtifact.setFile( new File( d.getSystemPath() ) );
} }
ArtifactFilter newFilter = dependencyFilter;
if ( !d.getExclusions().isEmpty() ) if ( !d.getExclusions().isEmpty() )
{ {
List<String> exclusions = new ArrayList<String>(); List<String> exclusions = new ArrayList<String>();
@ -185,14 +187,15 @@ public class MavenMetadataSource
exclusions.add( e.getGroupId() + ":" + e.getArtifactId() ); exclusions.add( e.getGroupId() + ":" + e.getArtifactId() );
} }
ArtifactFilter newFilter = new ExcludesArtifactFilter( exclusions ); newFilter = new ExcludesArtifactFilter( exclusions );
if ( dependencyFilter != null ) if ( dependencyFilter != null )
{ {
newFilter = new AndArtifactFilter( Arrays.asList( dependencyFilter, newFilter ) ); newFilter = new AndArtifactFilter( Arrays.asList( dependencyFilter, newFilter ) );
} }
dependencyArtifact.setDependencyFilter( newFilter );
} }
dependencyArtifact.setDependencyFilter( newFilter );
artifacts.add( dependencyArtifact ); artifacts.add( dependencyArtifact );
} }
} }