From 30ab54bd7b8215cd35b5a24340eae6872c1fbc0a Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Thu, 18 Jun 2009 19:20:50 +0000 Subject: [PATCH] o Restored method for compat with maven-dependency-plugin git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@786213 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/artifact/resolver/ArtifactCollector.java | 9 +++++++++ .../artifact/resolver/DefaultArtifactCollector.java | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java index 72b51d4018..478725c0a6 100644 --- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java +++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java @@ -38,6 +38,7 @@ */ public interface ArtifactCollector { + ArtifactResolutionResult collect( Set artifacts, Artifact originatingArtifact, Map managedVersions, @@ -47,4 +48,12 @@ ArtifactResolutionResult collect( Set artifacts, ArtifactFilter filter, List listeners, List conflictResolvers ); + + // used by maven-dependency-tree and maven-dependency-plugin + @Deprecated + ArtifactResolutionResult collect( Set artifacts, Artifact originatingArtifact, Map managedVersions, + ArtifactRepository localRepository, List remoteRepositories, + ArtifactMetadataSource source, ArtifactFilter filter, + List listeners ); + } diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java index c498636221..fba6bf0ad4 100644 --- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java +++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java @@ -700,4 +700,15 @@ private void fireEvent( int event, List listeners, Resolutio } } } + + public ArtifactResolutionResult collect( Set artifacts, Artifact originatingArtifact, + Map managedVersions, ArtifactRepository localRepository, + List remoteRepositories, + ArtifactMetadataSource source, ArtifactFilter filter, + List listeners ) + { + return collect( artifacts, originatingArtifact, managedVersions, localRepository, remoteRepositories, source, + filter, listeners, null ); + } + }