[maven] 02/02: [MNG-6762] Reference settings.xml file relatively to the .mvn directory instead of working directory.

[martinkanters]

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

martinkanters pushed a commit to branch MNG-6762-multi-module-relative-settings
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 2d3682763062c326c24c8718e37124f7248097b9
Author: Martin Kanters <martinkant...@apache.org>
AuthorDate: Tue Oct 5 15:11:50 2021 +0200

    [MNG-6762] Reference settings.xml file relatively to the .mvn directory 
instead of working directory.
---
 .../maven/cli/configuration/SettingsXmlConfigurationProcessor.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
 
b/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
index ef0c553..dab8f59 100644
--- 
a/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
+++ 
b/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
@@ -90,7 +90,7 @@ public class SettingsXmlConfigurationProcessor
         throws Exception
     {
         CommandLine commandLine = cliRequest.getCommandLine();
-        String workingDirectory = cliRequest.getWorkingDirectory();
+        String multiModuleDirectory = 
cliRequest.getMultiModuleProjectDirectory().toString();
         MavenExecutionRequest request = cliRequest.getRequest();
 
         File userSettingsFile;
@@ -98,7 +98,7 @@ public class SettingsXmlConfigurationProcessor
         if ( commandLine.hasOption( CLIManager.ALTERNATE_USER_SETTINGS ) )
         {
             userSettingsFile = new File( commandLine.getOptionValue( 
CLIManager.ALTERNATE_USER_SETTINGS ) );
-            userSettingsFile = resolveFile( userSettingsFile, workingDirectory 
);
+            userSettingsFile = resolveFile( userSettingsFile, 
multiModuleDirectory );
 
             if ( !userSettingsFile.isFile() )
             {
@@ -116,7 +116,7 @@ public class SettingsXmlConfigurationProcessor
         if ( commandLine.hasOption( CLIManager.ALTERNATE_GLOBAL_SETTINGS ) )
         {
             globalSettingsFile = new File( commandLine.getOptionValue( 
CLIManager.ALTERNATE_GLOBAL_SETTINGS ) );
-            globalSettingsFile = resolveFile( globalSettingsFile, 
workingDirectory );
+            globalSettingsFile = resolveFile( globalSettingsFile, 
multiModuleDirectory );
 
             if ( !globalSettingsFile.isFile() )
             {