Skip to content

Commit 107ca49

Browse files
committed
Upgrade to Logback 1.5.10
Closes gh-42638
1 parent 3ffa37e commit 107ca49

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

spring-boot-project/spring-boot-dependencies/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,7 @@ bom {
11211121
releaseNotes("https://github.com/apache/logging-log4j2/releases/tag/rel%2F{version}")
11221122
}
11231123
}
1124-
library("Logback", "1.5.8") {
1124+
library("Logback", "1.5.10") {
11251125
group("ch.qos.logback") {
11261126
modules = [
11271127
"logback-classic",

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,20 @@ public class LogbackLoggingSystem extends AbstractLoggingSystem implements BeanF
8484

8585
private static final String CONFIGURATION_FILE_PROPERTY = "logback.configurationFile";
8686

87-
private static final LogLevels<Level> LEVELS = new LogLevels<>();
88-
89-
static {
90-
LEVELS.map(LogLevel.TRACE, Level.TRACE);
91-
LEVELS.map(LogLevel.TRACE, Level.ALL);
92-
LEVELS.map(LogLevel.DEBUG, Level.DEBUG);
93-
LEVELS.map(LogLevel.INFO, Level.INFO);
94-
LEVELS.map(LogLevel.WARN, Level.WARN);
95-
LEVELS.map(LogLevel.ERROR, Level.ERROR);
96-
LEVELS.map(LogLevel.FATAL, Level.ERROR);
97-
LEVELS.map(LogLevel.OFF, Level.OFF);
87+
private static final LogLevels<Level> LEVELS = createLogLevels();
88+
89+
@SuppressWarnings("deprecation")
90+
private static LogLevels<Level> createLogLevels() {
91+
LogLevels<Level> levels = new LogLevels<>();
92+
levels.map(LogLevel.TRACE, Level.TRACE);
93+
levels.map(LogLevel.TRACE, Level.ALL);
94+
levels.map(LogLevel.DEBUG, Level.DEBUG);
95+
levels.map(LogLevel.INFO, Level.INFO);
96+
levels.map(LogLevel.WARN, Level.WARN);
97+
levels.map(LogLevel.ERROR, Level.ERROR);
98+
levels.map(LogLevel.FATAL, Level.ERROR);
99+
levels.map(LogLevel.OFF, Level.OFF);
100+
return levels;
98101
}
99102

100103
private static final TurboFilter FILTER = new TurboFilter() {

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ void getLoggerConfigurationForLoggerThatDoesNotExistShouldReturnNull() {
288288
}
289289

290290
@Test
291+
@Deprecated(since = "3.3.5", forRemoval = true)
291292
void getLoggerConfigurationForALL() {
292293
this.loggingSystem.beforeInitialize();
293294
initialize(this.initializationContext, null, null);

0 commit comments

Comments
 (0)