Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Logback 1.5.10

Browse Source 
Closes gh-42638
This commit is contained in:
Stéphane Nicoll
2024-10-14 12:30:27 +02:00
parent 3ffa37e1cb
commit 107ca496fc
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@@ -1121,7 +1121,7 @@ bom {
releaseNotes("https://github.com/apache/logging-log4j2/releases/tag/rel%2F{version}")
}
}
library("Logback", "1.5.8") {
library("Logback", "1.5.10") {
group("ch.qos.logback") {
modules = [
"logback-classic",

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

@@ -84,17 +84,20 @@ public class LogbackLoggingSystem extends AbstractLoggingSystem implements BeanF
private static final String CONFIGURATION_FILE_PROPERTY = "logback.configurationFile";
private static final LogLevels<Level> LEVELS = new LogLevels<>();
private static final LogLevels<Level> LEVELS = createLogLevels();
static {
LEVELS.map(LogLevel.TRACE, Level.TRACE);
LEVELS.map(LogLevel.TRACE, Level.ALL);
LEVELS.map(LogLevel.DEBUG, Level.DEBUG);
LEVELS.map(LogLevel.INFO, Level.INFO);
LEVELS.map(LogLevel.WARN, Level.WARN);
LEVELS.map(LogLevel.ERROR, Level.ERROR);
LEVELS.map(LogLevel.FATAL, Level.ERROR);
LEVELS.map(LogLevel.OFF, Level.OFF);
@SuppressWarnings("deprecation")
private static LogLevels<Level> createLogLevels() {
LogLevels<Level> levels = new LogLevels<>();
levels.map(LogLevel.TRACE, Level.TRACE);
levels.map(LogLevel.TRACE, Level.ALL);
levels.map(LogLevel.DEBUG, Level.DEBUG);
levels.map(LogLevel.INFO, Level.INFO);
levels.map(LogLevel.WARN, Level.WARN);
levels.map(LogLevel.ERROR, Level.ERROR);
levels.map(LogLevel.FATAL, Level.ERROR);
levels.map(LogLevel.OFF, Level.OFF);
return levels;
}
private static final TurboFilter FILTER = new TurboFilter() {

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

@@ -288,6 +288,7 @@ class LogbackLoggingSystemTests extends AbstractLoggingSystemTests {
}
@Test
@Deprecated(since = "3.3.5", forRemoval = true)
void getLoggerConfigurationForALL() {
this.loggingSystem.beforeInitialize();
initialize(this.initializationContext, null, null);