Skip to content

Commit e3a44fa

Browse files
authored
Upgrade to log4j 2.15.0 (#1704)
Signed-off-by: Andrew Ross <[email protected]>
1 parent db4df4b commit e3a44fa

23 files changed

+14
-12
lines changed

buildSrc/version.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ jackson = 2.12.5
1313
snakeyaml = 1.26
1414
icu4j = 62.1
1515
supercsv = 2.4.0
16-
# when updating log4j, please update also docs/java-api/index.asciidoc
17-
log4j = 2.11.1
16+
log4j = 2.15.0
1817
slf4j = 1.6.2
1918

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

plugins/discovery-azure-classic/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ tasks.named("dependencyLicenses").configure {
122122
tasks.named("thirdPartyAudit").configure {
123123

124124
ignoreMissingClasses(
125+
'javax.jms.Message',
125126
'javax.servlet.ServletContextEvent',
126127
'javax.servlet.ServletContextListener',
127128
'org.apache.avalon.framework.logger.Logger',

plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.11.1.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bc960fe2acbe6f3952011f88a771de18301534e7

plugins/discovery-ec2/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ tasks.named("check").configure {
133133
tasks.named("thirdPartyAudit").configure {
134134
ignoreMissingClasses(
135135
// classes are missing
136+
'javax.jms.Message',
136137
'com.amazonaws.jmespath.JmesPathEvaluationVisitor',
137138
'com.amazonaws.jmespath.JmesPathExpression',
138139
'com.amazonaws.jmespath.JmesPathField',

plugins/discovery-ec2/licenses/log4j-1.2-api-2.11.1.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bc960fe2acbe6f3952011f88a771de18301534e7

plugins/discovery-gce/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ test {
5757

5858
thirdPartyAudit.ignoreMissingClasses(
5959
// classes are missing
60+
'javax.jms.Message',
6061
'com.google.common.base.Splitter',
6162
'com.google.common.collect.Lists',
6263
'javax.servlet.ServletContextEvent',

plugins/discovery-gce/licenses/log4j-1.2-api-2.11.1.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bc960fe2acbe6f3952011f88a771de18301534e7

plugins/repository-gcs/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ thirdPartyAudit {
204204
'org.apache.http.protocol.HttpProcessor',
205205
'org.apache.http.protocol.HttpRequestExecutor',
206206
// commons-logging provided dependencies
207+
'javax.jms.Message',
207208
'javax.servlet.ServletContextEvent',
208209
'javax.servlet.ServletContextListener',
209210
)

plugins/repository-gcs/licenses/log4j-1.2-api-2.11.1.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bc960fe2acbe6f3952011f88a771de18301534e7

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

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8bb417869ab3baa19f2fc70e6d776d041f0a8ebc

plugins/repository-s3/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,7 @@ tasks.named("check").configure { dependsOn(s3ThirdPartyTest) }
307307
308308
thirdPartyAudit.ignoreMissingClasses(
309309
// classes are missing
310+
'javax.jms.Message',
310311
'javax.servlet.ServletContextEvent',
311312
'javax.servlet.ServletContextListener',
312313
'org.apache.avalon.framework.logger.Logger',

plugins/repository-s3/licenses/log4j-1.2-api-2.11.1.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bc960fe2acbe6f3952011f88a771de18301534e7

server/build.gradle

-2
Original file line numberDiff line numberDiff line change
@@ -291,13 +291,11 @@ tasks.named("thirdPartyAudit").configure {
291291
'org.apache.commons.compress.utils.IOUtils',
292292
'org.apache.commons.csv.CSVFormat',
293293
'org.apache.commons.csv.QuoteMode',
294-
'org.apache.kafka.clients.producer.Callback',
295294
'org.apache.kafka.clients.producer.KafkaProducer',
296295
'org.apache.kafka.clients.producer.Producer',
297296
'org.apache.kafka.clients.producer.ProducerRecord',
298297
'org.apache.kafka.clients.producer.RecordMetadata',
299298
'org.codehaus.stax2.XMLStreamWriter2',
300-
'org.jctools.queues.MessagePassingQueue$Consumer',
301299
'org.jctools.queues.MpscArrayQueue',
302300
'org.osgi.framework.AdaptPermission',
303301
'org.osgi.framework.AdminPermission',

server/licenses/log4j-api-2.11.1.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4a5aa7e55a29391c6f66e0b259d5189aa11e45d0

server/licenses/log4j-core-2.11.1.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ba55c13d7ac2fd44df9cc8074455719a33f375b9

0 commit comments

Comments
 (0)