You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2009/08/06 00:06:54 UTC
svn commit: r801437 -
/maven/maven-2/branches/maven-2.2.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Author: jdcasey
Date: Wed Aug 5 22:06:54 2009
New Revision: 801437
URL: http://svn.apache.org/viewvc?rev=801437&view=rev
Log:
[MNG-4275] Applied patch to set dependency trail soon enough to trigger a warning in cases where a direct dependency is relocated.
Submitted by: Brett Randall
Modified:
maven/maven-2/branches/maven-2.2.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Modified: maven/maven-2/branches/maven-2.2.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=801437&r1=801436&r2=801437&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java Wed Aug 5 22:06:54 2009
@@ -295,6 +295,8 @@
if ( !child.isResolved() && ( !child.getArtifact().isOptional() || child.isChildOfRootNode() ) )
{
Artifact artifact = child.getArtifact();
+ artifact.setDependencyTrail( node.getDependencyTrail() );
+
List childRemoteRepositories = child.getRemoteRepositories();
try
{
@@ -362,9 +364,6 @@
if ( version == null )
{
- // Getting the dependency trail so it can be logged in the exception
- artifact.setDependencyTrail( node.getDependencyTrail() );
-
if ( versions.isEmpty() )
{
throw new OverConstrainedVersionException(
@@ -405,7 +404,6 @@
continue;
}
- artifact.setDependencyTrail( node.getDependencyTrail() );
ResolutionGroup rGroup = source.retrieve( artifact, localRepository, childRemoteRepositories );
//TODO might be better to have source.retrieve() throw a specific exception for this situation