IGNITE-7576 Scripts: fix version check regexp to handle OpenJDK This closes #3456
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5d95f0bf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5d95f0bf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5d95f0bf Branch: refs/heads/ignite-7573 Commit: 5d95f0bfd5266b46323a516b77458debc5969fba Parents: 8f2d25f Author: David Wimsey <[email protected]> Authored: Wed Jan 31 11:47:25 2018 +0300 Committer: Pavel Tupitsyn <[email protected]> Committed: Wed Jan 31 11:47:25 2018 +0300 ---------------------------------------------------------------------- bin/control.bat | 4 ++-- bin/ignite.bat | 4 ++-- bin/ignitevisorcmd.bat | 4 ++-- bin/include/functions.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5d95f0bf/bin/control.bat ---------------------------------------------------------------------- diff --git a/bin/control.bat b/bin/control.bat index 8a6821a..0cdefa8 100644 --- a/bin/control.bat +++ b/bin/control.bat @@ -42,7 +42,7 @@ if exist "%JAVA_HOME%\bin\java.exe" goto checkJdkVersion goto error_finish :checkJdkVersion -"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"java version .9\..*" /c:"java version .1\.8\..*" > nul +"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"version .9\..*" /c:"java version .1\.8\..*" > nul if %ERRORLEVEL% equ 0 goto checkIgniteHome1 echo %0, ERROR: echo The version of JAVA installed in %JAVA_HOME% is incorrect. @@ -201,7 +201,7 @@ if "%MAIN_CLASS%" == "" set MAIN_CLASS=org.apache.ignite.internal.commandline.Co :: :: Final JVM_OPTS for Java 9 compatibility :: -"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"java version .9\..*" > nul && set JVM_OPTS=--add-exports java.base/jdk.internal.misc=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-exports java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED --add-exports jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-modules java.xml.bind %JVM_OPTS% +"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"version .9\..*" > nul && set JVM_OPTS=--add-exports java.base/jdk.internal.misc=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-exports java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED --add-exports jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-modules java.xml.bind %JVM_OPTS% if "%INTERACTIVE%" == "1" ( "%JAVA_HOME%\bin\java.exe" %JVM_OPTS% %QUIET% %RESTART_SUCCESS_OPT% %JMX_MON% ^ http://git-wip-us.apache.org/repos/asf/ignite/blob/5d95f0bf/bin/ignite.bat ---------------------------------------------------------------------- diff --git a/bin/ignite.bat b/bin/ignite.bat index 6201ed4..301dad9 100644 --- a/bin/ignite.bat +++ b/bin/ignite.bat @@ -42,7 +42,7 @@ if exist "%JAVA_HOME%\bin\java.exe" goto checkJdkVersion goto error_finish :checkJdkVersion -"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"java version .9\..*" /c:"java version .1\.8\..*" > nul +"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"version .9\..*" /c:"version .1\.8\..*" > nul if %ERRORLEVEL% equ 0 goto checkIgniteHome1 echo %0, ERROR: echo The version of JAVA installed in %JAVA_HOME% is incorrect. @@ -216,7 +216,7 @@ if "%MAIN_CLASS%" == "" set MAIN_CLASS=org.apache.ignite.startup.cmdline.Command :: :: Final JVM_OPTS for Java 9 compatibility :: -"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"java version .9\..*" > nul && set JVM_OPTS=--add-exports java.base/jdk.internal.misc=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-exports java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED --add-exports jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-modules java.xml.bind %JVM_OPTS% +"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"version .9\..*" > nul && set JVM_OPTS=--add-exports java.base/jdk.internal.misc=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-exports java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED --add-exports jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-modules java.xml.bind %JVM_OPTS% if "%INTERACTIVE%" == "1" ( "%JAVA_HOME%\bin\java.exe" %JVM_OPTS% %QUIET% %RESTART_SUCCESS_OPT% %JMX_MON% ^ http://git-wip-us.apache.org/repos/asf/ignite/blob/5d95f0bf/bin/ignitevisorcmd.bat ---------------------------------------------------------------------- diff --git a/bin/ignitevisorcmd.bat b/bin/ignitevisorcmd.bat index a480a70..c12869b 100644 --- a/bin/ignitevisorcmd.bat +++ b/bin/ignitevisorcmd.bat @@ -42,7 +42,7 @@ if exist "%JAVA_HOME%\bin\java.exe" goto checkJdkVersion goto error_finish :checkJdkVersion -"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"java version .9\..*" /c:"java version .1\.8\..*" > nul +"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"version .9\..*" /c:"version .1\.8\..*" > nul if %ERRORLEVEL% equ 0 goto checkIgniteHome1 echo %0, ERROR: echo The version of JAVA installed in %JAVA_HOME% is incorrect. @@ -144,7 +144,7 @@ if "%ARGS%" == "" set ARGS=%* :: :: Final JVM_OPTS for Java 9 compatibility :: -"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"java version .9\..*" > nul && set JVM_OPTS_VISOR=--add-exports java.base/jdk.internal.misc=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-exports java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED --add-exports jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-modules java.xml.bind %JVM_OPTS% +"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"version .9\..*" > nul && set JVM_OPTS_VISOR=--add-exports java.base/jdk.internal.misc=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-exports java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED --add-exports jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-modules java.xml.bind %JVM_OPTS% :: :: Starts Visor console. http://git-wip-us.apache.org/repos/asf/ignite/blob/5d95f0bf/bin/include/functions.sh ---------------------------------------------------------------------- diff --git a/bin/include/functions.sh b/bin/include/functions.sh index 8f4570b..3fd1a72 100755 --- a/bin/include/functions.sh +++ b/bin/include/functions.sh @@ -63,7 +63,7 @@ checkJava() { exit 1 fi - "$JAVA" -version 2>&1 | grep -qE 'java version "(1.8.*|9.*)"' || { + "$JAVA" -version 2>&1 | grep -qE 'version "(1.8.*|9.*)"' || { echo "$0, ERROR:" echo "The version of JAVA installed in JAVA_HOME=$JAVA_HOME is incorrect." echo "Please point JAVA_HOME variable to installation of JDK 1.8 or JDK 9."
