From 3533500b736ce382b9cc1d53d29ff267324bf4be Mon Sep 17 00:00:00 2001 From: AsamK Date: Thu, 21 Nov 2024 21:17:44 +0100 Subject: [PATCH] Update dependencies --- graalvm-config-dir/reflect-config.json | 16 ++++++++++++++++ gradle/libs.versions.toml | 8 ++++---- .../asamk/signal/logging/LogConfigurator.java | 11 ++++++----- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json index 8a80f9c7..abe02ac4 100644 --- a/graalvm-config-dir/reflect-config.json +++ b/graalvm-config-dir/reflect-config.json @@ -1499,6 +1499,10 @@ "name":"org.bouncycastle.jcajce.provider.asymmetric.COMPOSITE$Mappings", "methods":[{"name":"","parameterTypes":[] }] }, +{ + "name":"org.bouncycastle.jcajce.provider.asymmetric.CONTEXT$Mappings", + "methods":[{"name":"","parameterTypes":[] }] +}, { "name":"org.bouncycastle.jcajce.provider.asymmetric.CompositeSignatures$Mappings", "methods":[{"name":"","parameterTypes":[] }] @@ -1559,6 +1563,14 @@ "name":"org.bouncycastle.jcajce.provider.asymmetric.LMS$Mappings", "methods":[{"name":"","parameterTypes":[] }] }, +{ + "name":"org.bouncycastle.jcajce.provider.asymmetric.MLDSA$Mappings", + "methods":[{"name":"","parameterTypes":[] }] +}, +{ + "name":"org.bouncycastle.jcajce.provider.asymmetric.MLKEM$Mappings", + "methods":[{"name":"","parameterTypes":[] }] +}, { "name":"org.bouncycastle.jcajce.provider.asymmetric.NTRU$Mappings", "methods":[{"name":"","parameterTypes":[] }] @@ -1567,6 +1579,10 @@ "name":"org.bouncycastle.jcajce.provider.asymmetric.RSA$Mappings", "methods":[{"name":"","parameterTypes":[] }] }, +{ + "name":"org.bouncycastle.jcajce.provider.asymmetric.SLHDSA$Mappings", + "methods":[{"name":"","parameterTypes":[] }] +}, { "name":"org.bouncycastle.jcajce.provider.asymmetric.SPHINCSPlus$Mappings", "methods":[{"name":"","parameterTypes":[] }] diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 17a8dd46..d7d56d71 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,16 +2,16 @@ slf4j = "2.0.16" [libraries] -bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.78.1" -jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.18.0" +bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.79" +jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.18.1" argparse4j = "net.sourceforge.argparse4j:argparse4j:0.9.0" dbusjava = "com.github.hypfvieh:dbus-java-transport-native-unixsocket:5.0.0" slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" } -logback = "ch.qos.logback:logback-classic:1.5.11" +logback = "ch.qos.logback:logback-classic:1.5.12" signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_110" sqlite = "org.xerial:sqlite-jdbc:3.47.0.0" -hikari = "com.zaxxer:HikariCP:6.0.0" +hikari = "com.zaxxer:HikariCP:6.2.1" junit-jupiter = "org.junit.jupiter:junit-jupiter:5.11.3" junit-launcher = "org.junit.platform:junit-platform-launcher:1.11.3" diff --git a/src/main/java/org/asamk/signal/logging/LogConfigurator.java b/src/main/java/org/asamk/signal/logging/LogConfigurator.java index 65e8c4f5..f6e23b70 100644 --- a/src/main/java/org/asamk/signal/logging/LogConfigurator.java +++ b/src/main/java/org/asamk/signal/logging/LogConfigurator.java @@ -42,7 +42,7 @@ public class LogConfigurator extends ContextAwareBase implements Configurator { }}); final var rootLogger = lc.getLogger(Logger.ROOT_LOGGER_NAME); - final var defaultLevel = verboseLevel > 2 ? Level.ALL : verboseLevel > 0 ? Level.INFO : Level.WARN; + final var defaultLevel = verboseLevel > 2 ? Level.TRACE : verboseLevel > 0 ? Level.INFO : Level.WARN; rootLogger.setLevel(defaultLevel); final var consoleLayout = verboseLevel == 0 || logFile != null @@ -51,13 +51,14 @@ public class LogConfigurator extends ContextAwareBase implements Configurator { final var consoleAppender = createLoggingConsoleAppender(lc, createLayoutWrappingEncoder(consoleLayout)); rootLogger.addAppender(consoleAppender); - lc.getLogger("org.asamk").setLevel(verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.DEBUG : Level.INFO); + lc.getLogger("org.asamk") + .setLevel(verboseLevel > 1 ? Level.TRACE : verboseLevel > 0 ? Level.DEBUG : Level.INFO); lc.getLogger("org.asamk.Signal") - .setLevel(verboseLevel > 2 ? Level.ALL : verboseLevel > 1 ? Level.INFO : Level.WARN); + .setLevel(verboseLevel > 2 ? Level.TRACE : verboseLevel > 1 ? Level.INFO : Level.WARN); lc.getLogger("com.zaxxer.hikari.pool.PoolBase") - .setLevel(verboseLevel > 2 ? Level.ALL : verboseLevel > 1 ? Level.INFO : Level.WARN); + .setLevel(verboseLevel > 2 ? Level.TRACE : verboseLevel > 1 ? Level.INFO : Level.WARN); lc.getLogger("org.sqlite.core.NativeDB") - .setLevel(verboseLevel > 3 ? Level.ALL : verboseLevel > 1 ? Level.INFO : Level.WARN); + .setLevel(verboseLevel > 3 ? Level.TRACE : verboseLevel > 1 ? Level.INFO : Level.WARN); if (logFile != null) { consoleAppender.addFilter(new Filter<>() { -- 2.50.1