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/03/26 03:44:34 UTC
[maven] branch MNG-7438 updated (cbd0215 -> 502bd93)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MNG-7438
in repository https://gitbox.apache.org/repos/asf/maven.git.
omit cbd0215 [MNG-7438] add execution id to "configuring mojo" debug message
new 6daedb2 [MNG-7438] add execution id to "configuring mojo" debug message
new 502bd93 [MNG-7438] rephrase "Configuring" to "Loading" mojo "from plugin realm"
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (cbd0215)
\
N -- N -- N refs/heads/MNG-7438 (502bd93)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../maven/plugin/internal/DefaultMavenPluginManager.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
[maven] 01/02: [MNG-7438] add execution id to "configuring mojo" debug message
Posted by hb...@apache.org.
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 6daedb2c791abe7b192c15380db4dcff74d57efd
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
---
.../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..d269d03 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 execution '" + mojoDescriptor.getId() + ':' + executionId + "' with "
+ + configuratorId + " configurator -->" );
configurator.configureComponent( mojo, configuration, expressionEvaluator, pluginRealm, validator );
[maven] 02/02: [MNG-7438] rephrase "Configuring" to "Loading" mojo "from plugin realm"
Posted by hb...@apache.org.
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 502bd934976aa7702e07f82b38681e803b58efae
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat Mar 26 04:37:07 2022 +0100
[MNG-7438] 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 | 12 ++++++------
1 file changed, 6 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 d269d03..0bc603d 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,8 +609,8 @@ public class DefaultMavenPluginManager
ExpressionEvaluator expressionEvaluator = new PluginParameterExpressionEvaluator( session, mojoExecution );
- populatePluginFields( mojo, mojoExecution.getExecutionId(), mojoDescriptor, pluginRealm, pomConfiguration,
- expressionEvaluator );
+ populateMojoExecutionFields( mojo, mojoExecution.getExecutionId(), mojoDescriptor, pluginRealm,
+ pomConfiguration, expressionEvaluator );
return mojo;
}
@@ -621,9 +621,9 @@ public class DefaultMavenPluginManager
}
}
- private void populatePluginFields( Object mojo, String executionId, 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;