Skip to content

Updates for logging under Java 21 #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Updates for logging under Java 21 #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d005f7f
Updates for logging under Java 21
nickgaray Sep 24, 2025
655e1c6
Update logback-classic to address CVE
nickgaray Sep 25, 2025
571e560
Fix gradle recipe for building OSGi Bundles on Windows properly
nickgaray Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions common.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('/', '.') + '.*')
}
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions lib-ogc/swe-common-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 3 additions & 5 deletions sensorhub-core/src/main/java/org/sensorhub/utils/ModuleUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
Loading