From d005f7f95eff18b646476fd74e80484015cf5898 Mon Sep 17 00:00:00 2001 From: Nick Garay Date: Wed, 24 Sep 2025 14:30:33 -0400 Subject: [PATCH 1/2] Updates for logging under Java 21 --- lib-ogc/swe-common-core/build.gradle | 4 ++-- .../src/main/java/org/sensorhub/utils/ModuleUtils.java | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib-ogc/swe-common-core/build.gradle b/lib-ogc/swe-common-core/build.gradle index ad406fd0ea..f4b127a0de 100644 --- a/lib-ogc/swe-common-core/build.gradle +++ b/lib-ogc/swe-common-core/build.gradle @@ -2,8 +2,8 @@ group = 'org.vast.opengis' description = 'SWE Common Core' dependencies { - api 'ch.qos.logback:logback-classic:1.2.13' - api 'com.fasterxml.woodstox:woodstox-core:6.2.8' + api 'ch.qos.logback:logback-classic:1.4.14' + api 'com.fasterxml.woodstox:woodstox-core:6.4.0' api 'com.google.code.gson:gson:2.11.0' api 'com.google.guava:guava:32.1.3-jre' api 'net.sf.trove4j:core:3.1.0' diff --git a/sensorhub-core/src/main/java/org/sensorhub/utils/ModuleUtils.java b/sensorhub-core/src/main/java/org/sensorhub/utils/ModuleUtils.java index 23eb2e8ab8..a42de57aa6 100644 --- a/sensorhub-core/src/main/java/org/sensorhub/utils/ModuleUtils.java +++ b/sensorhub-core/src/main/java/org/sensorhub/utils/ModuleUtils.java @@ -28,7 +28,6 @@ import org.sensorhub.api.module.ModuleConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.slf4j.impl.StaticLoggerBinder; import org.vast.util.Asserts; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.util.ContextInitializer; @@ -218,11 +217,10 @@ public static Logger createModuleLogger(IModule module) String moduleID = module.getLocalID(); // if module config wasn't initialized or logback not available, use class logger - StaticLoggerBinder binder = StaticLoggerBinder.getSingleton(); - if (moduleID == null || NO_ID_FLAG.equals(moduleID) || - !binder.getLoggerFactoryClassStr().contains("logback")) + if (moduleID == null || NO_ID_FLAG.equals(moduleID)) { return LoggerFactory.getLogger(module.getClass()); - + } + // generate instance ID String instanceID = Integer.toHexString(moduleID.hashCode()); instanceID = instanceID.replace("-", ""); // remove minus sign if any From 655e1c6cd7089b110bd5337fb0ddb86424ec0089 Mon Sep 17 00:00:00 2001 From: Nick Garay Date: Thu, 25 Sep 2025 09:14:52 -0400 Subject: [PATCH 2/2] Update logback-classic to address CVE --- lib-ogc/swe-common-core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib-ogc/swe-common-core/build.gradle b/lib-ogc/swe-common-core/build.gradle index f4b127a0de..2ede6ecf67 100644 --- a/lib-ogc/swe-common-core/build.gradle +++ b/lib-ogc/swe-common-core/build.gradle @@ -2,7 +2,7 @@ group = 'org.vast.opengis' description = 'SWE Common Core' dependencies { - api 'ch.qos.logback:logback-classic:1.4.14' + api 'ch.qos.logback:logback-classic:1.5.13' api 'com.fasterxml.woodstox:woodstox-core:6.4.0' api 'com.google.code.gson:gson:2.11.0' api 'com.google.guava:guava:32.1.3-jre'