From da0d85c30ed86a234f25cef5d03b17c4c8acc870 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 3 Sep 2015 11:43:52 -0700 Subject: [PATCH] Deprecate Log4JLoggingSystem Fixes gh-3893 --- .../springframework/boot/logging/log4j/Log4JLoggingSystem.java | 3 +++ .../boot/logging/log4j/Log4JLoggingSystemTests.java | 1 + 2 files changed, 4 insertions(+) diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/log4j/Log4JLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/log4j/Log4JLoggingSystem.java index e4523c0436..fab44a682a 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/log4j/Log4JLoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/log4j/Log4JLoggingSystem.java @@ -38,7 +38,10 @@ import org.springframework.util.StringUtils; * @author Phillip Webb * @author Dave Syer * @author Andy Wilkinson + * @deprecated in Spring Boot 1.3 in favor of Apache Log4j 2 (following Apache's EOL + * declaration for log4j 1.x) */ +@Deprecated public class Log4JLoggingSystem extends Slf4JLoggingSystem { private static final Map LEVELS; diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/log4j/Log4JLoggingSystemTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/log4j/Log4JLoggingSystemTests.java index e0ad064f8d..02960d5e86 100644 --- a/spring-boot/src/test/java/org/springframework/boot/logging/log4j/Log4JLoggingSystemTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/logging/log4j/Log4JLoggingSystemTests.java @@ -43,6 +43,7 @@ import static org.junit.Assert.assertTrue; * @author Phillip Webb * @author Andy Wilkinson */ +@SuppressWarnings("deprecation") public class Log4JLoggingSystemTests extends AbstractLoggingSystemTests { @Rule