elastic · pgomulka · Sep 30, 2019 · Sep 30, 2019 · Nov 26, 2020 · Nov 26, 2020
diff --git a/buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle b/buildSrc/src/testKit/thirdPartyAudit/sample_jars/build.gradle
@@ -5,7 +5,7 @@ repositories {
   mavenCentral()
 }
 dependencies {
-  implementation 'org.apache.logging.log4j:log4j-core:2.11.1'
+  implementation 'org.apache.logging.log4j:log4j-core:2.14.0'
 }
 
 ["0.0.1", "0.0.2"].forEach { v ->

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -14,7 +14,7 @@ snakeyaml         = 1.26
 icu4j             = 62.1
 supercsv          = 2.4.0
 # when updating log4j, please update also docs/java-api/index.asciidoc
-log4j             = 2.11.1
+log4j             = 2.14.0
 slf4j             = 1.6.2
 ecsLogging        = 0.1.3
 

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.14.0.jar.sha1 b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.14.0.jar.sha1
@@ -0,0 +1 @@
+9587328cfaccd5db873f2ffe2308a4457378479f
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.14.0.jar.sha1 b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.14.0.jar.sha1
@@ -0,0 +1 @@
+9587328cfaccd5db873f2ffe2308a4457378479f
diff --git a/plugins/discovery-gce/build.gradle b/plugins/discovery-gce/build.gradle
@@ -53,6 +53,12 @@ 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',
+          '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'
   )
 }
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.14.0.jar.sha1 b/plugins/discovery-gce/licenses/log4j-1.2-api-2.14.0.jar.sha1
@@ -0,0 +1 @@
+9587328cfaccd5db873f2ffe2308a4457378479f
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.14.0.jar.sha1 b/plugins/repository-gcs/licenses/log4j-1.2-api-2.14.0.jar.sha1
@@ -0,0 +1 @@
+9587328cfaccd5db873f2ffe2308a4457378479f
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.14.0.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-1.2-api-2.14.0.jar.sha1
@@ -0,0 +1 @@
+9587328cfaccd5db873f2ffe2308a4457378479f
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.14.0.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.14.0.jar.sha1
@@ -0,0 +1 @@
+d6003a3b3f24fdb476848f4ecabdb2a43354e410
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.14.0.jar.sha1 b/plugins/repository-s3/licenses/log4j-1.2-api-2.14.0.jar.sha1
@@ -0,0 +1 @@
+9587328cfaccd5db873f2ffe2308a4457378479f
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.14.0.jar.sha1 b/server/licenses/log4j-api-2.14.0.jar.sha1
@@ -0,0 +1 @@
+23cdb2c6babad9b2b0dcf47c6a2c29d504e4c7a8
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.14.0.jar.sha1 b/server/licenses/log4j-core-2.14.0.jar.sha1
@@ -0,0 +1 @@
+e257b0562453f73eabac1bc3181ba33e79d193ed
diff --git a/x-pack/plugin/core/build.gradle b/x-pack/plugin/core/build.gradle
@@ -145,7 +145,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.14.0.jar.sha1 b/x-pack/plugin/core/licenses/log4j-1.2-api-2.14.0.jar.sha1
@@ -0,0 +1 @@
+9587328cfaccd5db873f2ffe2308a4457378479f
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.14.0.jar.sha1 b/x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-2.14.0.jar.sha1
@@ -0,0 +1 @@
+d6003a3b3f24fdb476848f4ecabdb2a43354e410
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.14.0.jar.sha1 b/x-pack/plugin/security/licenses/log4j-slf4j-impl-2.14.0.jar.sha1
@@ -0,0 +1 @@
+d6003a3b3f24fdb476848f4ecabdb2a43354e410
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.14.0.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/log4j-api-2.14.0.jar.sha1
@@ -0,0 +1 @@
+23cdb2c6babad9b2b0dcf47c6a2c29d504e4c7a8
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.14.0.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/log4j-core-2.14.0.jar.sha1
@@ -0,0 +1 @@
+e257b0562453f73eabac1bc3181ba33e79d193ed