svn commit: r784300 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java

[jvanzyl]

Author: jvanzyl
Date: Fri Jun 12 22:38:33 2009
New Revision: 784300

URL: http://svn.apache.org/viewvc?rev=784300&view=rev
Log:
o just leaving the logic there for the transitive global exclude

Modified:
    
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java?rev=784300&r1=784299&r2=784300&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
 Fri Jun 12 22:38:33 2009
@@ -31,6 +31,37 @@
     public Set<Artifact> resolve( MavenProject project, String scope, 
ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories 
)
         throws ArtifactResolutionException, ArtifactNotFoundException
     {        
+        /*
+         
+        Logic for transitve global exclusions
+         
+        List<String> exclusions = new ArrayList<String>();
+        
+        for ( Dependency d : project.getDependencies() )
+        {
+            if ( d.getExclusions() != null )
+            {
+                for ( Exclusion e : d.getExclusions() )
+                {
+                    exclusions.add(  e.getGroupId() + ":" + e.getArtifactId() 
);
+                }
+            }
+        }
+        
+        ArtifactFilter scopeFilter = new ScopeArtifactFilter( scope );
+        
+        ArtifactFilter filter; 
+
+        if ( ! exclusions.isEmpty() )
+        {
+            filter = new AndArtifactFilter( Arrays.asList( new 
ArtifactFilter[]{ new ExcludesArtifactFilter( exclusions ), scopeFilter } ) );
+        }
+        else
+        {
+            filter = scopeFilter;
+        }        
+        */
+        
         ArtifactFilter scopeFilter = new ScopeArtifactFilter( scope );
 
         ArtifactFilter filter = scopeFilter;