Repository: ignite Updated Branches: refs/heads/master 4ea7f926e -> 0cc2deeb6
IGNITE-8478 SqlLine run failure on Java 9 Signed-off-by: Andrey Gura <ag...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0cc2deeb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0cc2deeb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0cc2deeb Branch: refs/heads/master Commit: 0cc2deeb682804f6281dd1b7fe0432571cdb7744 Parents: 4ea7f92 Author: Ivanov Petr <piva...@gridgain.com> Authored: Mon May 14 13:44:56 2018 +0300 Committer: Andrey Gura <ag...@apache.org> Committed: Mon May 14 13:45:40 2018 +0300 ---------------------------------------------------------------------- modules/sqlline/bin/sqlline.bat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0cc2deeb/modules/sqlline/bin/sqlline.bat ---------------------------------------------------------------------- diff --git a/modules/sqlline/bin/sqlline.bat b/modules/sqlline/bin/sqlline.bat index 9016628..d516ba1 100644 --- a/modules/sqlline/bin/sqlline.bat +++ b/modules/sqlline/bin/sqlline.bat @@ -28,7 +28,7 @@ if "%OS%" == "Windows_NT" setlocal if defined JAVA_HOME goto checkJdk echo %0, ERROR: echo JAVA_HOME environment variable is not found. - echo Please point JAVA_HOME variable to location of JDK 1.7 or JDK 1.8. + echo Please point JAVA_HOME variable to location of JDK 1.8 or JDK 9. echo You can also download latest JDK at http://java.com/download. goto error_finish @@ -37,16 +37,16 @@ goto error_finish if exist "%JAVA_HOME%\bin\java.exe" goto checkJdkVersion echo %0, ERROR: echo JAVA is not found in JAVA_HOME=%JAVA_HOME%. - echo Please point JAVA_HOME variable to installation of JDK 1.7 or JDK 1.8. + echo Please point JAVA_HOME variable to installation of JDK 1.8 or JDK 9. echo You can also download latest JDK at http://java.com/download. goto error_finish :checkJdkVersion -"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr "1\.[78]\." > 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. - echo Please point JAVA_HOME variable to installation of JDK 1.7 or JDK 1.8. + echo Please point JAVA_HOME variable to installation of JDK 1.8 or JDK 9. echo You can also download latest JDK at http://java.com/download. goto error_finish
