Fixes

apache · Sep 30, 2024 · 83fe7a5 · 83fe7a5
1 parent c1ef311
commit 83fe7a5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/DIInvoker.java b/maven-cli/src/main/java/org/apache/maven/cling/invoker/DIInvoker.java
@@ -46,6 +46,7 @@
 import org.apache.maven.api.services.MessageBuilder;
 import org.apache.maven.api.services.MessageBuilderFactory;
 import org.apache.maven.artifact.InvalidRepositoryException;
+import org.apache.maven.artifact.repository.MavenArtifactRepository;
 import org.apache.maven.bridge.MavenRepositorySystem;
 import org.apache.maven.cli.CLIReportingUtils;
 import org.apache.maven.cli.ExtensionConfigurationModule;
@@ -627,6 +628,7 @@ protected boolean mayDisableInteractiveMode(C context, boolean proposedInteracti
     }
 
     protected Path localRepositoryPath(Context context) {
+        // user override
         String userDefinedLocalRepo = context.invokerRequest.userProperties().get(Constants.MAVEN_REPO_LOCAL);
         if (userDefinedLocalRepo == null) {
             userDefinedLocalRepo = context.invokerRequest.systemProperties().get(Constants.MAVEN_REPO_LOCAL);
@@ -637,9 +639,17 @@ protected Path localRepositoryPath(Context context) {
                         + "usually located at ${session.rootDirectory}/.mvn/maven.properties.");
             }
         }
+        // settings
         if (userDefinedLocalRepo == null) {
             userDefinedLocalRepo = context.effectiveSettings.getLocalRepository();
         }
+        // defaults
+        if (userDefinedLocalRepo == null) {
+            userDefinedLocalRepo = context.cwdResolver
+                    .apply(context.invokerRequest.userProperties().get(Constants.MAVEN_USER_CONF))
+                    .resolve("repository")
+                    .toString();
+        }
         return context.cwdResolver.apply(userDefinedLocalRepo);
     }
 
@@ -649,6 +659,9 @@ protected void populateRequest(C context, MavenExecutionRequest request) {
         Options options = context.invokerRequest.options();
         request.setLoggingLevel(context.plexusLoggingLevel);
         request.setLocalRepositoryPath(context.localRepositoryPath.toFile());
+        request.setLocalRepository(new MavenArtifactRepository(
+                "local", "file://" + context.localRepositoryPath.toUri().getRawPath(), null, null, null));
+
         request.setInteractiveMode(context.interactive);
         request.setShowErrors(options.showErrors().orElse(false));
         request.setBaseDirectory(context.invokerRequest.topDirectory().toFile());
@@ -659,6 +672,9 @@ protected void populateRequest(C context, MavenExecutionRequest request) {
 
         request.setRootDirectory(context.invokerRequest.rootDirectory());
         request.setTopDirectory(context.invokerRequest.topDirectory());
+
+        request.addPluginGroup("org.apache.maven.plugins");
+        request.addPluginGroup("org.codehaus.mojo");
     }
 
     protected void populateRequestFromSettings(MavenExecutionRequest request, Settings settings) {

diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/local/LocalMavenInvoker.java b/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/local/LocalMavenInvoker.java
@@ -119,6 +119,7 @@ protected void prepare(LocalContext localContext) {
         mavenExecutionRequest.setLoggingLevel(MavenExecutionRequest.LOGGING_LEVEL_INFO);
         mavenExecutionRequest.setDegreeOfConcurrency(1);
         mavenExecutionRequest.setBuilderId("singlethreaded");
+
         localContext.mavenExecutionRequest = mavenExecutionRequest;
     }
 
@@ -441,8 +442,7 @@ protected void performProfileActivation(LocalContext localContext, ProfileActiva
     }
 
     protected int doExecute(LocalContext localContext) throws Exception {
-        MavenExecutionRequest request =
-                localContext.mavenExecutionRequestPopulator.populateDefaults(localContext.mavenExecutionRequest);
+        MavenExecutionRequest request = localContext.mavenExecutionRequest;
 
         // why? No way to disable caching?
         if (localContext.mavenExecutionRequest.getRepositoryCache() == null) {