You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/09/11 14:43:09 UTC
svn commit: r813810 - in
/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven:
artifact/resolver/ArtifactResolutionResult.java
artifact/resolver/DefaultArtifactResolver.java
repository/legacy/resolver/DefaultLegacyArtifactCollector.java
Author: bentmann
Date: Fri Sep 11 12:43:08 2009
New Revision: 813810
URL: http://svn.apache.org/viewvc?rev=813810&view=rev
Log:
o Restored backward-compat
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java?rev=813810&r1=813809&r2=813810&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java Fri Sep 11 12:43:08 2009
@@ -100,7 +100,7 @@
this.artifacts = artifacts;
}
- public Set<ResolutionNode> getResolutionNodes()
+ public Set<ResolutionNode> getArtifactResolutionNodes()
{
if ( resolutionNodes == null )
{
@@ -110,7 +110,7 @@
return resolutionNodes;
}
- public void setResolutionNodes( Set<ResolutionNode> resolutionNodes )
+ public void setArtifactResolutionNodes( Set<ResolutionNode> resolutionNodes )
{
this.resolutionNodes = resolutionNodes;
}
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=813810&r1=813809&r2=813810&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Fri Sep 11 12:43:08 2009
@@ -493,11 +493,11 @@
return result;
}
- if ( result.getResolutionNodes() != null )
+ if ( result.getArtifactResolutionNodes() != null )
{
ArtifactResolutionRequest childRequest = new ArtifactResolutionRequest( request );
- for ( ResolutionNode node : result.getResolutionNodes() )
+ for ( ResolutionNode node : result.getArtifactResolutionNodes() )
{
Artifact artifact = node.getArtifact();
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java?rev=813810&r1=813809&r2=813810&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java Fri Sep 11 12:43:08 2009
@@ -181,7 +181,7 @@
}
}
- result.setResolutionNodes( set );
+ result.setArtifactResolutionNodes( set );
return result;
}