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:40 UTC
[maven] branch MNG-7438 updated (502bd9349 -> 44083ddf1)
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 502bd9349 [MNG-7438] rephrase "Configuring" to "Loading" mojo "from plugin realm"
omit 6daedb2c7 [MNG-7438] add execution id to "configuring mojo" debug message
add 88d29675a [MNG-7413] fix anchor for XML elements with same name but not content
add f7b073f3e [MNG-7445] - Refactoring, remove the useless line Contribution by JakcyHu Gakiii
add c604db3c3 [MNG-7447] - Several Improvements by using Stream API
add a116f2500 [MNG-7452] - Remove JDK7 run on Maven 3.9.X Branch
add 083423fd5 [MNG-7441] Update version of loback
add 263cf9542 [MNG-7432] Resolver session contains non-MavenWorkspaceReader (#695)
add 08dff22a4 [MNG-7447] Fix ReactorReader unintended change (#709)
add ff0300b7c [MNG-5222] Maven 3 no longer logs warnings about deprecated plugin parameters
add 1ad5a1b1e [MNG-7454] Include resolver-transport-http in Maven 3.9.x (#710)
new 44083ddf1 [MNG-7438] add execution id to "configuring mojo" debug message
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 (502bd9349)
\
N -- N -- N refs/heads/MNG-7438 (44083ddf1)
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 1 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:
Jenkinsfile | 2 +-
apache-maven/pom.xml | 29 ++---
.../main/java/org/apache/maven/DefaultMaven.java | 6 +-
.../main/java/org/apache/maven/ReactorReader.java | 120 ++++++++++-----------
.../java/org/apache/maven/RepositoryUtils.java | 47 +++-----
.../resolver/filter/ExclusionArtifactFilter.java | 53 ++++-----
.../org/apache/maven/execution/MavenSession.java | 12 +--
.../maven/extension/internal/CoreExports.java | 14 ++-
.../DefaultRepositorySystemSessionFactory.java | 36 +++++++
.../aether/MavenChainedWorkspaceReader.java | 106 ++++++++++++++++++
.../lifecycle/mapping/DefaultLifecycleMapping.java | 32 +++++-
.../plugin/internal/DefaultMavenPluginManager.java | 2 +-
.../internal/ValidatingConfigurationListener.java | 115 +++++++++++++++++++-
.../settings/DefaultMavenSettingsBuilder.java | 6 +-
.../java/org/apache/maven/DefaultMavenTest.java | 29 +++++
.../default-maven/simple/pom.xml} | 6 +-
.../profile/DefaultProfileActivationContext.java | 27 ++---
maven-model/src/main/mdo/maven.mdo | 18 ++--
maven-resolver-provider/pom.xml | 6 +-
pom.xml | 23 ++--
20 files changed, 480 insertions(+), 209 deletions(-)
create mode 100644 maven-core/src/main/java/org/apache/maven/internal/aether/MavenChainedWorkspaceReader.java
copy maven-core/src/test/{resources/projects/badPom.xml => projects/default-maven/simple/pom.xml} (67%)
[maven] 01/01: [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 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 );