Skip to content

Check MAVEN_HOME env var instead of M2_HOME in bootstrap #5607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2019
Merged

Check MAVEN_HOME env var instead of M2_HOME in bootstrap #5607

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...ootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenRepoInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ public class MavenRepoInitializer {
private static final String BASEDIR = "basedir";
private static final String MAVEN_CMD_LINE_ARGS = "MAVEN_CMD_LINE_ARGS";
private static final String DOT_M2 = ".m2";
private static final String MAVEN_HOME = "maven.home";
private static final String M2_HOME = "M2_HOME";
private static final String MAVEN_DOT_HOME = "maven.home";
private static final String MAVEN_HOME = "MAVEN_HOME";
private static final String SETTINGS_XML = "settings.xml";

private static final String userHome = PropertyUtils.getUserHome();
private static final File userMavenConfigurationHome = new File(userHome, DOT_M2);
private static final String envM2Home = System.getenv(M2_HOME);
private static final String envM2Home = System.getenv(MAVEN_HOME);
private static final File USER_SETTINGS_FILE;
private static final File GLOBAL_SETTINGS_FILE;

Expand All @@ -109,7 +109,7 @@ public class MavenRepoInitializer {
File f = userSettings != null ? resolveUserSettings(userSettings) : new File(userMavenConfigurationHome, SETTINGS_XML);
USER_SETTINGS_FILE = f != null && f.exists() ? f : null;

f = globalSettings != null ? resolveUserSettings(globalSettings) : new File(PropertyUtils.getProperty(MAVEN_HOME, envM2Home != null ? envM2Home : ""), "conf/settings.xml");
f = globalSettings != null ? resolveUserSettings(globalSettings) : new File(PropertyUtils.getProperty(MAVEN_DOT_HOME, envM2Home != null ? envM2Home : ""), "conf/settings.xml");
GLOBAL_SETTINGS_FILE = f != null && f.exists() ? f : null;
}

Expand Down