Merge branch '1.3.x'

pull/5040/merge
Phillip Webb 9 years ago
commit 34a864447f

@ -16,6 +16,7 @@
package org.springframework.boot.logging.logback; package org.springframework.boot.logging.logback;
import ch.qos.logback.classic.BasicConfigurator;
import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.classic.joran.JoranConfigurator;
import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.joran.spi.JoranException;
@ -69,7 +70,8 @@ public class SpringBootJoranConfiguratorTests {
@After @After
public void reset() { public void reset() {
this.context.reset(); this.context.stop();
BasicConfigurator.configureDefaultContext();
} }
@Test @Test

Loading…
Cancel
Save