apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-26 23:45:47 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix #53 Using MAVEN_HOME may clash with other tools

Browse Source
This commit is contained in:
Peter Palaga
2020-08-12 11:47:38 +02:00
parent 44e29598ff
commit 156ab7e323
11 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration-tests/src/test/java/org/jboss/fuse/mvnd/it/InstallDaemonNativeIT.java
View File

@@ -66,7 +66,7 @@ public class InstallDaemonNativeIT {
Environment.MVND_DIST_URI.asCommandLineProperty(mvndDistUri),
Environment.MVND_PROPERTIES_PATH.asCommandLineProperty(mvndPropertiesPath.toString()),
Environment.JAVA_HOME.asCommandLineProperty(layout.javaHome().toString()),
Environment.MAVEN_HOME.asCommandLineProperty(mavenHome.toString()))
Environment.MVND_HOME.asCommandLineProperty(mavenHome.toString()))
.assertSuccess();
Assertions.assertThat(mvndPropertiesPath).exists();

4
integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/NativeTestClient.java
View File

@@ -69,8 +69,8 @@ public class NativeTestClient implements Client {
.redirectErrorStream(true);
final Map<String, String> env = builder.environment();
if (!Environment.MAVEN_HOME.hasCommandLineProperty(args)) {
env.put("MAVEN_HOME", System.getProperty("mvnd.home"));
if (!Environment.MVND_HOME.hasCommandLineProperty(args)) {
env.put("MVND_HOME", System.getProperty("mvnd.home"));
}
if (!Environment.JAVA_HOME.hasCommandLineProperty(args)) {
env.put("JAVA_HOME", System.getProperty("java.home"));