From 0b745637b3747f590033ce6fec1319492320ab24 Mon Sep 17 00:00:00 2001 From: Yunus Emre Inci Date: Wed, 28 Apr 2021 22:37:16 +0300 Subject: [PATCH 1/2] Fix java version check in start-rc.sh --- scripts/start-rc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start-rc.sh b/scripts/start-rc.sh index 760430c7c1..26cb0121da 100755 --- a/scripts/start-rc.sh +++ b/scripts/start-rc.sh @@ -82,7 +82,7 @@ hazelcast-enterprise-${HAZELCAST_ENTERPRISE_VERSION}-tests.jar:\ hazelcast-${HAZELCAST_TEST_VERSION}-tests.jar" # necessary arguments for Java 9+ -if ! java -version 2>&1 | grep -E "java version \"1\." > /dev/null; then +if ! java -version 2>&1 | grep -E "version \"1\." > /dev/null; then MODULE_ARGUMENTS="--add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED" fi From c1363a32f53fc29e6934024b5b6dbc2ad04973a4 Mon Sep 17 00:00:00 2001 From: Yunus Emre Inci Date: Sun, 2 May 2021 23:51:15 +0300 Subject: [PATCH 2/2] Use awk instead of grep --- scripts/start-rc.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/start-rc.sh b/scripts/start-rc.sh index 26cb0121da..0388143a08 100755 --- a/scripts/start-rc.sh +++ b/scripts/start-rc.sh @@ -82,7 +82,8 @@ hazelcast-enterprise-${HAZELCAST_ENTERPRISE_VERSION}-tests.jar:\ hazelcast-${HAZELCAST_TEST_VERSION}-tests.jar" # necessary arguments for Java 9+ -if ! java -version 2>&1 | grep -E "version \"1\." > /dev/null; then +JAVA_MAJOR_VERSION=$(java -version 2>&1 | head -n 1 | awk -F '"' '{print $2}' | awk -F '.' '{print $1}') +if [ "$JAVA_MAJOR_VERSION" != "1" ]; then MODULE_ARGUMENTS="--add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED" fi