This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch ignite-2.7.5 in repository https://gitbox.apache.org/repos/asf/ignite.git
commit be0840dc983646236907efbd5f06c0cdc630d374 Author: Dmitriy Pavlov <[email protected]> AuthorDate: Fri Mar 22 19:16:35 2019 +0300 IGNITE-11600: Fix launch scripts for Java 12 (#6326) (cherry picked from commit 47a49cd08d52cb96b7872b291057005abcc0789b) --- bin/control.bat | 2 +- bin/control.sh | 2 +- bin/ignite-tf.sh | 2 +- bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/ignitevisorcmd.bat | 2 +- bin/ignitevisorcmd.sh | 2 +- modules/sqlline/bin/sqlline.bat | 2 +- modules/sqlline/bin/sqlline.sh | 2 +- modules/web-console/web-agent/bin/ignite-web-agent.bat | 2 +- modules/web-console/web-agent/bin/ignite-web-agent.sh | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bin/control.bat b/bin/control.bat index 7756f12..a984b65 100644 --- a/bin/control.bat +++ b/bin/control.bat @@ -233,7 +233,7 @@ if %MAJOR_JAVA_VER% GEQ 9 if %MAJOR_JAVA_VER% LSS 11 ( %JVM_OPTS% ) -if %MAJOR_JAVA_VER% == 11 ( +if %MAJOR_JAVA_VER% GEQ 11 ( set JVM_OPTS= ^ --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED ^ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED ^ diff --git a/bin/control.sh b/bin/control.sh index 90bd7b8..b764fc6 100755 --- a/bin/control.sh +++ b/bin/control.sh @@ -168,7 +168,7 @@ elif [ $version -gt 8 ] && [ $version -lt 11 ]; then --add-modules=java.xml.bind \ ${JVM_OPTS}" -elif [ $version -eq 11 ] ; then +elif [ $version -ge 11 ] ; then JVM_OPTS="\ --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED \ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \ diff --git a/bin/ignite-tf.sh b/bin/ignite-tf.sh index 9eb336a..e6dab2a 100644 --- a/bin/ignite-tf.sh +++ b/bin/ignite-tf.sh @@ -144,7 +144,7 @@ elif [ $version -gt 8 ] && [ $version -lt 11 ]; then --add-modules=java.xml.bind \ ${JVM_OPTS}" -elif [ $version -eq 11 ] ; then +elif [ $version -ge 11 ] ; then JVM_OPTS="\ --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED \ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \ diff --git a/bin/ignite.bat b/bin/ignite.bat index 2d5a08d..f5a323e 100644 --- a/bin/ignite.bat +++ b/bin/ignite.bat @@ -248,7 +248,7 @@ if %MAJOR_JAVA_VER% GEQ 9 if %MAJOR_JAVA_VER% LSS 11 ( %JVM_OPTS% ) -if "%MAJOR_JAVA_VER%" == "11" ( +if %MAJOR_JAVA_VER% GEQ 11 ( set JVM_OPTS= ^ --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED ^ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED ^ diff --git a/bin/ignite.sh b/bin/ignite.sh index 75681fe..bec40a3 100755 --- a/bin/ignite.sh +++ b/bin/ignite.sh @@ -174,7 +174,7 @@ elif [ $version -gt 8 ] && [ $version -lt 11 ]; then --add-modules=java.xml.bind \ ${JVM_OPTS}" -elif [ $version -eq 11 ] ; then +elif [ $version -ge 11 ] ; then JVM_OPTS="\ --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED \ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \ diff --git a/bin/ignitevisorcmd.bat b/bin/ignitevisorcmd.bat index 46645b8..892d165 100644 --- a/bin/ignitevisorcmd.bat +++ b/bin/ignitevisorcmd.bat @@ -177,7 +177,7 @@ if %MAJOR_JAVA_VER% GEQ 9 if %MAJOR_JAVA_VER% LSS 11 ( %JVM_OPTS% ) -if %MAJOR_JAVA_VER% == 11 ( +if %MAJOR_JAVA_VER% GEQ 11 ( set JVM_OPTS= ^ --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED ^ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED ^ diff --git a/bin/ignitevisorcmd.sh b/bin/ignitevisorcmd.sh index 523f85c..03b386a 100755 --- a/bin/ignitevisorcmd.sh +++ b/bin/ignitevisorcmd.sh @@ -134,7 +134,7 @@ elif [ $version -gt 8 ] && [ $version -lt 11 ]; then --add-modules=java.xml.bind \ ${JVM_OPTS}" -elif [ $version -eq 11 ] ; then +elif [ $version -ge 11 ] ; then JVM_OPTS="\ --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED \ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \ diff --git a/modules/sqlline/bin/sqlline.bat b/modules/sqlline/bin/sqlline.bat index 52064b6..236f986 100644 --- a/modules/sqlline/bin/sqlline.bat +++ b/modules/sqlline/bin/sqlline.bat @@ -127,7 +127,7 @@ if %MAJOR_JAVA_VER% GEQ 9 if %MAJOR_JAVA_VER% LSS 11 ( %JVM_OPTS% ) -if %MAJOR_JAVA_VER% == 11 ( +if %MAJOR_JAVA_VER% GEQ 11 ( set JVM_OPTS= ^ --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED ^ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED ^ diff --git a/modules/sqlline/bin/sqlline.sh b/modules/sqlline/bin/sqlline.sh index 02fed75..a807a78 100644 --- a/modules/sqlline/bin/sqlline.sh +++ b/modules/sqlline/bin/sqlline.sh @@ -81,7 +81,7 @@ elif [ $version -gt 8 ] && [ $version -lt 11 ]; then --add-modules=java.xml.bind \ ${JVM_OPTS}" -elif [ $version -eq 11 ] ; then +elif [ $version -ge 11 ] ; then JVM_OPTS="\ --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED \ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \ diff --git a/modules/web-console/web-agent/bin/ignite-web-agent.bat b/modules/web-console/web-agent/bin/ignite-web-agent.bat index 59342e1..0c41d43 100644 --- a/modules/web-console/web-agent/bin/ignite-web-agent.bat +++ b/modules/web-console/web-agent/bin/ignite-web-agent.bat @@ -117,7 +117,7 @@ if %MAJOR_JAVA_VER% GEQ 9 if %MAJOR_JAVA_VER% LSS 11 ( %JVM_OPTS% ) -if "%MAJOR_JAVA_VER%" == "11" ( +if "%MAJOR_JAVA_VER%" GEQ "11" ( set JVM_OPTS= ^ --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED ^ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED ^ diff --git a/modules/web-console/web-agent/bin/ignite-web-agent.sh b/modules/web-console/web-agent/bin/ignite-web-agent.sh index 74a8bf5..92b5f89 100755 --- a/modules/web-console/web-agent/bin/ignite-web-agent.sh +++ b/modules/web-console/web-agent/bin/ignite-web-agent.sh @@ -79,7 +79,7 @@ elif [ $version -gt 8 ] && [ $version -lt 11 ]; then --add-modules=java.xml.bind \ ${JVM_OPTS}" -elif [ $version -eq 11 ] ; then +elif [ $version -ge 11 ] ; then JVM_OPTS="\ --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED \ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
