Merge remote-tracking branch 'origin/foundation-2022' into foundation…

…-2023
OpenNMS · Aug 1, 2023 · a33c30e · a33c30e
2 parents e8ebcea + 3a4b3d2
commit a33c30e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/opennms-base-assembly/src/main/filtered/bin/opennms b/opennms-base-assembly/src/main/filtered/bin/opennms
@@ -446,6 +446,8 @@ doStart(){
 		# this is a JRE, try to use ECJ for Jetty compilation instead
 		APP_VM_PARMS=("-Dorg.apache.jasper.compiler.disablejsr199=true" "${APP_VM_PARMS[@]}")
 	fi
+	# work around some jar files that are not compatible with updated JDK validation
+	APP_VM_PARMS=("-Djdk.util.zip.disableZip64ExtraFieldValidation=true" "${APP_VM_PARMS[@]}")
 
 	CMD=("${RUNJAVA_CMD[@]}" "-D_OPENNMS_LAUNCH" "${JAVA_CMD[@]}" "-Dopennms.pidfile=${OPENNMS_PIDFILE}" "${APP_VM_PARMS[@]}" -jar "$BOOTSTRAP" "${APP_PARMS_CONTROLLER[@]}" "${APP_PARMS_BEFORE[@]}" "$@" "${APP_PARMS_AFTER[@]}")
 	if [ "$SYSTEMD" = 1 ]; then

diff --git a/opennms-container/core/container-fs/entrypoint.sh b/opennms-container/core/container-fs/entrypoint.sh
@@ -155,6 +155,7 @@ start() {
   -Dcom.sun.management.jmxremote.access.file=${OPENNMS_HOME}/etc/jmxremote.access
   -DisThreadContextMapInheritable=true
   -Djdk.attach.allowAttachSelf=true
+  -Djdk.util.zip.disableZip64ExtraFieldValidation=true
   -Dgroovy.use.classvalue=true
   -Djava.io.tmpdir=${OPENNMS_HOME}/data/tmp
   -Djava.locale.providers=CLDR,COMPAT

diff --git a/opennms-container/minion/container-fs/entrypoint.sh b/opennms-container/minion/container-fs/entrypoint.sh
@@ -20,7 +20,7 @@ CONFD_BIN="/usr/bin/confd"
 CONFD_CONFIG_FILE="${CONFD_CONFIG_DIR}/confd.toml"
 CACERTS="${MINION_HOME}/cacerts"
 
-export KARAF_OPTS="-Djava.locale.providers=CLDR,COMPAT"
+export KARAF_OPTS="-Djava.locale.providers=CLDR,COMPAT -Djdk.util.zip.disableZip64ExtraFieldValidation=true"
 
 # Error codes
 E_ILLEGAL_ARGS=126

diff --git a/opennms-container/sentinel/container-fs/entrypoint.sh b/opennms-container/sentinel/container-fs/entrypoint.sh
@@ -17,7 +17,7 @@ export SENTINEL_HOME="/opt/sentinel"
 SENTINEL_OVERLAY_ETC="/opt/sentinel-etc-overlay"
 SENTINEL_OVERLAY="/opt/sentinel-overlay"
 
-export KARAF_OPTS="-Djava.locale.providers=CLDR,COMPAT"
+export KARAF_OPTS="-Djava.locale.providers=CLDR,COMPAT -Djdk.util.zip.disableZip64ExtraFieldValidation=true"
 
 # Error codes
 E_ILLEGAL_ARGS=126