Upgrade to log4j 2.17.0 (elastic#81902)

dnhatn · Dec 20, 2021 · f83e7d3 · f83e7d3
1 parent 3648ecf
commit f83e7d3
Show file tree

Hide file tree

Showing 43 changed files with 27 additions and 23 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.17.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.17.0.jar.sha1 b/modules/repository-url/licenses/log4j-1.2-api-2.17.0.jar.sha1
@@ -0,0 +1 @@
+aaf998968370edf738322fb750fbda118055508b
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.17.0.jar.sha1 b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.17.0.jar.sha1
@@ -0,0 +1 @@
+aaf998968370edf738322fb750fbda118055508b
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.17.0.jar.sha1 b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.17.0.jar.sha1
@@ -0,0 +1 @@
+aaf998968370edf738322fb750fbda118055508b
diff --git a/plugins/discovery-gce/build.gradle b/plugins/discovery-gce/build.gradle
@@ -47,6 +47,7 @@ tasks.named("thirdPartyAudit").configure {
           // classes are missing
           'com.google.common.base.Splitter',
           'com.google.common.collect.Lists',
+          'javax.jms.Message',
           'javax.servlet.ServletContextEvent',
           'javax.servlet.ServletContextListener',
           'org.apache.avalon.framework.logger.Logger',

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.17.0.jar.sha1 b/plugins/discovery-gce/licenses/log4j-1.2-api-2.17.0.jar.sha1
@@ -0,0 +1 @@
+aaf998968370edf738322fb750fbda118055508b
diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle
@@ -135,6 +135,7 @@ 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',

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.17.0.jar.sha1 b/plugins/repository-gcs/licenses/log4j-1.2-api-2.17.0.jar.sha1
@@ -0,0 +1 @@
+aaf998968370edf738322fb750fbda118055508b
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.17.0.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-1.2-api-2.17.0.jar.sha1
@@ -0,0 +1 @@
+aaf998968370edf738322fb750fbda118055508b
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.17.0.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
@@ -0,0 +1 @@
+1ec25ce0254749c94549ea9c3cea34bd0488c9c6
diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle
@@ -285,6 +285,7 @@ tasks.named("check").configure { dependsOn(s3ThirdPartyTest) }
 tasks.named("thirdPartyAudit").configure {
   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.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.17.0.jar.sha1 b/plugins/repository-s3/licenses/log4j-1.2-api-2.17.0.jar.sha1
@@ -0,0 +1 @@
+aaf998968370edf738322fb750fbda118055508b
diff --git a/server/build.gradle b/server/build.gradle
@@ -198,11 +198,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.17.0.jar.sha1 b/server/licenses/log4j-api-2.17.0.jar.sha1
@@ -0,0 +1 @@
+bbd791e9c8c9421e45337c4fe0a10851c086e36c
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.17.0.jar.sha1 b/server/licenses/log4j-core-2.17.0.jar.sha1
@@ -0,0 +1 @@
+fe6e7a32c1228884b9691a744f953a55d0dd8ead
diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java
@@ -629,7 +629,8 @@ protected static void checkStaticState() throws Exception {
                     statusData.stream().map(status -> status.getMessage().getFormattedMessage()).collect(Collectors.toList()),
                     anyOf(
                         emptyCollectionOf(String.class),
-                        contains(startsWith(LOG_4J_MSG_PREFIXES.get(0)), startsWith(LOG_4J_MSG_PREFIXES.get(1)))
+                        contains(startsWith(LOG_4J_MSG_PREFIXES.get(0)), startsWith(LOG_4J_MSG_PREFIXES.get(1))),
+                        contains(startsWith(LOG_4J_MSG_PREFIXES.get(1)))
                     )
                 );
             } finally {

diff --git a/x-pack/plugin/core/build.gradle b/x-pack/plugin/core/build.gradle
@@ -117,6 +117,7 @@ tasks.named("thirdPartyAudit").configure {
           'org.apache.log.Hierarchy',
           'org.apache.log.Logger',
           //commons-logging provided dependencies
+          'javax.jms.Message',
           'javax.servlet.ServletContextEvent',
           'javax.servlet.ServletContextListener'
   )

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.17.0.jar.sha1 b/x-pack/plugin/core/licenses/log4j-1.2-api-2.17.0.jar.sha1
@@ -0,0 +1 @@
+aaf998968370edf738322fb750fbda118055508b
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.17.0.jar.sha1 b/x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
@@ -0,0 +1 @@
+1ec25ce0254749c94549ea9c3cea34bd0488c9c6
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.17.0.jar.sha1 b/x-pack/plugin/security/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
@@ -0,0 +1 @@
+1ec25ce0254749c94549ea9c3cea34bd0488c9c6
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.17.0.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/log4j-api-2.17.0.jar.sha1
@@ -0,0 +1 @@
+bbd791e9c8c9421e45337c4fe0a10851c086e36c
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.17.0.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/log4j-core-2.17.0.jar.sha1
@@ -0,0 +1 @@
+fe6e7a32c1228884b9691a744f953a55d0dd8ead
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.17.0.jar.sha1 b/x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
@@ -0,0 +1 @@
+1ec25ce0254749c94549ea9c3cea34bd0488c9c6