From 309649ce8a3d808758350040464a069337aac46d Mon Sep 17 00:00:00 2001 From: Andrew Ross Date: Fri, 10 Dec 2021 15:03:41 -0600 Subject: [PATCH] Upgrade to logj4 2.15.0 (#1698) Signed-off-by: Andrew Ross --- buildSrc/version.properties | 2 +- plugins/discovery-azure-classic/build.gradle | 1 + .../licenses/log4j-1.2-api-2.11.2.jar.sha1 | 1 - .../licenses/log4j-1.2-api-2.15.0.jar.sha1 | 1 + plugins/discovery-ec2/build.gradle | 1 + plugins/discovery-ec2/licenses/log4j-1.2-api-2.11.2.jar.sha1 | 1 - plugins/discovery-ec2/licenses/log4j-1.2-api-2.15.0.jar.sha1 | 1 + plugins/discovery-gce/build.gradle | 1 + plugins/discovery-gce/licenses/log4j-1.2-api-2.11.2.jar.sha1 | 1 - plugins/discovery-gce/licenses/log4j-1.2-api-2.15.0.jar.sha1 | 1 + plugins/repository-gcs/build.gradle | 1 + plugins/repository-gcs/licenses/log4j-1.2-api-2.11.2.jar.sha1 | 1 - plugins/repository-gcs/licenses/log4j-1.2-api-2.15.0.jar.sha1 | 1 + .../repository-hdfs/licenses/log4j-slf4j-impl-2.11.2.jar.sha1 | 1 - .../repository-hdfs/licenses/log4j-slf4j-impl-2.15.0.jar.sha1 | 1 + plugins/repository-s3/build.gradle | 1 + plugins/repository-s3/licenses/log4j-1.2-api-2.11.2.jar.sha1 | 1 - plugins/repository-s3/licenses/log4j-1.2-api-2.15.0.jar.sha1 | 1 + server/build.gradle | 2 -- server/licenses/log4j-api-2.11.2.jar.sha1 | 1 - server/licenses/log4j-api-2.15.0.jar.sha1 | 1 + server/licenses/log4j-core-2.11.2.jar.sha1 | 1 - server/licenses/log4j-core-2.15.0.jar.sha1 | 1 + 23 files changed, 14 insertions(+), 11 deletions(-) delete mode 100644 plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.11.2.jar.sha1 create mode 100644 plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.15.0.jar.sha1 delete mode 100644 plugins/discovery-ec2/licenses/log4j-1.2-api-2.11.2.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/log4j-1.2-api-2.15.0.jar.sha1 delete mode 100644 plugins/discovery-gce/licenses/log4j-1.2-api-2.11.2.jar.sha1 create mode 100644 plugins/discovery-gce/licenses/log4j-1.2-api-2.15.0.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/log4j-1.2-api-2.11.2.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/log4j-1.2-api-2.15.0.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.11.2.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.15.0.jar.sha1 delete mode 100644 plugins/repository-s3/licenses/log4j-1.2-api-2.11.2.jar.sha1 create mode 100644 plugins/repository-s3/licenses/log4j-1.2-api-2.15.0.jar.sha1 delete mode 100644 server/licenses/log4j-api-2.11.2.jar.sha1 create mode 100644 server/licenses/log4j-api-2.15.0.jar.sha1 delete mode 100644 server/licenses/log4j-core-2.11.2.jar.sha1 create mode 100644 server/licenses/log4j-core-2.15.0.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 3aadf5af1ee..ed782f9ca74 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -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 diff --git a/plugins/discovery-azure-classic/build.gradle b/plugins/discovery-azure-classic/build.gradle index b340823fa24..8aac387cea6 100644 --- a/plugins/discovery-azure-classic/build.gradle +++ b/plugins/discovery-azure-classic/build.gradle @@ -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', diff --git a/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.11.2.jar.sha1 b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.11.2.jar.sha1 deleted file mode 100644 index 3a6c48f8c98..00000000000 --- a/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.11.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -afb9ef0baba766725c3733e6a2626877dba72715 \ No newline at end of file diff --git a/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.15.0.jar.sha1 b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.15.0.jar.sha1 new file mode 100644 index 00000000000..2dc80601173 --- /dev/null +++ b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.15.0.jar.sha1 @@ -0,0 +1 @@ +bc960fe2acbe6f3952011f88a771de18301534e7 \ No newline at end of file diff --git a/plugins/discovery-ec2/build.gradle b/plugins/discovery-ec2/build.gradle index 2c7673dae4f..a6d4134d15a 100644 --- a/plugins/discovery-ec2/build.gradle +++ b/plugins/discovery-ec2/build.gradle @@ -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', diff --git a/plugins/discovery-ec2/licenses/log4j-1.2-api-2.11.2.jar.sha1 b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.11.2.jar.sha1 deleted file mode 100644 index 3a6c48f8c98..00000000000 --- a/plugins/discovery-ec2/licenses/log4j-1.2-api-2.11.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -afb9ef0baba766725c3733e6a2626877dba72715 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/log4j-1.2-api-2.15.0.jar.sha1 b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.15.0.jar.sha1 new file mode 100644 index 00000000000..2dc80601173 --- /dev/null +++ b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.15.0.jar.sha1 @@ -0,0 +1 @@ +bc960fe2acbe6f3952011f88a771de18301534e7 \ No newline at end of file diff --git a/plugins/discovery-gce/build.gradle b/plugins/discovery-gce/build.gradle index 0075b35a00e..01c48f9a9df 100644 --- a/plugins/discovery-gce/build.gradle +++ b/plugins/discovery-gce/build.gradle @@ -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', diff --git a/plugins/discovery-gce/licenses/log4j-1.2-api-2.11.2.jar.sha1 b/plugins/discovery-gce/licenses/log4j-1.2-api-2.11.2.jar.sha1 deleted file mode 100644 index 3a6c48f8c98..00000000000 --- a/plugins/discovery-gce/licenses/log4j-1.2-api-2.11.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -afb9ef0baba766725c3733e6a2626877dba72715 \ No newline at end of file diff --git a/plugins/discovery-gce/licenses/log4j-1.2-api-2.15.0.jar.sha1 b/plugins/discovery-gce/licenses/log4j-1.2-api-2.15.0.jar.sha1 new file mode 100644 index 00000000000..2dc80601173 --- /dev/null +++ b/plugins/discovery-gce/licenses/log4j-1.2-api-2.15.0.jar.sha1 @@ -0,0 +1 @@ +bc960fe2acbe6f3952011f88a771de18301534e7 \ No newline at end of file diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 6414becebfb..5ab7d79d6f0 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -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', ) diff --git a/plugins/repository-gcs/licenses/log4j-1.2-api-2.11.2.jar.sha1 b/plugins/repository-gcs/licenses/log4j-1.2-api-2.11.2.jar.sha1 deleted file mode 100644 index 3a6c48f8c98..00000000000 --- a/plugins/repository-gcs/licenses/log4j-1.2-api-2.11.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -afb9ef0baba766725c3733e6a2626877dba72715 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/log4j-1.2-api-2.15.0.jar.sha1 b/plugins/repository-gcs/licenses/log4j-1.2-api-2.15.0.jar.sha1 new file mode 100644 index 00000000000..2dc80601173 --- /dev/null +++ b/plugins/repository-gcs/licenses/log4j-1.2-api-2.15.0.jar.sha1 @@ -0,0 +1 @@ +bc960fe2acbe6f3952011f88a771de18301534e7 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.11.2.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.11.2.jar.sha1 deleted file mode 100644 index 92b9f87bef7..00000000000 --- a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.11.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4d44e4edc4a7fb39f09b95b09f560a15976fa1ba \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.15.0.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.15.0.jar.sha1 new file mode 100644 index 00000000000..1f976e2cc5a --- /dev/null +++ b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.15.0.jar.sha1 @@ -0,0 +1 @@ +8bb417869ab3baa19f2fc70e6d776d041f0a8ebc \ No newline at end of file diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle index c4c8bce8b05..1ebd6c5c50f 100644 --- a/plugins/repository-s3/build.gradle +++ b/plugins/repository-s3/build.gradle @@ -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', diff --git a/plugins/repository-s3/licenses/log4j-1.2-api-2.11.2.jar.sha1 b/plugins/repository-s3/licenses/log4j-1.2-api-2.11.2.jar.sha1 deleted file mode 100644 index 3a6c48f8c98..00000000000 --- a/plugins/repository-s3/licenses/log4j-1.2-api-2.11.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -afb9ef0baba766725c3733e6a2626877dba72715 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/log4j-1.2-api-2.15.0.jar.sha1 b/plugins/repository-s3/licenses/log4j-1.2-api-2.15.0.jar.sha1 new file mode 100644 index 00000000000..2dc80601173 --- /dev/null +++ b/plugins/repository-s3/licenses/log4j-1.2-api-2.15.0.jar.sha1 @@ -0,0 +1 @@ +bc960fe2acbe6f3952011f88a771de18301534e7 \ No newline at end of file diff --git a/server/build.gradle b/server/build.gradle index b925604d4e4..44b88754312 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -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', diff --git a/server/licenses/log4j-api-2.11.2.jar.sha1 b/server/licenses/log4j-api-2.11.2.jar.sha1 deleted file mode 100644 index 66c8058e108..00000000000 --- a/server/licenses/log4j-api-2.11.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f5e9a2ffca496057d6891a3de65128efc636e26e \ No newline at end of file diff --git a/server/licenses/log4j-api-2.15.0.jar.sha1 b/server/licenses/log4j-api-2.15.0.jar.sha1 new file mode 100644 index 00000000000..a699db85f74 --- /dev/null +++ b/server/licenses/log4j-api-2.15.0.jar.sha1 @@ -0,0 +1 @@ +4a5aa7e55a29391c6f66e0b259d5189aa11e45d0 \ No newline at end of file diff --git a/server/licenses/log4j-core-2.11.2.jar.sha1 b/server/licenses/log4j-core-2.11.2.jar.sha1 deleted file mode 100644 index e96f8b6bd50..00000000000 --- a/server/licenses/log4j-core-2.11.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6c2fb3f5b7cd27504726aef1b674b542a0c9cf53 \ No newline at end of file diff --git a/server/licenses/log4j-core-2.15.0.jar.sha1 b/server/licenses/log4j-core-2.15.0.jar.sha1 new file mode 100644 index 00000000000..b0ab8d9f40f --- /dev/null +++ b/server/licenses/log4j-core-2.15.0.jar.sha1 @@ -0,0 +1 @@ +ba55c13d7ac2fd44df9cc8074455719a33f375b9 \ No newline at end of file