Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Log4j2 2.5

Browse Source 
Closes gh-5242
This commit is contained in:
Andy Wilkinson
2016-02-25 20:17:32 +00:00
parent dd37ca8a81
commit 06fb2d6d3e
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,7 +110,7 @@
<jtds.version>1.3.1</jtds.version>
<junit.version>4.12</junit.version>
<liquibase.version>3.4.2</liquibase.version>
<log4j2.version>2.4.1</log4j2.version>
<log4j2.version>2.5</log4j2.version>
<logback.version>1.1.5</logback.version>
<lombok.version>1.16.6</lombok.version>
<mariadb.version>1.3.4</mariadb.version>

6
spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java
View File

@@ -26,7 +26,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.FileConfigurationMonitor;
import org.hamcrest.Matcher;
import org.hamcrest.Matchers;
import org.junit.Before;
@@ -104,10 +103,7 @@ public class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests {
assertThat(new File(tmpDir() + "/tmp.log").exists()).isFalse();
assertThat(configuration.getConfigurationSource().getFile().getAbsolutePath())
.contains("log4j2-nondefault.xml");
// we assume that "log4j2-nondefault.xml" contains the 'monitorInterval'
// attribute, so we check that a monitor is created
assertThat(configuration.getConfigurationMonitor())
.isInstanceOf(FileConfigurationMonitor.class);
assertThat(configuration.getWatchManager().getIntervalSeconds()).isEqualTo(30);
}
@Test(expected = IllegalStateException.class)