[MNG-7349] Limit relocation warning message to direct dependencies only

apache · Jan 24, 2022 · 83257bf · 83257bf
1 parent 0cda424
commit 83257bf
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 22 deletions.
diff --git a/...ore/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/...ore/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
@@ -108,6 +108,18 @@ public Artifact resolve( Plugin plugin, List<RemoteRepository> repositories, Rep
 
             pluginArtifact = result.getArtifact();
 
+            if ( logger.isWarnEnabled() )
+            {
+                if ( !result.getRelocations().isEmpty() )
+                {
+                    String message = pluginArtifact instanceof org.apache.maven.repository.internal.RelocatedArtifact
+                            ? ( ( org.apache.maven.repository.internal.RelocatedArtifact ) pluginArtifact ).getMessage()
+                            : null;
+                    logger.warn( "The artifact " + result.getRelocations().get( 0 ) + " has been relocated to "
+                            + pluginArtifact + ( message != null ? ": " + message : "" ) );
+                }
+            }
+
             String requiredMavenVersion = (String) result.getProperties().get( "prerequisites.maven" );
             if ( requiredMavenVersion != null )
             {

diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -181,6 +181,22 @@ public DependencyResolutionResult resolve( DependencyResolutionRequest request )
 
         depRequest.setRoot( node );
 
+        if ( logger.isWarnEnabled() )
+        {
+            for ( DependencyNode child : node.getChildren() )
+            {
+                if ( !child.getRelocations().isEmpty() )
+                {
+                    org.eclipse.aether.artifact.Artifact relocated = child.getDependency().getArtifact();
+                    String message = relocated instanceof org.apache.maven.repository.internal.RelocatedArtifact
+                            ? ( ( org.apache.maven.repository.internal.RelocatedArtifact ) relocated ).getMessage()
+                            : null;
+                    logger.warn( "The artifact " + child.getRelocations().get( 0 ) + " has been relocated to "
+                        + relocated + ( message != null ? ": " + message : "" ) );
+                }
+            }
+        }
+
         if ( logger.isDebugEnabled() )
         {
             node.accept( new GraphLogger( project ) );

diff --git a/...r/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/...r/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -68,8 +68,6 @@
 import org.eclipse.aether.spi.locator.Service;
 import org.eclipse.aether.spi.locator.ServiceLocator;
 import org.eclipse.aether.transfer.ArtifactNotFoundException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * @author Benjamin Bentmann
@@ -79,8 +77,6 @@
 public class DefaultArtifactDescriptorReader
     implements ArtifactDescriptorReader, Service
 {
-    private static final Logger LOGGER = LoggerFactory.getLogger( DefaultArtifactDescriptorReader.class );
-
     private RemoteRepositoryManager remoteRepositoryManager;
 
     private VersionResolver versionResolver;
@@ -320,20 +316,10 @@ private Model loadPom( RepositorySystemSession session, ArtifactDescriptorReques
             if ( relocation != null )
             {
                 result.addRelocation( a );
-                Artifact relocatedArtifact =
+                a =
                     new RelocatedArtifact( a, relocation.getGroupId(), relocation.getArtifactId(),
-                                           relocation.getVersion() );
-                if ( LOGGER.isWarnEnabled() )
-                {
-                    String message = "The artifact " + a + " has been relocated to " + relocatedArtifact;
-                    if ( relocation.getMessage() != null )
-                    {
-                        message += ": " + relocation.getMessage();
-                    }
-                    LOGGER.warn( message );
-                }
-                result.setArtifact( relocatedArtifact );
-                a = relocatedArtifact;
+                                           relocation.getVersion(), relocation.getMessage() );
+                result.setArtifact( a );
             }
             else
             {

diff --git a/...solver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java b/...solver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java
@@ -29,7 +29,7 @@
 /**
  * @author Benjamin Bentmann
  */
-final class RelocatedArtifact
+public final class RelocatedArtifact
     extends AbstractArtifact
 {
 
@@ -41,13 +41,16 @@ final class RelocatedArtifact
 
     private final String version;
 
-    RelocatedArtifact( Artifact artifact, String groupId, String artifactId, String version )
+    private final String message;
+
+    RelocatedArtifact( Artifact artifact, String groupId, String artifactId, String version, String message )
     {
         this.artifact = Objects.requireNonNull( artifact, "artifact cannot be null" );
         // TODO Use StringUtils here
         this.groupId = ( groupId != null && groupId.length() > 0 ) ? groupId : null;
         this.artifactId = ( artifactId != null && artifactId.length() > 0 ) ? artifactId : null;
         this.version = ( version != null && version.length() > 0 ) ? version : null;
+        this.message = ( message != null && message.length() > 0 ) ? message : null;
     }
 
     public String getGroupId()
@@ -95,7 +98,7 @@ public Artifact setVersion( String version )
          {
              return this;
          }
-        return new RelocatedArtifact( artifact, groupId, artifactId, version );
+        return new RelocatedArtifact( artifact, groupId, artifactId, version, message );
     }
 
     @Override
@@ -106,7 +109,7 @@ public Artifact setFile( File file )
         {
              return this;
         }
-        return new RelocatedArtifact( artifact.setFile( file ), groupId, artifactId, version );
+        return new RelocatedArtifact( artifact.setFile( file ), groupId, artifactId, version, message );
     }
 
     @Override
@@ -117,7 +120,7 @@ public Artifact setProperties( Map<String, String> properties )
         {
              return this;
         }
-        return new RelocatedArtifact( artifact.setProperties( properties ), groupId, artifactId, version );
+        return new RelocatedArtifact( artifact.setProperties( properties ), groupId, artifactId, version, message );
     }
 
     public String getClassifier()
@@ -145,4 +148,8 @@ public Map<String, String> getProperties()
         return artifact.getProperties();
     }
 
+    public String getMessage()
+    {
+        return message;
+    }
 }