svn commit: r805378 - in /maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver: ArtifactResolutionResult.java ArtifactResolver.java

[bentmann]

Author: bentmann
Date: Tue Aug 18 11:59:58 2009
New Revision: 805378

URL: http://svn.apache.org/viewvc?rev=805378&view=rev
Log:
o Restored methods for backward-compat

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

Modified: 
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java?rev=805378&r1=805377&r2=805378&view=diff
==============================================================================
--- 
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
 (original)
+++ 
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
 Tue Aug 18 11:59:58 2009
@@ -87,7 +87,12 @@
 
     public Set<Artifact> getArtifacts()
     {
-        return ( artifacts != null ) ? artifacts : Collections.<Artifact> 
emptySet();
+        if ( artifacts == null )
+        {
+            artifacts = new LinkedHashSet<Artifact>();
+        }
+
+        return artifacts;
     }
 
     public void setArtifacts( Set<Artifact> artifacts )

Modified: 
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java?rev=805378&r1=805377&r2=805378&view=diff
==============================================================================
--- 
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
 (original)
+++ 
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
 Tue Aug 18 11:59:58 2009
@@ -53,6 +53,14 @@
 
     // USED BY MAVEN ASSEMBLY PLUGIN
     @Deprecated
+    public ArtifactResolutionResult resolveTransitively( Set<Artifact> 
artifacts, Artifact originatingArtifact,
+                                                         Map managedVersions, 
ArtifactRepository localRepository,
+                                                         
List<ArtifactRepository> remoteRepositories,
+                                                         
ArtifactMetadataSource source )
+        throws ArtifactResolutionException, ArtifactNotFoundException;
+
+    // USED BY MAVEN ASSEMBLY PLUGIN
+    @Deprecated
     public ArtifactResolutionResult resolveTransitively( Set<Artifact> 
artifacts, Artifact originatingArtifact, Map managedVersions, 
ArtifactRepository localRepository,
                                                          
List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source, 
ArtifactFilter filter )
         throws ArtifactResolutionException, ArtifactNotFoundException;