From f9ad0c75e8406d69ed4d889423dbe142185b993a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 18 May 2016 20:25:50 +0200 Subject: [PATCH] Enforce Java 8 runtime OpenDaylight Boron release is now supported only with Java 8, make sure our startup script enforces that. Change-Id: I03049ebbfadeb9a567f7018d08db47bf370299bb Signed-off-by: Robert Varga --- .../src/main/resources/bin/karaf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf index 9b061b7c9d..53906c6b3f 100755 --- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf +++ b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf @@ -195,7 +195,7 @@ locateJava() { fi if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then - JAVA_HOME="$(/usr/libexec/java_home -v 1.7)" + JAVA_HOME="$(/usr/libexec/java_home -v 1.8)" fi if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then JAVA_HOME=`java-config --jre-home` @@ -239,8 +239,8 @@ checkJvmVersion() { # echo "`$JAVA -version`" VERSION=`$JAVA -version 2>&1 | egrep '"([0-9].[0-9]\..*[0-9]).*"' | awk '{print substr($3,2,length($3)-2)}' | awk '{print substr($1, 3, 3)}' | sed -e 's;\.;;g'` # echo $VERSION - if [ "$VERSION" -lt "60" ]; then - echo "JVM must be greater than 1.6" + if [ "$VERSION" -lt "80" ]; then + echo "JVM must be 1.8.0 or greater" exit 1; fi } @@ -348,7 +348,7 @@ init() { # Determine the JVM vendor detectJVM - # Determine the JVM version >= 1.6 + # Determine the JVM version >= 1.8 checkJvmVersion # Setup default options -- 2.36.6