Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
2930bd41
Commit
2930bd41
authored
Nov 11, 2016
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7323 from Huang YunKun
* gh-7323: Upgrade to Log4j 2.7
parents
c30b917b
71826708
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
pom.xml
spring-boot-dependencies/pom.xml
+1
-1
Log4J2LoggingSystem.java
...ingframework/boot/logging/log4j2/Log4J2LoggingSystem.java
+1
-1
No files found.
spring-boot-dependencies/pom.xml
View file @
2930bd41
...
...
@@ -124,7 +124,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>
...
...
spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
View file @
2930bd41
...
...
@@ -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
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment