commit 4dad013297f033e7aaa83fbf72fa11eaada7f927
author Michael Blow <mblow@apache.org> Fri Jun 08 14:26:11 2018 -0400
committer Michael Blow <mblow@apache.org> Fri Jun 08 12:03:26 2018 -0700
tree ba76b1c55d53eea8ddf5c1420429658f6c9ca8f0
parent e7422b0eee70185e7e769044c693d57232f73af8

[ASTERIXDB-2397][*DB] Fix sample cluster on Java 10

Change-Id: Ie40107e1f402e977413127783f51dc3a91dad2d2
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2695
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Ian Maxon <imaxon@apache.org>
Tested-by: Michael Blow <mblow@apache.org>

asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh

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"