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

[hboutemy]

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

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


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

commit cbd02154011a8ca5da7cf1c31664c92ee81d53f0
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
    'org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M5:test' execution
    'default-test' with basic configurator
---
 .../maven/plugin/internal/DefaultMavenPluginManager.java     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 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 546f004..960efee 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
@@ -609,7 +609,8 @@ public class DefaultMavenPluginManager
 
             ExpressionEvaluator expressionEvaluator = new 
PluginParameterExpressionEvaluator( session, mojoExecution );
 
-            populatePluginFields( mojo, mojoDescriptor, pluginRealm, 
pomConfiguration, expressionEvaluator );
+            populatePluginFields( mojo, mojoExecution.getExecutionId(), 
mojoDescriptor, pluginRealm, pomConfiguration,
+                                  expressionEvaluator );
 
             return mojo;
         }
@@ -620,8 +621,9 @@ public class DefaultMavenPluginManager
         }
     }
 
-    private void populatePluginFields( Object mojo, MojoDescriptor 
mojoDescriptor, ClassRealm pluginRealm,
-                                       PlexusConfiguration configuration, 
ExpressionEvaluator expressionEvaluator )
+    private void populatePluginFields( Object mojo, String executionId, 
MojoDescriptor mojoDescriptor,
+                                       ClassRealm pluginRealm, 
PlexusConfiguration configuration,
+                                       ExpressionEvaluator expressionEvaluator 
)
         throws PluginConfigurationException
     {
         ComponentConfigurator configurator = null;
@@ -644,8 +646,8 @@ public class DefaultMavenPluginManager
             ValidatingConfigurationListener validator =
                 new ValidatingConfigurationListener( mojo, mojoDescriptor, 
listener );
 
-            logger.debug(
-                "Configuring mojo '" + mojoDescriptor.getId() + "' with " + 
configuratorId + " configurator -->" );
+            logger.debug( "Configuring mojo '" + mojoDescriptor.getId() + "' 
execution '" + executionId + "' with "
+                + configuratorId + " configurator -->" );
 
             configurator.configureComponent( mojo, configuration, 
expressionEvaluator, pluginRealm, validator );