[MNG-8283] More mvnd related changes

maven-cli/src/main/java/org/apache/maven/cling/invoker/PlexusContainerCapsuleFactory.java

@@ -28,6 +28,7 @@
 import java.util.function.Function;
 
 import com.google.inject.AbstractModule;
+import com.google.inject.Module;
 import org.apache.maven.api.Constants;
 import org.apache.maven.api.cli.InvokerException;
 import org.apache.maven.api.cli.InvokerRequest;
@@ -103,16 +104,9 @@ protected PlexusContainer container(C context) throws Exception {
             exportedArtifacts.addAll(extension.getExportedArtifacts());
             exportedPackages.addAll(extension.getExportedPackages());
         }
-        final CoreExports exports = new CoreExports(containerRealm, exportedArtifacts, exportedPackages);
+        CoreExports exports = new CoreExports(containerRealm, exportedArtifacts, exportedPackages);
         Thread.currentThread().setContextClassLoader(containerRealm);
-        DefaultPlexusContainer container = new DefaultPlexusContainer(cc, new AbstractModule() {
-            @Override
-            protected void configure() {
-                bind(ILoggerFactory.class).toInstance(context.loggerFactory);
-                bind(CoreExports.class).toInstance(exports);
-                bind(MessageBuilderFactory.class).toInstance(context.invokerRequest.messageBuilderFactory());
-            }
-        });
+        DefaultPlexusContainer container = new DefaultPlexusContainer(cc, getCustomModule(context, exports));
 
         // NOTE: To avoid inconsistencies, we'll use the TCCL exclusively for lookups
         container.setLookupRealm(null);
@@ -157,6 +151,22 @@ protected void configure() {
         return container;
     }
 
+    /**
+     * Note: overriding this method should be avoided. Preferred way to replace Maven components is the "normal" way
+     * where the components are on index (are annotated with JSR330 annotations and Sisu index is created) and, they
+     * have priorities set.
+     */
+    protected Module getCustomModule(C context, CoreExports exports) {
+        return new AbstractModule() {
+            @Override
+            protected void configure() {
+                bind(ILoggerFactory.class).toInstance(context.loggerFactory);
+                bind(CoreExports.class).toInstance(exports);
+                bind(MessageBuilderFactory.class).toInstance(context.invokerRequest.messageBuilderFactory());
+            }
+        };
+    }
+
     protected void customizeContainerConfiguration(C context, ContainerConfiguration configuration) throws Exception {}
 
     protected void customizeContainer(C context, PlexusContainer container) throws Exception {}

maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/DefaultMavenInvoker.java

@@ -76,7 +76,7 @@ public abstract class DefaultMavenInvoker<
         extends LookupInvoker<O, R, C> implements MavenInvoker<R> {
 
     @SuppressWarnings("VisibilityModifier")
-    protected static class MavenContext<
+    public static class MavenContext<
                     O extends MavenOptions,
                     R extends MavenInvokerRequest<O>,
                     C extends DefaultMavenInvoker.MavenContext<O, R, C>>

maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/local/DefaultLocalMavenInvoker.java

@@ -29,7 +29,7 @@ public class DefaultLocalMavenInvoker
                 MavenOptions, MavenInvokerRequest<MavenOptions>, DefaultLocalMavenInvoker.LocalContext>
         implements LocalMavenInvoker {
 
-    protected static class LocalContext
+    public static class LocalContext
             extends DefaultMavenInvoker.MavenContext<
                     MavenOptions, MavenInvokerRequest<MavenOptions>, DefaultLocalMavenInvoker.LocalContext> {
         protected LocalContext(DefaultLocalMavenInvoker invoker, MavenInvokerRequest<MavenOptions> invokerRequest) {

maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/resident/DefaultResidentMavenInvoker.java

@@ -37,7 +37,7 @@ public class DefaultResidentMavenInvoker
                 ResidentMavenOptions, ResidentMavenInvokerRequest, DefaultResidentMavenInvoker.LocalContext>
         implements ResidentMavenInvoker {
 
-    protected static class LocalContext
+    public static class LocalContext
             extends DefaultMavenInvoker.MavenContext<
                     ResidentMavenOptions, ResidentMavenInvokerRequest, DefaultResidentMavenInvoker.LocalContext> {