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

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2016-11-11 15:27:11 +00:00
parent 7cb5981e7c 2930bd4145
commit d4a7db7b7c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,7 @@
<jtds.version>1.3.1</jtds.version>
<junit.version>4.12</junit.version>
<liquibase.version>3.5.3</liquibase.version>
<log4j2.version>2.6.2</log4j2.version>
<log4j2.version>2.7</log4j2.version>
<logback.version>1.1.7</logback.version>
<lombok.version>1.16.10</lombok.version>
<mariadb.version>1.4.6</mariadb.version>

2
spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
View File

@ -176,7 +176,7 @@ public class Log4J2LoggingSystem extends Slf4JLoggingSystem {
LoggerContext ctx = getLoggerContext();
URL url = ResourceUtils.getURL(location);
ConfigurationSource source = getConfigurationSource(url);
ctx.start(ConfigurationFactory.getInstance().getConfiguration(source));
ctx.start(ConfigurationFactory.getInstance().getConfiguration(ctx, source));
}
catch (Exception ex) {
throw new IllegalStateException(