Author: carlos
Date: Wed Dec 21 07:15:11 2005
New Revision: 358305
URL: http://svn.apache.org/viewcvs?rev=358305&view=rev
Log:
Only print relocation warnings in standard output for the current pom
Submitted By: Edwin Punzalan
PR: MNG-1689
Modified:
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified:
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL:
http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?rev=358305&r1=358304&r2=358305&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
Wed Dec 21 07:15:11 2005
@@ -278,6 +278,7 @@
fireEvent(
ResolutionListener.SELECT_VERSION_FROM_RANGE, listeners, child );
}
+ artifact.setDependencyTrail( node.getDependencyTrail()
);
ResolutionGroup rGroup = source.retrieve( artifact,
localRepository, remoteRepositories );
//TODO might be better to have source.retreive() throw
a specific exception for this situation
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=358305&r1=358304&r2=358305&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Wed Dec 21 07:15:11 2005
@@ -171,8 +171,16 @@
message += " " + relocation.getMessage() + "\n";
}
- getLogger().warn( "While downloading " +
pomArtifact.getGroupId() + ":" +
- pomArtifact.getArtifactId() + ":" +
pomArtifact.getVersion() + message + "\n" );
+ if ( artifact.getDependencyTrail() != null &&
artifact.getDependencyTrail().size() == 1 )
+ {
+ getLogger().warn( "While downloading " +
pomArtifact.getGroupId() + ":" +
+ pomArtifact.getArtifactId() + ":" +
pomArtifact.getVersion() + message + "\n" );
+ }
+ else
+ {
+ getLogger().debug( "While downloading " +
pomArtifact.getGroupId() + ":" +
+ pomArtifact.getArtifactId() + ":" +
pomArtifact.getVersion() + message + "\n" );
+ }
}
else
{
