[MNG-6003] Drastically reduce JAVA_HOME discovery code All special handling has been removed. JAVA_HOME must be set properly by the user if necessary. Error messages have been graciously borrowed from the Tomcat start scripts.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b11bee54 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b11bee54 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b11bee54 Branch: refs/heads/DEPMGMT-INCLUDE Commit: b11bee54338e3449d2ffe70a1be27a55c0614859 Parents: 1953635 Author: Michael Osipov <micha...@apache.org> Authored: Fri Apr 15 22:17:15 2016 +0200 Committer: Christian Schulte <schu...@apache.org> Committed: Tue Jan 31 18:26:38 2017 +0100 ---------------------------------------------------------------------- apache-maven/src/bin/mvn.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/b11bee54/apache-maven/src/bin/mvn.cmd ---------------------------------------------------------------------- diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd index 17fae03..ecee20c 100644 --- a/apache-maven/src/bin/mvn.cmd +++ b/apache-maven/src/bin/mvn.cmd @@ -30,7 +30,7 @@ @REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' @echo off @REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% +@if "%MAVEN_BATCH_ECHO%"=="on" echo %MAVEN_BATCH_ECHO% @REM Execute a user defined script before this one if not "%MAVEN_SKIP_RC%"=="" goto skipRcPre @@ -109,7 +109,7 @@ cd "%EXEC_DIR%" :endDetectBaseDir set "jvmConfig=\.mvn\jvm.config" -if not exist "%MAVEN_PROJECTBASEDIR%%jvmConfig%" goto endReadAdditionalConfig +if not exist "%MAVEN_PROJECTBASEDIR%%jvmConfig%" goto endReadAdditionalConfig @setlocal EnableExtensions EnableDelayedExpansion for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
