[maven] branch maven-3.8.x updated: [MNG-7438] add execution id to "configuring mojo" debug message

[michaelo]

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

michaelo pushed a commit to branch maven-3.8.x
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/maven-3.8.x by this push:
     new 64da2c582 [MNG-7438] add execution id to "configuring mojo" debug 
message
64da2c582 is described below

commit 64da2c58243bc6f48827301b744b9f6312497550
Author: Hervé Boutemy <hbout...@apache.org>
AuthorDate: Tue Mar 22 08:12:56 2022 +0100

    [MNG-7438] add execution id to "configuring mojo" debug message
    
    [DEBUG] Configuring mojo execution
    'org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M5:test:default-test'
    with basic configurator
    
    rephrase "Configuring" to "Loading" mojo "from plugin realm"
    to differentiate from "configuring mojo" = apply configuration
    
    rename populatePluginFields(..) private method
    to populateMojoExecutionFields(..) to better match the intent
---
 .../maven/plugin/internal/DefaultMavenPluginManager.java   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git 
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
 
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
index 86304714d..d5112e5b3 100644
--- 
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
+++ 
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
@@ -500,7 +500,7 @@ public class DefaultMavenPluginManager
 
         if ( logger.isDebugEnabled() )
         {
-            logger.debug( "Configuring mojo " + mojoDescriptor.getId() + " 
from plugin realm " + pluginRealm );
+            logger.debug( "Loading mojo " + mojoDescriptor.getId() + " from 
plugin realm " + pluginRealm );
         }
 
         // We are forcing the use of the plugin realm for all lookups that 
might occur during
@@ -594,7 +594,8 @@ public class DefaultMavenPluginManager
 
             ExpressionEvaluator expressionEvaluator = new 
PluginParameterExpressionEvaluator( session, mojoExecution );
 
-            populatePluginFields( mojo, mojoDescriptor, pluginRealm, 
pomConfiguration, expressionEvaluator );
+            populateMojoExecutionFields( mojo, mojoExecution.getExecutionId(), 
mojoDescriptor, pluginRealm,
+                                         pomConfiguration, expressionEvaluator 
);
 
             return mojo;
         }
@@ -605,8 +606,9 @@ public class DefaultMavenPluginManager
         }
     }
 
-    private void populatePluginFields( Object mojo, MojoDescriptor 
mojoDescriptor, ClassRealm pluginRealm,
-                                       PlexusConfiguration configuration, 
ExpressionEvaluator expressionEvaluator )
+    private void populateMojoExecutionFields( Object mojo, String executionId, 
MojoDescriptor mojoDescriptor,
+                                              ClassRealm pluginRealm, 
PlexusConfiguration configuration,
+                                              ExpressionEvaluator 
expressionEvaluator )
         throws PluginConfigurationException
     {
         ComponentConfigurator configurator = null;
@@ -629,8 +631,8 @@ public class DefaultMavenPluginManager
             ValidatingConfigurationListener validator =
                 new ValidatingConfigurationListener( mojo, mojoDescriptor, 
listener );
 
-            logger.debug(
-                "Configuring mojo '" + mojoDescriptor.getId() + "' with " + 
configuratorId + " configurator -->" );
+            logger.debug( "Configuring mojo execution '" + 
mojoDescriptor.getId() + ':' + executionId + "' with "
+                + configuratorId + " configurator -->" );
 
             configurator.configureComponent( mojo, configuration, 
expressionEvaluator, pluginRealm, validator );