Upgrade to Log4j 2.9.0

This commit upgrades the Log4j dependency from version 2.8.2 to version
2.9.0.

Relates #26450
This commit is contained in:
Jason Tedor 2017-08-31 09:54:35 -04:00 committed by GitHub
parent eb87df9ff9
commit 697bc266ce
10 changed files with 16 additions and 11 deletions

View File

@ -8,7 +8,7 @@ jts = 1.13
jackson = 2.8.6
snakeyaml = 1.15
# When updating log4j, please update also docs/java-api/index.asciidoc
log4j = 2.8.2
log4j = 2.9.0
slf4j = 1.6.2
# when updating the JNA version, also update the version in buildSrc/build.gradle

View File

@ -157,12 +157,11 @@ thirdPartyAudit.excludes = [
'com.fasterxml.jackson.databind.ObjectMapper',
// from log4j
'com.beust.jcommander.IStringConverter',
'com.beust.jcommander.JCommander',
'com.conversantmedia.util.concurrent.DisruptorBlockingQueue',
'com.conversantmedia.util.concurrent.SpinPolicy',
'com.fasterxml.jackson.annotation.JsonInclude$Include',
'com.fasterxml.jackson.databind.DeserializationContext',
'com.fasterxml.jackson.databind.DeserializationFeature',
'com.fasterxml.jackson.databind.JsonMappingException',
'com.fasterxml.jackson.databind.JsonNode',
'com.fasterxml.jackson.databind.Module$SetupContext',
@ -203,11 +202,11 @@ thirdPartyAudit.excludes = [
'javax.jms.Connection',
'javax.jms.ConnectionFactory',
'javax.jms.Destination',
'javax.jms.JMSException',
'javax.jms.MapMessage',
'javax.jms.Message',
'javax.jms.MessageConsumer',
'javax.jms.MessageListener',
'javax.jms.MessageProducer',
'javax.jms.ObjectMessage',
'javax.jms.Session',
'javax.mail.Authenticator',
'javax.mail.Message$RecipientType',
@ -247,6 +246,7 @@ thirdPartyAudit.excludes = [
'org.osgi.framework.BundleEvent',
'org.osgi.framework.BundleReference',
'org.osgi.framework.FrameworkUtil',
'org.osgi.framework.ServiceRegistration',
'org.osgi.framework.SynchronousBundleListener',
'org.osgi.framework.wiring.BundleWire',
'org.osgi.framework.wiring.BundleWiring',

View File

@ -1 +0,0 @@
f1543534b8413aac91fa54d1fff65dfff76818cd

View File

@ -0,0 +1 @@
7e2f1637394eecdc3c8cd067b3f2cf4801b1bcf6

View File

@ -1 +0,0 @@
e590eeb783348ce8ddef205b82127f9084d82bf3

View File

@ -0,0 +1 @@
e0dcd508dfc4864a2f5a1963d6ffad170d970375

View File

@ -1 +0,0 @@
979fc0cf8460302e4ffbfe38c1b66a99450b0bb7

View File

@ -0,0 +1 @@
052f6548ae1688e126c29b5dc400929dc0128615

View File

@ -46,7 +46,12 @@ public final class ESLoggerFactory {
}
public static Logger getLogger(String prefix, Class<?> clazz) {
return getLogger(prefix, LogManager.getLogger(clazz));
/*
* Do not use LogManager#getLogger(Class) as this now uses Class#getCanonicalName under the hood; as this returns null for local and
* anonymous classes, any place we create, for example, an abstract component defined as an anonymous class (e.g., in tests) will
* result in a logger with a null name which will blow up in a lookup inside of Log4j.
*/
return getLogger(prefix, LogManager.getLogger(clazz.getName()));
}
public static Logger getLogger(String prefix, Logger logger) {

View File

@ -83,7 +83,7 @@ You need to also include Log4j 2 dependencies:
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.8.2</version>
<version>2.9.0</version>
</dependency>
--------------------------------------------------
@ -111,7 +111,7 @@ If you want to use another logger than Log4j 2, you can use http://www.slf4j.org
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
<version>2.8.2</version>
<version>2.9.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>