Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to log4j 2.15.0 #1698

Merged
merged 1 commit into from
Dec 10, 2021
Merged

Upgrade to log4j 2.15.0 #1698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jackson = 2.12.5
snakeyaml = 1.26
icu4j = 62.1
supercsv = 2.4.0
log4j = 2.11.2
log4j = 2.15.0
slf4j = 1.6.2

# when updating the JNA version, also update the version in buildSrc/build.gradle
Expand Down
1 change: 1 addition & 0 deletions plugins/discovery-azure-classic/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ tasks.named("dependencyLicenses").configure {
tasks.named("thirdPartyAudit").configure {

ignoreMissingClasses(
'javax.jms.Message',
'javax.servlet.ServletContextEvent',
'javax.servlet.ServletContextListener',
'org.apache.avalon.framework.logger.Logger',
Expand Down
1 change: 0 additions & 1 deletion plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.11.2.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.15.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bc960fe2acbe6f3952011f88a771de18301534e7
1 change: 1 addition & 0 deletions plugins/discovery-ec2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ tasks.named("check").configure {
tasks.named("thirdPartyAudit").configure {
ignoreMissingClasses(
// classes are missing
'javax.jms.Message',
'com.amazonaws.jmespath.JmesPathEvaluationVisitor',
'com.amazonaws.jmespath.JmesPathExpression',
'com.amazonaws.jmespath.JmesPathField',
Expand Down
1 change: 0 additions & 1 deletion plugins/discovery-ec2/licenses/log4j-1.2-api-2.11.2.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/discovery-ec2/licenses/log4j-1.2-api-2.15.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bc960fe2acbe6f3952011f88a771de18301534e7
1 change: 1 addition & 0 deletions plugins/discovery-gce/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ test {

thirdPartyAudit.ignoreMissingClasses(
// classes are missing
'javax.jms.Message',
'com.google.common.base.Splitter',
'com.google.common.collect.Lists',
'javax.servlet.ServletContextEvent',
Expand Down
1 change: 0 additions & 1 deletion plugins/discovery-gce/licenses/log4j-1.2-api-2.11.2.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/discovery-gce/licenses/log4j-1.2-api-2.15.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bc960fe2acbe6f3952011f88a771de18301534e7
1 change: 1 addition & 0 deletions plugins/repository-gcs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ thirdPartyAudit {
'org.apache.http.protocol.HttpProcessor',
'org.apache.http.protocol.HttpRequestExecutor',
// commons-logging provided dependencies
'javax.jms.Message',
'javax.servlet.ServletContextEvent',
'javax.servlet.ServletContextListener',
)
Expand Down
1 change: 0 additions & 1 deletion plugins/repository-gcs/licenses/log4j-1.2-api-2.11.2.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-gcs/licenses/log4j-1.2-api-2.15.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bc960fe2acbe6f3952011f88a771de18301534e7
1 change: 0 additions & 1 deletion plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.11.2.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8bb417869ab3baa19f2fc70e6d776d041f0a8ebc
1 change: 1 addition & 0 deletions plugins/repository-s3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ tasks.named("check").configure { dependsOn(s3ThirdPartyTest) }

thirdPartyAudit.ignoreMissingClasses(
// classes are missing
'javax.jms.Message',
'javax.servlet.ServletContextEvent',
'javax.servlet.ServletContextListener',
'org.apache.avalon.framework.logger.Logger',
Expand Down
1 change: 0 additions & 1 deletion plugins/repository-s3/licenses/log4j-1.2-api-2.11.2.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-s3/licenses/log4j-1.2-api-2.15.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bc960fe2acbe6f3952011f88a771de18301534e7
2 changes: 0 additions & 2 deletions server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,13 +293,11 @@ tasks.named("thirdPartyAudit").configure {
'org.apache.commons.compress.utils.IOUtils',
'org.apache.commons.csv.CSVFormat',
'org.apache.commons.csv.QuoteMode',
'org.apache.kafka.clients.producer.Callback',
'org.apache.kafka.clients.producer.KafkaProducer',
'org.apache.kafka.clients.producer.Producer',
'org.apache.kafka.clients.producer.ProducerRecord',
'org.apache.kafka.clients.producer.RecordMetadata',
'org.codehaus.stax2.XMLStreamWriter2',
'org.jctools.queues.MessagePassingQueue$Consumer',
'org.jctools.queues.MpscArrayQueue',
'org.osgi.framework.AdaptPermission',
'org.osgi.framework.AdminPermission',
Expand Down
1 change: 0 additions & 1 deletion server/licenses/log4j-api-2.11.2.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/log4j-api-2.15.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4a5aa7e55a29391c6f66e0b259d5189aa11e45d0
1 change: 0 additions & 1 deletion server/licenses/log4j-core-2.11.2.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/log4j-core-2.15.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ba55c13d7ac2fd44df9cc8074455719a33f375b9