Patch Karaf to require JDK17

We require Java 17 to run, make sure we validate the version.

JIRA: ODLPARENT-256
Change-Id: I0adbf724d05793615c5016a6059cc085cccc91f8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc.patch
index c07b15f9a1869948737f5e0855b073a9294d26f0..8d3bc86a53fa63e334be94fd9216bb1bef43ae4b 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc.patch
+++ b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc.patch
@@ -5,7 +5,7 @@
 
      if [ "x${JAVA_HOME}" = "x" ] && [ "${darwin}" = "true" ]; then
 -        JAVA_HOME="`/usr/libexec/java_home -v 1.8`"
-+        JAVA_HOME="`/usr/libexec/java_home -v 11`"
++        JAVA_HOME="`/usr/libexec/java_home -v 17`"
      fi
      if [ "x${JAVA_HOME}" = "x" ] && [ -r /etc/gentoo-release ] ; then
          JAVA_HOME=`java-config --jre-home`
@@ -16,9 +16,9 @@
 -    # java must be at least version 8
 -    if [ "${VERSION}" -lt "8" ]; then
 -        die "JVM must be version 1.8 or greater"
-+    # java must be at least version 11
-+    if [ "${VERSION}" -lt "11" ]; then
-+        die "JVM must be version 11 or greater"
++    # java must be at least version 17
++    if [ "${VERSION}" -lt "17" ]; then
++        die "JVM must be version 17 or greater"
      fi
  }