Skip to content

Commit b7620a5

Browse files
LOGGING: Upgrade to Log4J 2.11.1 (#32675)
* LOGGING: Upgrade to Log4J 2.11.1 * Upgrade to `2.11.1` to fix memory leaks in slow logger when logging large requests * This was caused by a bug in Log4J https://issues.apache.org/jira/browse/LOG4J2-2269 and is fixed in `2.11.1` via https://git-wip-us.apache.org/repos/asf?p=logging-log4j2.git;h=9496c0c * Fixes #32537 * Fixes #27300
1 parent 5631815 commit b7620a5

13 files changed

+27
-16
lines changed

buildSrc/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jts = 1.13
77
jackson = 2.8.6
88
snakeyaml = 1.15
99
# when updating log4j, please update also docs/java-api/index.asciidoc
10-
log4j = 2.9.1
10+
log4j = 2.11.1
1111
slf4j = 1.6.2
1212

1313
# when updating the JNA version, also update the version in buildSrc/build.gradle

core/build.gradle

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,6 @@ thirdPartyAudit.excludes = [
179179
'com.fasterxml.jackson.dataformat.xml.JacksonXmlModule',
180180
'com.fasterxml.jackson.dataformat.xml.XmlMapper',
181181
'com.fasterxml.jackson.dataformat.xml.util.DefaultXmlPrettyPrinter',
182-
'com.fasterxml.jackson.databind.node.JsonNodeFactory',
183-
'com.fasterxml.jackson.databind.node.ObjectNode',
184182
'org.fusesource.jansi.Ansi',
185183
'org.fusesource.jansi.AnsiRenderer$Code',
186184
'com.lmax.disruptor.BlockingWaitStrategy',
@@ -221,12 +219,6 @@ thirdPartyAudit.excludes = [
221219
'javax.mail.internet.MimeMultipart',
222220
'javax.mail.internet.MimeUtility',
223221
'javax.mail.util.ByteArrayDataSource',
224-
'javax.persistence.AttributeConverter',
225-
'javax.persistence.EntityManager',
226-
'javax.persistence.EntityManagerFactory',
227-
'javax.persistence.EntityTransaction',
228-
'javax.persistence.Persistence',
229-
'javax.persistence.PersistenceException',
230222
'org.apache.commons.compress.compressors.CompressorStreamFactory',
231223
'org.apache.commons.compress.utils.IOUtils',
232224
'org.apache.commons.csv.CSVFormat',
@@ -259,6 +251,16 @@ thirdPartyAudit.excludes = [
259251
'org.noggit.JSONParser',
260252
]
261253

254+
if (JavaVersion.current() <= JavaVersion.VERSION_1_8) {
255+
// Used by Log4J 2.11.1
256+
thirdPartyAudit.excludes += [
257+
'java.io.ObjectInputFilter',
258+
'java.io.ObjectInputFilter$Config',
259+
'java.io.ObjectInputFilter$FilterInfo',
260+
'java.io.ObjectInputFilter$Status'
261+
]
262+
}
263+
262264
if (JavaVersion.current() > JavaVersion.VERSION_1_8) {
263265
thirdPartyAudit.excludes += ['javax.xml.bind.DatatypeConverter']
264266
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3aba3398fe064a3eab4331f88161c7480e848418

core/licenses/log4j-1.2-api-2.9.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
268f0fe4df3eefe052b57c87ec48517d64fb2a10

core/licenses/log4j-api-2.9.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
592a48674c926b01a9a747c7831bcd82a9e6d6e4

core/licenses/log4j-core-2.9.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/java-api/index.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ You need to also include Log4j 2 dependencies:
7070
<dependency>
7171
<groupId>org.apache.logging.log4j</groupId>
7272
<artifactId>log4j-core</artifactId>
73-
<version>2.9.1</version>
73+
<version>2.11.1</version>
7474
</dependency>
7575
--------------------------------------------------
7676

@@ -98,7 +98,7 @@ If you want to use another logger than Log4j 2, you can use http://www.slf4j.org
9898
<dependency>
9999
<groupId>org.apache.logging.log4j</groupId>
100100
<artifactId>log4j-to-slf4j</artifactId>
101-
<version>2.9.1</version>
101+
<version>2.11.1</version>
102102
</dependency>
103103
<dependency>
104104
<groupId>org.slf4j</groupId>

plugins/repository-hdfs/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,6 @@ thirdPartyAudit.excludes = [
559559
// we are not pulling in slf4j-ext, this is okay, Log4j will fallback gracefully
560560
'org.slf4j.ext.EventData',
561561

562-
'org.apache.log4j.AppenderSkeleton',
563562
'org.apache.log4j.AsyncAppender',
564563
'org.apache.log4j.helpers.ISO8601DateFormat',
565564
'org.apache.log4j.spi.ThrowableInformation',
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4b41b53a3a2d299ce381a69d165381ca19f62912

plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.9.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/logger-usage/build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,13 @@ thirdPartyAudit.excludes = [
4545
'org.osgi.framework.wiring.BundleWire',
4646
'org.osgi.framework.wiring.BundleWiring'
4747
]
48+
49+
if (JavaVersion.current() <= JavaVersion.VERSION_1_8) {
50+
// Used by Log4J 2.11.1
51+
thirdPartyAudit.excludes += [
52+
'java.io.ObjectInputFilter',
53+
'java.io.ObjectInputFilter$Config',
54+
'java.io.ObjectInputFilter$FilterInfo',
55+
'java.io.ObjectInputFilter$Status'
56+
]
57+
}

0 commit comments

Comments
 (0)