[maven] branch MNG-7501 updated: enhance message: "Building Module Name\n from pom.xml"

[hboutemy]

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch MNG-7501
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/MNG-7501 by this push:
     new 982bcad0e enhance message: "Building Module Name\n    from pom.xml"
982bcad0e is described below

commit 982bcad0e201aba10c7e122a3ff41ffbfc3141f9
Author: Hervé Boutemy <hbout...@apache.org>
AuthorDate: Sat Jun 18 12:41:27 2022 +0200

    enhance message: "Building Module Name\n    from pom.xml"
---
 .../org/apache/maven/cli/event/ExecutionEventLogger.java   |  2 +-
 .../apache/maven/cli/event/ExecutionEventLoggerTest.java   | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

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
index f723f95fa..69b08a53b 100644
--- 
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
@@ -338,7 +338,7 @@ public class ExecutionEventLogger
             MavenSession session = event.getSession();
             File rootBasedir = session.getTopLevelProject().getBasedir();
             File currentPom = project.getFile();
-            logger.info( "    " + rootBasedir.toPath().relativize( 
currentPom.toPath() ) );
+            logger.info( "    from " + rootBasedir.toPath().relativize( 
currentPom.toPath() ) );
 
             // ----------[ packaging ]----------
             prefix = chars( '-', Math.max( 0, ( LINE_LENGTH - 
project.getPackaging().length() - 4 ) / 2 ) );
diff --git 
a/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
 
b/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
index 75dac8599..bf3c907ea 100644
--- 
a/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
+++ 
b/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
@@ -29,6 +29,7 @@ import org.apache.maven.execution.ExecutionEvent;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.utils.logging.MessageUtils;
+import org.codehaus.plexus.util.Os;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -83,7 +84,7 @@ public class ExecutionEventLoggerTest
         inOrder.verify( logger ).info( "" );
         inOrder.verify( logger ).info( "------------------< 
org.apache.maven:maven-embedder >-------------------" );
         inOrder.verify( logger ).info( "Building Apache Maven Embedder 
3.5.4-SNAPSHOT" );
-        inOrder.verify( logger ).info( "    maven-embedder/pom.xml" );
+        inOrder.verify( logger ).info( adaptDirSeparator( "    from 
maven-embedder/pom.xml" ) );
         inOrder.verify( logger ).info( "--------------------------------[ jar 
]---------------------------------" );
     }
 
@@ -118,7 +119,16 @@ public class ExecutionEventLoggerTest
         inOrder.verify( logger ).info( "" );
         inOrder.verify( logger ).info( "--< 
org.apache.maven.plugins.overflow:maven-project-info-reports-plugin >--" );
         inOrder.verify( logger ).info( "Building Apache Maven Project Info 
Reports Plugin 3.0.0-SNAPSHOT" );
-        inOrder.verify( logger ).info( "    pom.xml" );
+        inOrder.verify( logger ).info( "    from pom.xml" );
         inOrder.verify( logger ).info( "----------------------------[ 
maven-plugin ]----------------------------" );
     }
+
+    private static String adaptDirSeparator( String path )
+    {
+        if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
+        {
+            return path.replace( '/', '\\' );
+        }
+        return path;
+    }
 }