diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 53324a097bc..bab5e03f6db 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -112,7 +112,7 @@ 3.4.2 1.2.17 2.4.1 - 1.1.5 + 1.1.6 1.2.3 1.10.19 2.13.3 diff --git a/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java index 3b64e4b5f26..886c7954eac 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -106,7 +106,7 @@ public class ConfigFileApplicationListenerTests { LoggerContext loggerContext = ((Logger) LoggerFactory.getLogger(getClass())) .getLoggerContext(); loggerContext.reset(); - BasicConfigurator.configure(loggerContext); + new BasicConfigurator().configure(loggerContext); } @After diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java index a00c6548354..3501e05d746 100644 --- a/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,6 +25,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.slf4j.impl.StaticLoggerBinder; import org.springframework.boot.logging.LoggingInitializationContext; @@ -71,7 +72,7 @@ public class SpringBootJoranConfiguratorTests { @After public void reset() { this.context.stop(); - BasicConfigurator.configureDefaultContext(); + new BasicConfigurator().configure((LoggerContext) LoggerFactory.getILoggerFactory()); } @Test