(maven) 01/02: Use role hint when loading a v4 mojo

[gnodet]

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

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 07b256ae039c82cb37c669aa3ec6318eea8158e3
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Feb 9 18:12:40 2024 +0100

    Use role hint when loading a v4 mojo
---
 .../org/apache/maven/plugin/internal/DefaultMavenPluginManager.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 cf74e61f75..ca9b80db45 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
@@ -37,6 +37,7 @@ import org.apache.maven.api.xml.XmlNode;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.classrealm.ClassRealmManager;
 import org.apache.maven.di.Injector;
+import org.apache.maven.di.Key;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.execution.scope.internal.MojoExecutionScope;
 import org.apache.maven.execution.scope.internal.MojoExecutionScopeModule;
@@ -534,7 +535,8 @@ public class DefaultMavenPluginManager implements 
MavenPluginManager {
             injector.bindInstance(Project.class, project);
             injector.bindInstance(org.apache.maven.api.MojoExecution.class, 
execution);
             injector.bindInstance(org.apache.maven.api.plugin.Log.class, log);
-            mojo = 
mojoInterface.cast(injector.getInstance(mojoDescriptor.getImplementationClass()));
+            mojo = mojoInterface.cast(injector.getInstance(
+                    Key.of(mojoDescriptor.getImplementationClass(), 
mojoDescriptor.getRoleHint())));
 
         } catch (Exception e) {
             throw new PluginContainerException(mojoDescriptor, pluginRealm, 
"Unable to lookup Mojo", e);