root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 18 Packages Projects Releases Wiki Activity

Merge pull request #5410 from Kazuki Shimizu 

* version-upgrades:
  Upgrade to Logback 1.1.6
This commit is contained in:
Andy Wilkinson 2016-04-01 11:43:25 +01:00
parent e7bb67fa33 b4b7e7ead3
commit dad4e84d35
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-dependencies/pom.xml
View File

@ -112,7 +112,7 @@
<liquibase.version>3.4.2</liquibase.version> <liquibase.version>3.4.2</liquibase.version>
<log4j.version>1.2.17</log4j.version> <log4j.version>1.2.17</log4j.version>
<log4j2.version>2.4.1</log4j2.version> <log4j2.version>2.4.1</log4j2.version>
<logback.version>1.1.5</logback.version> <logback.version>1.1.6</logback.version>
<mariadb.version>1.2.3</mariadb.version> <mariadb.version>1.2.3</mariadb.version>
<mockito.version>1.10.19</mockito.version> <mockito.version>1.10.19</mockito.version>
<mongodb.version>2.13.3</mongodb.version> <mongodb.version>2.13.3</mongodb.version>

4
spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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())) LoggerContext loggerContext = ((Logger) LoggerFactory.getLogger(getClass()))
.getLoggerContext(); .getLoggerContext();
loggerContext.reset(); loggerContext.reset();
BasicConfigurator.configure(loggerContext); new BasicConfigurator().configure(loggerContext);
} }
@After @After

5
spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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.Rule;
import org.junit.Test; import org.junit.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.impl.StaticLoggerBinder; import org.slf4j.impl.StaticLoggerBinder;
import org.springframework.boot.logging.LoggingInitializationContext; import org.springframework.boot.logging.LoggingInitializationContext;
@ -71,7 +72,7 @@ public class SpringBootJoranConfiguratorTests {
@After @After
public void reset() { public void reset() {
this.context.stop(); this.context.stop();
BasicConfigurator.configureDefaultContext(); new BasicConfigurator().configure((LoggerContext) LoggerFactory.getILoggerFactory());
} }
@Test @Test