[mojohaus#48] just swap $JAVA_OPTS @EXTRA_JVM_ARGUMENTS@ to env is la…

…st and has a chance for its values to take precedence
nezda · Mar 28, 2017 · e35e9f1 · e35e9f1
1 parent 974ee6c
commit e35e9f1
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/...en-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/unixBinTemplate b/...en-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/unixBinTemplate
@@ -99,7 +99,7 @@ if $cygwin; then
   [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
 fi
 
-exec "$JAVACMD" $JAVA_OPTS @EXTRA_JVM_ARGUMENTS@ \
+exec "$JAVACMD" @EXTRA_JVM_ARGUMENTS@ $JAVA_OPTS \
   -classpath "$CLASSPATH" \
   -Dapp.name="@APP_NAME@" \
   -Dapp.pid="$$" \

diff --git a/...plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/windowsBinTemplate b/...plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/windowsBinTemplate
@@ -64,7 +64,7 @@ if NOT "%CLASSPATH_PREFIX%" == "" set CLASSPATH=%CLASSPATH_PREFIX%;%CLASSPATH%
 @REM Reaching here means variables are defined and arguments have been captured
 :endInit
 
-%JAVACMD% %JAVA_OPTS% #EXTRA_JVM_ARGUMENTS# -classpath %CLASSPATH% -Dapp.name="#APP_NAME#" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" #MAINCLASS# #APP_ARGUMENTS#%CMD_LINE_ARGS%
+%JAVACMD% #EXTRA_JVM_ARGUMENTS# %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="#APP_NAME#" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" #MAINCLASS# #APP_ARGUMENTS#%CMD_LINE_ARGS%
 if %ERRORLEVEL% NEQ 0 goto error
 goto end
 

diff --git a/...resources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-basedir-test b/...resources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-basedir-test
@@ -117,7 +117,7 @@ if $cygwin; then
   [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
 fi
 
-exec "$JAVACMD" $JAVA_OPTS Yo dude xyz="$BASEDIR" \
+exec "$JAVACMD" Yo dude xyz="$BASEDIR" $JAVA_OPTS \
   -classpath "$CLASSPATH" \
   -Dapp.name="basedir-test" \
   -Dapp.pid="$$" \

diff --git a/...urces/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-basedir-test.bat b/...urces/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-basedir-test.bat
@@ -82,7 +82,7 @@ if NOT "%CLASSPATH_PREFIX%" == "" set CLASSPATH=%CLASSPATH_PREFIX%;%CLASSPATH%
 @REM Reaching here means variables are defined and arguments have been captured
 :endInit
 
-%JAVACMD% %JAVA_OPTS% Yo dude xyz="%BASEDIR%" -classpath %CLASSPATH% -Dapp.name="basedir-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" foo.Bar %CMD_LINE_ARGS%
+%JAVACMD% Yo dude xyz="%BASEDIR%" %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="basedir-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" foo.Bar %CMD_LINE_ARGS%
 if %ERRORLEVEL% NEQ 0 goto error
 goto end
 

diff --git a/...st/resources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-repo-test b/...st/resources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-repo-test
@@ -117,7 +117,7 @@ if $cygwin; then
   [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
 fi
 
-exec "$JAVACMD" $JAVA_OPTS Yo dude xyz="$REPO" \
+exec "$JAVACMD" Yo dude xyz="$REPO" $JAVA_OPTS \
   -classpath "$CLASSPATH" \
   -Dapp.name="repo-test" \
   -Dapp.pid="$$" \

diff --git a/...esources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-repo-test.bat b/...esources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-repo-test.bat
@@ -82,7 +82,7 @@ if NOT "%CLASSPATH_PREFIX%" == "" set CLASSPATH=%CLASSPATH_PREFIX%;%CLASSPATH%
 @REM Reaching here means variables are defined and arguments have been captured
 :endInit
 
-%JAVACMD% %JAVA_OPTS% Yo dude xyz="%REPO%" -classpath %CLASSPATH% -Dapp.name="repo-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" foo.Bar %CMD_LINE_ARGS%
+%JAVACMD% Yo dude xyz="%REPO%" %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="repo-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" foo.Bar %CMD_LINE_ARGS%
 if %ERRORLEVEL% NEQ 0 goto error
 goto end
 

diff --git a/...codehaus/mojo/appassembler/daemon/script/background/expected-false-showConsoleWindow-test b/...codehaus/mojo/appassembler/daemon/script/background/expected-false-showConsoleWindow-test
@@ -117,7 +117,7 @@ if $cygwin; then
   [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
 fi
 
-exec "$JAVACMD" $JAVA_OPTS Yo dude \
+exec "$JAVACMD" Yo dude $JAVA_OPTS \
   -classpath "$CLASSPATH" \
   -Dapp.name="test" \
   -Dapp.pid="$$" \

diff --git a/...haus/mojo/appassembler/daemon/script/background/expected-false-showConsoleWindow-test.bat b/...haus/mojo/appassembler/daemon/script/background/expected-false-showConsoleWindow-test.bat
@@ -82,7 +82,7 @@ if NOT "%CLASSPATH_PREFIX%" == "" set CLASSPATH=%CLASSPATH_PREFIX%;%CLASSPATH%
 @REM Reaching here means variables are defined and arguments have been captured
 :endInit
 
-%JAVACMD% %JAVA_OPTS% Yo dude -classpath %CLASSPATH% -Dapp.name="test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" foo.Bar %CMD_LINE_ARGS%
+%JAVACMD% Yo dude %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" foo.Bar %CMD_LINE_ARGS%
 if %ERRORLEVEL% NEQ 0 goto error
 goto end
 

diff --git a/...aven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test b/...aven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test
@@ -117,7 +117,7 @@ if $cygwin; then
   [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
 fi
 
-exec "$JAVACMD" $JAVA_OPTS Yo dude \
+exec "$JAVACMD" Yo dude $JAVA_OPTS \
   -classpath "$CLASSPATH" \
   -Dapp.name="test" \
   -Dapp.pid="$$" \

diff --git a/...rc/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test-endorsed-lib b/...rc/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test-endorsed-lib
@@ -117,7 +117,7 @@ if $cygwin; then
   [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
 fi
 
-exec "$JAVACMD" $JAVA_OPTS Yo dude \
+exec "$JAVACMD" Yo dude $JAVA_OPTS \
   -classpath "$CLASSPATH" \
   -Dapp.name="test-endorsed-lib" \
   -Dapp.pid="$$" \

diff --git a/...est/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test-endorsed-lib.bat b/...est/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test-endorsed-lib.bat
@@ -82,7 +82,7 @@ if NOT "%CLASSPATH_PREFIX%" == "" set CLASSPATH=%CLASSPATH_PREFIX%;%CLASSPATH%
 @REM Reaching here means variables are defined and arguments have been captured
 :endInit
 
-%JAVACMD% %JAVA_OPTS% Yo dude -classpath %CLASSPATH% -Dapp.name="test-endorsed-lib" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" foo.Bar %CMD_LINE_ARGS%
+%JAVACMD% Yo dude %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="test-endorsed-lib" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" foo.Bar %CMD_LINE_ARGS%
 if %ERRORLEVEL% NEQ 0 goto error
 goto end
 

diff --git a/...-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test.bat b/...-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test.bat
@@ -82,7 +82,7 @@ if NOT "%CLASSPATH_PREFIX%" == "" set CLASSPATH=%CLASSPATH_PREFIX%;%CLASSPATH%
 @REM Reaching here means variables are defined and arguments have been captured
 :endInit
 
-%JAVACMD% %JAVA_OPTS% Yo dude -classpath %CLASSPATH% -Dapp.name="test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" foo.Bar %CMD_LINE_ARGS%
+%JAVACMD% Yo dude %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" foo.Bar %CMD_LINE_ARGS%
 if %ERRORLEVEL% NEQ 0 goto error
 goto end