From 19b33722d5a4cb99e7b3ed80f8a0b3610c07ca04 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Sat, 11 Dec 2021 10:20:36 +0100 Subject: [PATCH] Revert CVE-2021-44228 quick fix Reverts #1343 because Karaf 4.3.4 uses Pax Logging 2.0.12 which is not vulnerable. Signed-off-by: Wouter Born --- distributions/openhab/src/main/resources/bin/setenv | 3 +-- distributions/openhab/src/main/resources/bin/setenv.bat | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/distributions/openhab/src/main/resources/bin/setenv b/distributions/openhab/src/main/resources/bin/setenv index 0c2b680435..42574f5734 100755 --- a/distributions/openhab/src/main/resources/bin/setenv +++ b/distributions/openhab/src/main/resources/bin/setenv @@ -110,8 +110,7 @@ export JAVA_OPTS="${JAVA_OPTS} -Dorg.apache.cxf.osgi.http.transport.disable=true -Dorg.ops4j.pax.web.listening.addresses=${HTTP_ADDRESS} -Dorg.osgi.service.http.port=${HTTP_PORT} - -Dorg.osgi.service.http.port.secure=${HTTPS_PORT} - -Dlog4j2.formatMsgNoLookups=true" + -Dorg.osgi.service.http.port.secure=${HTTPS_PORT}" # # set JVM options diff --git a/distributions/openhab/src/main/resources/bin/setenv.bat b/distributions/openhab/src/main/resources/bin/setenv.bat index 8a07fcd45a..aea0e94841 100644 --- a/distributions/openhab/src/main/resources/bin/setenv.bat +++ b/distributions/openhab/src/main/resources/bin/setenv.bat @@ -127,8 +127,7 @@ set JAVA_OPTS=%JAVA_OPTS% ^ -Dorg.apache.cxf.osgi.http.transport.disable=true ^ -Dorg.ops4j.pax.web.listening.addresses=%HTTP_ADDRESS% ^ -Dorg.osgi.service.http.port=%HTTP_PORT% ^ - -Dorg.osgi.service.http.port.secure=%HTTPS_PORT% ^ - -Dlog4j2.formatMsgNoLookups=true + -Dorg.osgi.service.http.port.secure=%HTTPS_PORT% :: set jvm options set EXTRA_JAVA_OPTS=-XX:+UseG1GC ^