KNOX-3210 - Use a common function to set JDK17 properties across all scripts

Author: smolnar82

gateway-release-common/home/bin/knox-functions.sh

@@ -159,6 +159,16 @@ function addAppJavaOpts {
     done
 }
 
+function addJdk17Properties {
+    # Add properties to enable Knox to run on JDK 17
+    JAVA_VERSION=$("$JAVA" -version 2>&1 | awk -F '"' '/version/ {print $2}')
+    CHECK_VERSION_17="17"
+    if [[ "$JAVA_VERSION" == *"$CHECK_VERSION_17"* ]]; then
+        echo "Java version is $CHECK_VERSION_17. Adding properties to enable Knox to run on JDK 17"
+        addAppJavaOpts " --add-exports java.base/sun.security.x509=ALL-UNNAMED --add-exports java.base/sun.security.pkcs=ALL-UNNAMED --add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-opens java.base/sun.security.util=ALL-UNNAMED --add-exports java.base/jdk.internal.misc=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-exports java.base/sun.net.util=ALL-UNNAMED --add-exports java.base/sun.net.dns=ALL-UNNAMED"
+    fi
+}
+
 function buildAppJavaOpts {
     if [ -n "$APP_MEM_OPTS" ]; then
       addAppJavaOpts "${APP_MEM_OPTS}"
@@ -176,13 +186,7 @@ function buildAppJavaOpts {
       addAppJavaOpts "${APP_JAVA_LIB_PATH}"
     fi
 
-    # Add properties to enable Knox to run on JDK 17
-    JAVA_VERSION=$("$JAVA" -version 2>&1 | awk -F '"' '/version/ {print $2}')
-    CHECK_VERSION_17="17"
-    if [[ "$JAVA_VERSION" == *"$CHECK_VERSION_17"* ]]; then
-        echo "Java version is $CHECK_VERSION_17. Adding properties to enable Knox to run on JDK 17"
-        addAppJavaOpts " --add-exports java.base/sun.security.x509=ALL-UNNAMED --add-exports java.base/sun.security.pkcs=ALL-UNNAMED --add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-opens java.base/sun.security.util=ALL-UNNAMED --add-exports java.base/jdk.internal.misc=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-exports java.base/sun.net.util=ALL-UNNAMED --add-exports java.base/sun.net.dns=ALL-UNNAMED"
-    fi
+    addJdk17Properties
 
     # echo "APP_JAVA_OPTS =" "${APP_JAVA_OPTS[@]}"
 }

gateway-release/home/bin/knoxcli.sh

@@ -62,13 +62,7 @@ function buildAppJavaOpts {
       addAppJavaOpts "${APP_JAVA_LIB_PATH}"
     fi
 
-    # Add properties to enable Knox to run on JDK 17
-    JAVA_VERSION=$("$JAVA" -version 2>&1 | awk -F '"' '/version/ {print $2}')
-    CHECK_VERSION_17="17"
-    if [[ "$JAVA_VERSION" == *"$CHECK_VERSION_17"* ]]; then
-        echo "Java version is $CHECK_VERSION_17. Adding properties to enable Knox to run on JDK 17"
-        addAppJavaOpts " --add-exports java.base/sun.security.x509=ALL-UNNAMED --add-exports java.base/sun.security.pkcs=ALL-UNNAMED --add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-opens java.base/sun.security.util=ALL-UNNAMED"
-    fi
+    addJdk17Properties
 
     # echo "APP_JAVA_OPTS =" "${APP_JAVA_OPTS[@]}"
 }