Upgrade to logj4 2.15.0 (#1698)

Signed-off-by: Andrew Ross <andrross@amazon.com>
2021-12-10 15:03:41 -06:00 · 2021-12-10 15:03:41 -06:00 · 309649ce8a
parent ec00b86859
commit 309649ce8a
23 changed files with 14 additions and 11 deletions
--- 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
--- 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',
--- 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
@ -1 +0,0 @@
-afb9ef0baba766725c3733e6a2626877dba72715
--- 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
@ -0,0 +1 @@
+bc960fe2acbe6f3952011f88a771de18301534e7
--- 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',
--- 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
@ -1 +0,0 @@
-afb9ef0baba766725c3733e6a2626877dba72715
--- 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
@ -0,0 +1 @@
+bc960fe2acbe6f3952011f88a771de18301534e7
--- 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',
--- 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
@ -1 +0,0 @@
-afb9ef0baba766725c3733e6a2626877dba72715
--- 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
@ -0,0 +1 @@
+bc960fe2acbe6f3952011f88a771de18301534e7
--- 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',
  )
--- 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
@ -1 +0,0 @@
-afb9ef0baba766725c3733e6a2626877dba72715
--- 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
@ -0,0 +1 @@
+bc960fe2acbe6f3952011f88a771de18301534e7
--- 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
@ -1 +0,0 @@
-4d44e4edc4a7fb39f09b95b09f560a15976fa1ba
--- 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
@ -0,0 +1 @@
+8bb417869ab3baa19f2fc70e6d776d041f0a8ebc
--- 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',
--- 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
@ -1 +0,0 @@
-afb9ef0baba766725c3733e6a2626877dba72715
--- 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
@ -0,0 +1 @@
+bc960fe2acbe6f3952011f88a771de18301534e7
--- 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',
--- a/server/licenses/log4j-api-2.11.2.jar.sha1
+++ b/server/licenses/log4j-api-2.11.2.jar.sha1
@ -1 +0,0 @@
-f5e9a2ffca496057d6891a3de65128efc636e26e
--- a/server/licenses/log4j-api-2.15.0.jar.sha1
+++ b/server/licenses/log4j-api-2.15.0.jar.sha1
@ -0,0 +1 @@
+4a5aa7e55a29391c6f66e0b259d5189aa11e45d0
--- a/server/licenses/log4j-core-2.11.2.jar.sha1
+++ b/server/licenses/log4j-core-2.11.2.jar.sha1
@ -1 +0,0 @@
-6c2fb3f5b7cd27504726aef1b674b542a0c9cf53
--- a/server/licenses/log4j-core-2.15.0.jar.sha1
+++ b/server/licenses/log4j-core-2.15.0.jar.sha1
@ -0,0 +1 @@
+ba55c13d7ac2fd44df9cc8074455719a33f375b9