SDK-227 When using multiple JAVA versions the OpenMRS SDK ignores MAV…

…EN_OPTS setting
openmrs · Dec 11, 2017 · cab5a1d · cab5a1d
1 parent 82a9ace
commit cab5a1d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/maven-plugin/src/main/java/org/openmrs/maven/plugins/Run.java b/maven-plugin/src/main/java/org/openmrs/maven/plugins/Run.java
@@ -171,7 +171,13 @@ private void runInFork(Server server) throws MojoExecutionException, MojoFailure
 
 		String mavenOpts = mavenSession.getRequest().getUserProperties().getProperty("MAVEN_OPTS");
 		if (StringUtils.isBlank(mavenOpts)) {
-			mavenOpts = mavenSession.getRequest().getSystemProperties().getProperty("MAVEN_OPTS", "");
+			mavenOpts = mavenSession.getRequest().getUserProperties().getProperty("env.MAVEN_OPTS");
+		}
+		if (StringUtils.isBlank(mavenOpts)) {
+			mavenOpts = mavenSession.getRequest().getSystemProperties().getProperty("MAVEN_OPTS");
+		}
+		if (StringUtils.isBlank(mavenOpts)) {
+			mavenOpts = mavenSession.getRequest().getSystemProperties().getProperty("env.MAVEN_OPTS");
 		}
 
 		mavenOpts = adjustXmxToAtLeast(mavenOpts, 768);