You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2005/10/18 22:45:44 UTC
svn commit: r326231 -
/maven/components/tags/maven-2.0/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Author: jvanzyl
Date: Tue Oct 18 13:45:43 2005
New Revision: 326231
URL: http://svn.apache.org/viewcvs?rev=326231&view=rev
Log:
o rolling in fix in MNG-1207
Modified:
maven/components/tags/maven-2.0/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Modified: maven/components/tags/maven-2.0/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL: http://svn.apache.org/viewcvs/maven/components/tags/maven-2.0/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=326231&r1=326230&r2=326231&view=diff
==============================================================================
--- maven/components/tags/maven-2.0/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java (original)
+++ maven/components/tags/maven-2.0/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java Tue Oct 18 13:45:43 2005
@@ -157,6 +157,21 @@
}
previous.getArtifact().setVersionRange( newRange );
node.getArtifact().setVersionRange( currentRange.restrict( previousRange ) );
+
+ //Select an appropriate available version from the (now restricted) range
+ //Note this version was selected before to get the appropriate POM
+ //But it was reset by the call to setVersionRange on restricting the version
+ ResolutionNode[] resetNodes = {previous, node};
+ for ( int j = 0; j < 2; j++ )
+ {
+ Artifact resetArtifact = resetNodes[j].getArtifact();
+ if ( resetArtifact.getVersion() == null && resetArtifact.getVersionRange() != null && resetArtifact.getAvailableVersions() != null )
+ {
+
+ resetArtifact.selectVersion( resetArtifact.getVersionRange().matchVersion( resetArtifact.getAvailableVersions() ).toString() );
+ fireEvent( ResolutionListener.SELECT_VERSION_FROM_RANGE, listeners, resetNodes[j] );
+ }
+ }
}
// Conflict Resolution
@@ -225,6 +240,7 @@
}
VersionRange versionRange = artifact.getVersionRange();
+
version = versionRange.matchVersion( versions );
if ( version == null )