[MNG-7795] IllegalArgumentException: 'other' has different root durin…

…g plugin validation (#1128) Checks the paths before relativizing them. Normalize and relative before adding to result Rename local vars Apply to ExecutionEventLogger --- https://issues.apache.org/jira/browse/MNG-7795
apache · Jun 1, 2023 · 23a3a91 · 23a3a91
1 parent 8cc6b27
commit 23a3a91
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/...n-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java b/...n-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java
@@ -22,6 +22,7 @@
 import javax.inject.Singleton;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -261,16 +262,14 @@ private String pluginDeclaration(MavenSession mavenSession, MojoDescriptor mojoD
                 if (location.contains("://")) {
                     stringBuilder.append(" (").append(location).append(")");
                 } else {
-                    File rootBasedir = mavenSession.getTopLevelProject().getBasedir();
-                    File locationFile = new File(location);
-                    if (location.startsWith(rootBasedir.getPath())) {
-                        stringBuilder
-                                .append(" (")
-                                .append(rootBasedir.toPath().relativize(locationFile.toPath()))
-                                .append(")");
-                    } else {
-                        stringBuilder.append(" (").append(location).append(")");
+                    Path topLevelBasedir =
+                            mavenSession.getTopLevelProject().getBasedir().toPath();
+                    Path locationPath =
+                            new File(location).toPath().toAbsolutePath().normalize();
+                    if (locationPath.startsWith(topLevelBasedir)) {
+                        locationPath = topLevelBasedir.relativize(locationPath);
                     }
+                    stringBuilder.append(" (").append(locationPath).append(")");
                 }
             }
             stringBuilder.append(" @ line ").append(inputLocation.getLineNumber());
@@ -285,8 +284,13 @@ private String pluginOccurrence(MavenSession mavenSession) {
         String result = prj.getGroupId() + ":" + prj.getArtifactId() + ":" + prj.getVersion();
         File currentPom = prj.getFile();
         if (currentPom != null) {
-            File rootBasedir = mavenSession.getTopLevelProject().getBasedir();
-            result += " (" + rootBasedir.toPath().relativize(currentPom.toPath()) + ")";
+            Path topLevelBasedir =
+                    mavenSession.getTopLevelProject().getBasedir().toPath();
+            Path current = currentPom.toPath().toAbsolutePath().normalize();
+            if (current.startsWith(topLevelBasedir)) {
+                current = topLevelBasedir.relativize(current);
+            }
+            result += " (" + current + ")";
         }
         return result;
     }

diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
@@ -19,6 +19,7 @@
 package org.apache.maven.cli.event;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Objects;
 
@@ -296,8 +297,12 @@ public void projectStarted(ExecutionEvent event) {
             File currentPom = project.getFile();
             if (currentPom != null) {
                 MavenSession session = event.getSession();
-                File rootBasedir = session.getTopLevelProject().getBasedir();
-                logger.info("  from " + rootBasedir.toPath().relativize(currentPom.toPath()));
+                Path topLevelBasedir = session.getTopLevelProject().getBasedir().toPath();
+                Path current = currentPom.toPath().toAbsolutePath().normalize();
+                if (current.startsWith(topLevelBasedir)) {
+                    current = topLevelBasedir.relativize(current);
+                }
+                logger.info("  from " + current);
             }
 
             // ----------[ packaging ]----------