Upgrade log4j to 2.15.0

Originally we tried to a log4j update in elastic#47298, but we were unable to that due to the `DeprecationLoggerTests.testLogPermissions` test failing. The test relied on mocking and got removed in https://github.com/elastic/elasticsearch/pull/61474/files#diff-70de5a6ba5c637e7f19c51341417760d6e957beb5a1fa5703049095ea2719ee0L47 Now we should be able to the upgrade and then we can address the Security Manager permission questions raised in elastic#47298 separately.
arteam · Dec 14, 2021 · 1089bd8 · 1089bd8
1 parent 5ce8b8c
commit 1089bd8
Show file tree

Hide file tree

Showing 42 changed files with 41 additions and 25 deletions.
diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -14,7 +14,7 @@ snakeyaml         = 1.26
 icu4j             = 68.2
 supercsv          = 2.4.0
 # when updating log4j, please update also docs/java-api/index.asciidoc
-log4j             = 2.11.1
+log4j             = 2.15.0
 slf4j             = 1.6.2
 ecsLogging        = 1.2.0
 

diff --git a/modules/repository-url/build.gradle b/modules/repository-url/build.gradle
@@ -40,7 +40,8 @@ tasks.named("thirdPartyAudit").configure {
     'javax.servlet.ServletContextListener',
     'org.apache.avalon.framework.logger.Logger',
     'org.apache.log.Hierarchy',
-    'org.apache.log.Logger'
+    'org.apache.log.Logger',
+    'javax.jms.Message'
   )
 }
 

diff --git a/modules/repository-url/licenses/log4j-1.2-api-2.11.1.jar.sha1 b/modules/repository-url/licenses/log4j-1.2-api-2.11.1.jar.sha1
diff --git a/modules/repository-url/licenses/log4j-1.2-api-2.15.0.jar.sha1 b/modules/repository-url/licenses/log4j-1.2-api-2.15.0.jar.sha1
@@ -0,0 +1 @@
+bc960fe2acbe6f3952011f88a771de18301534e7
diff --git a/plugins/discovery-azure-classic/build.gradle b/plugins/discovery-azure-classic/build.gradle
@@ -116,6 +116,7 @@ tasks.named("thirdPartyAudit").configure {
           'org.apache.avalon.framework.logger.Logger',
           'org.apache.log.Hierarchy',
           'org.apache.log.Logger',
+          'javax.jms.Message',
           'org.eclipse.persistence.descriptors.ClassDescriptor',
           'org.eclipse.persistence.internal.oxm.MappingNodeValue',
           'org.eclipse.persistence.internal.oxm.TreeObjectBuilder',

diff --git a/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.11.1.jar.sha1 b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.11.1.jar.sha1
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
@@ -0,0 +1 @@
+bc960fe2acbe6f3952011f88a771de18301534e7
diff --git a/plugins/discovery-ec2/build.gradle b/plugins/discovery-ec2/build.gradle
@@ -125,6 +125,7 @@ tasks.named("thirdPartyAudit").configure {
           'org.apache.avalon.framework.logger.Logger',
           'org.apache.log.Hierarchy',
           'org.apache.log.Logger',
+          'javax.jms.Message',
           'javax.xml.bind.DatatypeConverter',
           'javax.xml.bind.JAXBContext'
   )

diff --git a/plugins/discovery-ec2/licenses/log4j-1.2-api-2.11.1.jar.sha1 b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.11.1.jar.sha1
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
@@ -0,0 +1 @@
+bc960fe2acbe6f3952011f88a771de18301534e7
diff --git a/plugins/discovery-gce/build.gradle b/plugins/discovery-gce/build.gradle
@@ -52,6 +52,12 @@ tasks.named("thirdPartyAudit").configure {
           'org.apache.avalon.framework.logger.Logger',
           'org.apache.log.Hierarchy',
           'org.apache.log.Logger',
+          'org.apache.avalon.framework.logger.Logger',
+          'com.google.common.collect.Lists',
+          'javax.jms.Message',
+          'org.apache.log.Logger',
+          'org.apache.log.Hierarchy',
+          'javax.servlet.ServletContextListener',
           'org.apache.http.ConnectionReuseStrategy',
           'org.apache.http.Header',
           'org.apache.http.HttpEntity',

diff --git a/plugins/discovery-gce/licenses/log4j-1.2-api-2.11.1.jar.sha1 b/plugins/discovery-gce/licenses/log4j-1.2-api-2.11.1.jar.sha1
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
@@ -0,0 +1 @@
+bc960fe2acbe6f3952011f88a771de18301534e7
diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle
@@ -135,6 +135,8 @@ tasks.named("thirdPartyAudit").configure {
     'org.apache.avalon.framework.logger.Logger',
     'org.apache.log.Hierarchy',
     'org.apache.log.Logger',
+    'javax.jms.Message',
+
     // optional apache http client dependencies
     'org.apache.http.ConnectionReuseStrategy',
     'org.apache.http.Header',
@@ -180,7 +182,7 @@ tasks.named("thirdPartyAudit").configure {
     'org.apache.http.protocol.HttpRequestExecutor',
     // commons-logging provided dependencies
     'javax.servlet.ServletContextEvent',
-    'javax.servlet.ServletContextListener'
+    'javax.servlet.ServletContextListener',
   )
 }
 

diff --git a/plugins/repository-gcs/licenses/log4j-1.2-api-2.11.1.jar.sha1 b/plugins/repository-gcs/licenses/log4j-1.2-api-2.11.1.jar.sha1
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
@@ -0,0 +1 @@
+bc960fe2acbe6f3952011f88a771de18301534e7
diff --git a/plugins/repository-hdfs/licenses/log4j-1.2-api-2.11.1.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-1.2-api-2.11.1.jar.sha1
diff --git a/plugins/repository-hdfs/licenses/log4j-1.2-api-2.15.0.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-1.2-api-2.15.0.jar.sha1
@@ -0,0 +1 @@
+bc960fe2acbe6f3952011f88a771de18301534e7
diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.11.1.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.11.1.jar.sha1
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
@@ -0,0 +1 @@
+8bb417869ab3baa19f2fc70e6d776d041f0a8ebc
diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle
@@ -290,6 +290,7 @@ tasks.named("thirdPartyAudit").configure {
           'org.apache.avalon.framework.logger.Logger',
           'org.apache.log.Hierarchy',
           'org.apache.log.Logger',
+          'javax.jms.Message',
           'software.amazon.ion.IonReader',
           'software.amazon.ion.IonSystem',
           'software.amazon.ion.IonType',
@@ -308,6 +309,6 @@ tasks.named("thirdPartyAudit").configure {
           'com.amazonaws.services.kms.model.EncryptResult',
           'com.amazonaws.services.kms.model.GenerateDataKeyRequest',
           'com.amazonaws.services.kms.model.GenerateDataKeyResult',
-          'javax.activation.DataHandler'
+          'javax.activation.DataHandler',
   )
 }
diff --git a/plugins/repository-s3/licenses/log4j-1.2-api-2.11.1.jar.sha1 b/plugins/repository-s3/licenses/log4j-1.2-api-2.11.1.jar.sha1
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
@@ -0,0 +1 @@
+bc960fe2acbe6f3952011f88a771de18301534e7
diff --git a/server/build.gradle b/server/build.gradle
@@ -201,11 +201,9 @@ 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.Producer',
             'org.apache.kafka.clients.producer.RecordMetadata',
             'org.codehaus.stax2.XMLStreamWriter2',
-            'org.jctools.queues.MessagePassingQueue$Consumer',
             'org.jctools.queues.MpscArrayQueue',
             'org.osgi.framework.Bundle',
             'org.osgi.framework.BundleActivator',

diff --git a/server/licenses/log4j-api-2.11.1.jar.sha1 b/server/licenses/log4j-api-2.11.1.jar.sha1
diff --git a/server/licenses/log4j-api-2.15.0.jar.sha1 b/server/licenses/log4j-api-2.15.0.jar.sha1
@@ -0,0 +1 @@
+4a5aa7e55a29391c6f66e0b259d5189aa11e45d0
diff --git a/server/licenses/log4j-core-2.11.1.jar.sha1 b/server/licenses/log4j-core-2.11.1.jar.sha1
diff --git a/server/licenses/log4j-core-2.15.0.jar.sha1 b/server/licenses/log4j-core-2.15.0.jar.sha1
@@ -0,0 +1 @@
+ba55c13d7ac2fd44df9cc8074455719a33f375b9
diff --git a/x-pack/plugin/core/build.gradle b/x-pack/plugin/core/build.gradle
@@ -118,7 +118,15 @@ tasks.named("thirdPartyAudit").configure {
           'org.apache.log.Logger',
           //commons-logging provided dependencies
           'javax.servlet.ServletContextEvent',
-          'javax.servlet.ServletContextListener'
+          'javax.servlet.ServletContextListener',
+
+          'org.apache.avalon.framework.logger.Logger',
+          'javax.jms.Message',
+          'org.apache.log.Logger',
+          'org.apache.log.Hierarchy',
+          'org.apache.log.Logger',
+          'javax.servlet.ServletContextListener',
+          'javax.servlet.ServletContextEvent'
   )
 }
 

diff --git a/x-pack/plugin/core/licenses/log4j-1.2-api-2.11.1.jar.sha1 b/x-pack/plugin/core/licenses/log4j-1.2-api-2.11.1.jar.sha1
diff --git a/x-pack/plugin/core/licenses/log4j-1.2-api-2.15.0.jar.sha1 b/x-pack/plugin/core/licenses/log4j-1.2-api-2.15.0.jar.sha1
@@ -0,0 +1 @@
+bc960fe2acbe6f3952011f88a771de18301534e7
diff --git a/x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-2.11.1.jar.sha1 b/x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-2.11.1.jar.sha1
diff --git a/x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-2.15.0.jar.sha1 b/x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
@@ -0,0 +1 @@
+8bb417869ab3baa19f2fc70e6d776d041f0a8ebc
diff --git a/x-pack/plugin/security/licenses/log4j-slf4j-impl-2.11.1.jar.sha1 b/x-pack/plugin/security/licenses/log4j-slf4j-impl-2.11.1.jar.sha1
diff --git a/x-pack/plugin/security/licenses/log4j-slf4j-impl-2.15.0.jar.sha1 b/x-pack/plugin/security/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
@@ -0,0 +1 @@
+8bb417869ab3baa19f2fc70e6d776d041f0a8ebc
diff --git a/x-pack/plugin/sql/sql-action/build.gradle b/x-pack/plugin/sql/sql-action/build.gradle
@@ -106,11 +106,9 @@ 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.Producer',
           'org.apache.kafka.clients.producer.RecordMetadata',
           'org.codehaus.stax2.XMLStreamWriter2',
-          'org.jctools.queues.MessagePassingQueue$Consumer',
           'org.jctools.queues.MpscArrayQueue',
           'org.osgi.framework.Bundle',
           'org.osgi.framework.BundleActivator',

diff --git a/x-pack/plugin/sql/sql-action/licenses/log4j-api-2.11.1.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/log4j-api-2.11.1.jar.sha1
diff --git a/x-pack/plugin/sql/sql-action/licenses/log4j-api-2.15.0.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/log4j-api-2.15.0.jar.sha1
@@ -0,0 +1 @@
+4a5aa7e55a29391c6f66e0b259d5189aa11e45d0
diff --git a/x-pack/plugin/sql/sql-action/licenses/log4j-core-2.11.1.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/log4j-core-2.11.1.jar.sha1
diff --git a/x-pack/plugin/sql/sql-action/licenses/log4j-core-2.15.0.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/log4j-core-2.15.0.jar.sha1
@@ -0,0 +1 @@
+ba55c13d7ac2fd44df9cc8074455719a33f375b9
diff --git a/x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-2.11.1.jar.sha1 b/x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-2.11.1.jar.sha1
diff --git a/x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-2.15.0.jar.sha1 b/x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
@@ -0,0 +1 @@
+8bb417869ab3baa19f2fc70e6d776d041f0a8ebc