diff --git a/common.gradle b/common.gradle index 7086c162f..3560fd1e6 100644 --- a/common.gradle +++ b/common.gradle @@ -136,8 +136,17 @@ subprojects { Files.list(dir) .filter { it.toString().endsWith('.class') } .findAny() - .ifPresent { packageSet.add(rootDir.relativize(dir).toString() - .replace(java.io.File.separatorChar, (char)'.') + '.*') } + .ifPresent { + // Using File.separator in the replace calls on windows does not seem to work and messes up the creation + // of the manifest files + if (rootDir.relativize(dir).toString().contains('\\')) { + packageSet.add(rootDir.relativize(dir).toString() + .replace('\\', '.') + '.*') + } else { + packageSet.add(rootDir.relativize(dir).toString() + .replace('/', '.') + '.*') + } + } } } diff --git a/lib-ogc/swe-common-core/build.gradle b/lib-ogc/swe-common-core/build.gradle index ad406fd0e..2ede6ecf6 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.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' 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 23eb2e8ab..a42de57aa 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