Michael Blow has submitted this change and it was merged. Change subject: [ASTERIXDB-2397][*DB] Fix sample cluster on Java 10 ......................................................................
[ASTERIXDB-2397][*DB] Fix sample cluster on Java 10 Change-Id: Ie40107e1f402e977413127783f51dc3a91dad2d2 Reviewed-on: https://asterix-gerrit.ics.uci.edu/2695 Sonar-Qube: Jenkins <[email protected]> Reviewed-by: Ian Maxon <[email protected]> Tested-by: Michael Blow <[email protected]> --- M asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh 1 file changed, 8 insertions(+), 4 deletions(-) Approvals: Jenkins: No violations found Michael Blow: Verified Ian Maxon: Looks good to me, approved diff --git a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh index 4f3caed..d1699dd 100755 --- a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh +++ b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh @@ -86,11 +86,15 @@ fi fi -"$JAVACMD" -version 2>&1 | grep -q '1\.[89]' || { - echo "JAVA_HOME must be at version 1.8 or later:" - "$JAVACMD" -version +export JAVA_VERSION=$(java -version 2>&1 | head -1 | awk '{ print $NF }' | tr -d '"') +case $JAVA_VERSION in + 1.8*|1.9*|10*|11*) + ;; + *) + echo JAVA_HOME must be at version 1.8 or later, but is: $JAVA_VERSION exit 2 -} +esac + DIRNAME=$(dirname "$0") [ $(echo $DIRNAME | wc -l) -ne 1 ] && { echo "Paths with spaces are not supported" -- To view, visit https://asterix-gerrit.ics.uci.edu/2695 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie40107e1f402e977413127783f51dc3a91dad2d2 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Murtadha Hubail <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]>
