Merge pull request #10741 from aloubyansky/maven-home-property

Added maven.settings system property
quarkusio · Jul 16, 2020 · 71cd43e · 71cd43e
2 parents b663ebf + 092db1f
commit 71cd43e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/docs/src/main/asciidoc/getting-started-testing.adoc b/docs/src/main/asciidoc/getting-started-testing.adoc
@@ -732,6 +732,8 @@ Most IDEs offer the possibility to run a selected class as JUnit test directly.
 
 * `maven.home` (only if there are any custom settings in `${maven.home}/conf/settings.mxl`, see link:maven-tooling[Maven Guide])
 
+* `maven.settings` (in case a custom version of `settings.xml` file should be used for the tests)
+
 === Eclipse separate JRE definition
 
 Copy your current "Installed JRE" definition into a new one, where you will add the properties as a new VM arguments:

diff --git a/...ven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java b/...ven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java
@@ -87,6 +87,7 @@ public class BootstrapMavenContext {
     private static final String MAVEN_DOT_HOME = "maven.home";
     private static final String MAVEN_HOME = "MAVEN_HOME";
     private static final String MAVEN_PROJECTBASEDIR = "MAVEN_PROJECTBASEDIR";
+    private static final String MAVEN_SETTINGS = "maven.settings";
     private static final String SETTINGS_XML = "settings.xml";
 
     private static final String userHome = PropertyUtils.getUserHome();
@@ -145,7 +146,11 @@ public BootstrapMavenContext(BootstrapMavenContextConfig<?> config)
         }
         userSettings = config.userSettings == null
                 ? resolveSettingsFile(getCliOptions().getOptionValue(BootstrapMavenOptions.ALTERNATE_USER_SETTINGS),
-                        () -> new File(userMavenConfigurationHome, SETTINGS_XML))
+                        () -> {
+                            final String quarkusMavenSettings = PropertyUtils.getProperty(MAVEN_SETTINGS);
+                            return quarkusMavenSettings == null ? new File(userMavenConfigurationHome, SETTINGS_XML)
+                                    : new File(quarkusMavenSettings);
+                        })
                 : config.userSettings;
         globalSettings = resolveSettingsFile(getCliOptions().getOptionValue(BootstrapMavenOptions.ALTERNATE_GLOBAL_SETTINGS),
                 () -> {