Skip to content

Commit 6c4fedb

Browse files
committed
Revert "Logback 1.3 and SLF4J 2.0"
This reverts commit f39a080 that was pushed prematurely.
1 parent 12ace97 commit 6c4fedb

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ bom {
813813
]
814814
}
815815
}
816-
library("Logback", "1.3.0-alpha15") {
816+
library("Logback", "1.2.11") {
817817
group("ch.qos.logback") {
818818
modules = [
819819
"logback-access",
@@ -1289,7 +1289,7 @@ bom {
12891289
]
12901290
}
12911291
}
1292-
library("SLF4J", "2.0.0-alpha7") {
1292+
library("SLF4J", "1.7.36") {
12931293
group("org.slf4j") {
12941294
modules = [
12951295
"jcl-over-slf4j",

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LogbackInitializer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
1919
import ch.qos.logback.classic.Level;
2020
import org.slf4j.ILoggerFactory;
2121
import org.slf4j.Logger;
22-
import org.slf4j.LoggerFactory;
22+
import org.slf4j.impl.StaticLoggerBinder;
2323

2424
import org.springframework.util.ClassUtils;
2525

@@ -32,7 +32,7 @@
3232
public abstract class LogbackInitializer {
3333

3434
public static void initialize() {
35-
if (ClassUtils.isPresent("org.slf4j.LoggerFactory", null)
35+
if (ClassUtils.isPresent("org.slf4j.impl.StaticLoggerBinder", null)
3636
&& ClassUtils.isPresent("ch.qos.logback.classic.Logger", null)) {
3737
new Initializer().setRootLogLevel();
3838
}
@@ -41,7 +41,7 @@ public static void initialize() {
4141
private static class Initializer {
4242

4343
void setRootLogLevel() {
44-
ILoggerFactory factory = LoggerFactory.getILoggerFactory();
44+
ILoggerFactory factory = StaticLoggerBinder.getSingleton().getLoggerFactory();
4545
Logger logger = factory.getLogger(Logger.ROOT_LOGGER_NAME);
4646
((ch.qos.logback.classic.Logger) logger).setLevel(Level.INFO);
4747
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
import ch.qos.logback.core.util.StatusListenerConfigHelper;
4040
import org.slf4j.ILoggerFactory;
4141
import org.slf4j.Logger;
42-
import org.slf4j.LoggerFactory;
4342
import org.slf4j.Marker;
4443
import org.slf4j.bridge.SLF4JBridgeHandler;
44+
import org.slf4j.impl.StaticLoggerBinder;
4545

4646
import org.springframework.boot.logging.AbstractLoggingSystem;
4747
import org.springframework.boot.logging.LogFile;
@@ -348,7 +348,7 @@ private ch.qos.logback.classic.Logger getLogger(String name) {
348348
}
349349

350350
private LoggerContext getLoggerContext() {
351-
ILoggerFactory factory = LoggerFactory.getILoggerFactory();
351+
ILoggerFactory factory = StaticLoggerBinder.getSingleton().getLoggerFactory();
352352
Assert.isInstanceOf(LoggerContext.class, factory,
353353
() -> String.format(
354354
"LoggerFactory is not a Logback LoggerContext but Logback is on "

0 commit comments

Comments
 (0)