Author: bentmann
Date: Thu Aug 6 19:29:18 2009
New Revision: 801785
URL: http://svn.apache.org/viewvc?rev=801785&view=rev
Log:
[MNG-4275] [regression] Direct relocations no longer log at WARNING level :
MNG-3380 conflicts with MNG-1689
o Merged from r801437
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java?rev=801785&r1=801784&r2=801785&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
Thu Aug 6 19:29:18 2009
@@ -395,6 +395,7 @@
if ( !child.isResolved() && (
!child.getArtifact().isOptional() || child.isChildOfRootNode() ) )
{
Artifact artifact = child.getArtifact();
+ artifact.setDependencyTrail( node.getDependencyTrail()
);
List<ArtifactRepository> childRemoteRepositories =
child.getRemoteRepositories();
try
@@ -458,9 +459,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(
@@ -506,8 +504,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
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=801785&r1=801784&r2=801785&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Thu Aug 6 19:29:18 2009
@@ -568,6 +568,17 @@
{
message += " " + relocation.getMessage() + "\n";
}
+
+ if ( artifact.getDependencyTrail() != null &&
artifact.getDependencyTrail().size() == 1 )
+ {
+ logger.warn( "While downloading " +
pomArtifact.getGroupId() + ":"
+ + pomArtifact.getArtifactId() + ":" +
pomArtifact.getVersion() + message + "\n" );
+ }
+ else
+ {
+ logger.debug( "While downloading " +
pomArtifact.getGroupId() + ":"
+ + pomArtifact.getArtifactId() + ":" +
pomArtifact.getVersion() + message + "\n" );
+ }
}
else
{
