You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/04/15 07:56:41 UTC
[maven] 01/01: [MNG-7438] add execution id to "configuring mojo" debug message
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-7438
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 44083ddf1c76a5bac9b00881e9b12d5febced882
Author: Hervé Boutemy <hb...@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 9fdc1f624..6d85b887d 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
@@ -515,7 +515,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
@@ -609,7 +609,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;
}
@@ -620,8 +621,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;
@@ -644,8 +646,8 @@ public class DefaultMavenPluginManager
ValidatingConfigurationListener validator =
new ValidatingConfigurationListener( mojo, mojoDescriptor, listener, expressionEvaluator );
- 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 );