Update version enforcement to Java 7

OpenDaylight was never able to run with 1.6, hence we should
enforce Java 7 at least.

Change-Id: I3e6a5d21d4af6c3916528178b0465e86190c0dc6
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf
index d48e4183d5ab2a7e230926b2243675ce08072ed5..3cc60725f1cbf8b9bba4b32f84640155d33e508a 100755 (executable)
--- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf
+++ b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf
@@ -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 "70" ]; then
+       echo "JVM must be 1.7.0 or greater"
        exit 1;
    fi
 }
@@ -357,7 +357,7 @@ init() {
     # Determine the JVM vendor
     detectJVM
 
-    # Determine the JVM version >= 1.6
+    # Determine the JVM version >= 1.7
     checkJvmVersion
 
     # Setup default options