Skip to content

S
spring-boot
Commit 71826708 authored by Huang YunKun's avatar Huang YunKun Committed by Andy Wilkinson
Browse files
Options

Upgrade to Log4j 2.7 

Closes gh-7323
parent c30b917b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
spring-boot-dependencies/pom.xml
View file @ 71826708
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<jtds.version>1.3.1</jtds.version> <jtds.version>1.3.1</jtds.version>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<liquibase.version>3.5.3</liquibase.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> <logback.version>1.1.7</logback.version>
<lombok.version>1.16.10</lombok.version> <lombok.version>1.16.10</lombok.version>
<mariadb.version>1.4.6</mariadb.version> <mariadb.version>1.4.6</mariadb.version>
......
spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
View file @ 71826708
...@@ -176,7 +176,7 @@ public class Log4J2LoggingSystem extends Slf4JLoggingSystem { ...@@ -176,7 +176,7 @@ public class Log4J2LoggingSystem extends Slf4JLoggingSystem {
LoggerContext ctx = getLoggerContext(); LoggerContext ctx = getLoggerContext();
URL url = ResourceUtils.getURL(location); URL url = ResourceUtils.getURL(location);
ConfigurationSource source = getConfigurationSource(url); ConfigurationSource source = getConfigurationSource(url);
ctx.start(ConfigurationFactory.getInstance().getConfiguration(source)); ctx.start(ConfigurationFactory.getInstance().getConfiguration(ctx, source));
} }
catch (Exception ex) { catch (Exception ex) {
throw new IllegalStateException( throw new IllegalStateException(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment