karaf scripts

Signed-off-by: Holger Friedrich <[email protected]>
openhab · Mar 25, 2024 · f5cb08c · f5cb08c
1 parent d39aa87
commit f5cb08c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/distributions/openhab/src/main/resources/bin/karaf b/distributions/openhab/src/main/resources/bin/karaf
@@ -160,7 +160,9 @@ init() {
     # Determine the JVM version and check that it is version 17
     checkJvmVersion
     if [ "${VERSION}" -ne "17" ]; then
-        die "JVM must be version 17. JVM version ${VERSION} is unsupported (JAVA_HOME=$JAVA_HOME)"
+        if [ "${VERSION}" -ne "21" ]; then
+            die "JVM must be version 17 or 21. JVM version ${VERSION} is unsupported (JAVA_HOME=$JAVA_HOME)"
+        fi
     fi
 
     # Check if a root instance is already running

diff --git a/distributions/openhab/src/main/resources/bin/karaf.bat b/distributions/openhab/src/main/resources/bin/karaf.bat
@@ -215,8 +215,10 @@ for /f tokens^=2-5^ delims^=.-_+^" %%j in ('"%JAVA%" -fullversion 2^>^&1') do (
 )
 
 if %JAVA_VERSION% NEQ 17 (
-    call :warn "JVM must be version 17. JVM version %JAVA_VERSION% is unsupported (JAVA_HOME=%JAVA_HOME%)"
-    goto END
+    if %JAVA_VERSION% NEQ 21 (
+        call :warn "JVM must be version 17 or 21. JVM version %JAVA_VERSION% is unsupported (JAVA_HOME=%JAVA_HOME%)"
+        goto END
+    )
 )
 
 if %JAVA_VERSION% GTR 8 (