svn commit: r786213 - in /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver: ArtifactCollector.java DefaultArtifactCollector.java

[bentmann]

Author: bentmann
Date: Thu Jun 18 19:20:50 2009
New Revision: 786213

URL: http://svn.apache.org/viewvc?rev=786213&view=rev
Log:
o Restored method for compat with maven-dependency-plugin

Modified:
    
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
    
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java

Modified: 
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java?rev=786213&r1=786212&r2=786213&view=diff
==============================================================================
--- 
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
 (original)
+++ 
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
 Thu Jun 18 19:20:50 2009
@@ -38,6 +38,7 @@
  */
 public interface ArtifactCollector
 {
+
     ArtifactResolutionResult collect( Set<Artifact> artifacts,
                                       Artifact originatingArtifact,
                                       Map managedVersions,
@@ -47,4 +48,12 @@
                                       ArtifactFilter filter,
                                       List<ResolutionListener> listeners,
                                       List<ConflictResolver> conflictResolvers 
);
+
+    // used by maven-dependency-tree and maven-dependency-plugin
+    @Deprecated
+    ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact 
originatingArtifact, Map managedVersions,
+                                      ArtifactRepository localRepository, 
List<ArtifactRepository> remoteRepositories,
+                                      ArtifactMetadataSource source, 
ArtifactFilter filter,
+                                      List<ResolutionListener> listeners );
+
 }

Modified: 
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=786213&r1=786212&r2=786213&view=diff
==============================================================================
--- 
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
 (original)
+++ 
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
 Thu Jun 18 19:20:50 2009
@@ -700,4 +700,15 @@
             }
         }
     }
+
+    public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact 
originatingArtifact,
+                                             Map managedVersions, 
ArtifactRepository localRepository,
+                                             List<ArtifactRepository> 
remoteRepositories,
+                                             ArtifactMetadataSource source, 
ArtifactFilter filter,
+                                             List<ResolutionListener> 
listeners )
+    {
+        return collect( artifacts, originatingArtifact, managedVersions, 
localRepository, remoteRepositories, source,
+                        filter, listeners, null );
+    }
+
 }