From 6fdc6fa6197d6e4e333e952e1151716d410f7743 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 08:32:52 +0000 Subject: [PATCH] Upgrade to Logback 1.4.6 This commit includes a change to stop using an API in Logback that has been deprecated without replacement. As Logback now only supports .xml configuration files, it would only ever have thrown an exception. The call to the API has been replaced with thrown an exception directly. Closes gh-34670 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../boot/logging/logback/LogbackLoggingSystem.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 2d24a2c9f3..a499bb9f5d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -797,7 +797,7 @@ bom { ] } } - library("Logback", "1.4.5") { + library("Logback", "1.4.6") { group("ch.qos.logback") { modules = [ "logback-access", diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java index 33c0c60d70..ee31b9b07a 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java @@ -31,7 +31,6 @@ import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.classic.jul.LevelChangePropagator; import ch.qos.logback.classic.turbo.TurboFilter; -import ch.qos.logback.classic.util.ContextInitializer; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.spi.FilterReply; import ch.qos.logback.core.status.OnConsoleStatusListener; @@ -267,13 +266,13 @@ public class LogbackLoggingSystem extends AbstractLoggingSystem implements BeanF private void configureByResourceUrl(LoggingInitializationContext initializationContext, LoggerContext loggerContext, URL url) throws JoranException { - if (url.toString().endsWith("xml")) { + if (url.toString().endsWith(".xml")) { JoranConfigurator configurator = new SpringBootJoranConfigurator(initializationContext); configurator.setContext(loggerContext); configurator.doConfigure(url); } else { - new ContextInitializer(loggerContext).configureByResource(url); + throw new IllegalArgumentException("Unsupported file extension in '" + url + "'. Only .xml is supported"); } }