From 4f67856884ff580d8b48a858411b8c17cb0f8cdb Mon Sep 17 00:00:00 2001
From: Costin Leau <costin@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:04:27 +0200
Subject: [PATCH] Upgrade to log4j 2.17.1 (#82117)

Relates #82111

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 buildSrc/version.properties                                   | 2 +-
 docs/java-api/index.asciidoc                                  | 4 ++--
 .../repository-hdfs/licenses/log4j-slf4j-impl-2.17.0.jar.sha1 | 1 -
 .../repository-hdfs/licenses/log4j-slf4j-impl-2.17.1.jar.sha1 | 1 +
 server/licenses/log4j-1.2-api-2.17.0.jar.sha1                 | 1 -
 server/licenses/log4j-1.2-api-2.17.1.jar.sha1                 | 1 +
 server/licenses/log4j-api-2.17.0.jar.sha1                     | 1 -
 server/licenses/log4j-api-2.17.1.jar.sha1                     | 1 +
 server/licenses/log4j-core-2.17.0.jar.sha1                    | 1 -
 server/licenses/log4j-core-2.17.1.jar.sha1                    | 1 +
 .../plugin/security/licenses/log4j-slf4j-impl-2.17.0.jar.sha1 | 1 -
 .../plugin/security/licenses/log4j-slf4j-impl-2.17.1.jar.sha1 | 1 +
 .../plugin/sql/sql-action/licenses/log4j-api-2.17.0.jar.sha1  | 1 -
 .../plugin/sql/sql-action/licenses/log4j-api-2.17.1.jar.sha1  | 1 +
 .../plugin/sql/sql-action/licenses/log4j-core-2.17.0.jar.sha1 | 1 -
 .../plugin/sql/sql-action/licenses/log4j-core-2.17.1.jar.sha1 | 1 +
 16 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
 create mode 100644 plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.17.1.jar.sha1
 delete mode 100644 server/licenses/log4j-1.2-api-2.17.0.jar.sha1
 create mode 100644 server/licenses/log4j-1.2-api-2.17.1.jar.sha1
 delete mode 100644 server/licenses/log4j-api-2.17.0.jar.sha1
 create mode 100644 server/licenses/log4j-api-2.17.1.jar.sha1
 delete mode 100644 server/licenses/log4j-core-2.17.0.jar.sha1
 create mode 100644 server/licenses/log4j-core-2.17.1.jar.sha1
 delete mode 100644 x-pack/plugin/security/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
 create mode 100644 x-pack/plugin/security/licenses/log4j-slf4j-impl-2.17.1.jar.sha1
 delete mode 100644 x-pack/plugin/sql/sql-action/licenses/log4j-api-2.17.0.jar.sha1
 create mode 100644 x-pack/plugin/sql/sql-action/licenses/log4j-api-2.17.1.jar.sha1
 delete mode 100644 x-pack/plugin/sql/sql-action/licenses/log4j-core-2.17.0.jar.sha1
 create mode 100644 x-pack/plugin/sql/sql-action/licenses/log4j-core-2.17.1.jar.sha1

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 75b5e9884ea45..a15ae449a4744 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -12,7 +12,7 @@ snakeyaml         = 1.17
 icu4j             = 62.1
 supercsv          = 2.4.0
 # when updating log4j, please update also docs/java-api/index.asciidoc
-log4j             = 2.17.0
+log4j             = 2.17.1
 slf4j             = 1.6.2
 
 # when updating the JNA version, also update the version in buildSrc/build.gradle
diff --git a/docs/java-api/index.asciidoc b/docs/java-api/index.asciidoc
index 86ce69f1b9ffb..54e02d0034dcc 100644
--- a/docs/java-api/index.asciidoc
+++ b/docs/java-api/index.asciidoc
@@ -102,7 +102,7 @@ You need to also include Log4j 2 dependencies:
 <dependency>
     <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j-core</artifactId>
-    <version>2.11.1</version>
+    <version>2.17.1</version>
 </dependency>
 --------------------------------------------------
 
@@ -130,7 +130,7 @@ If you want to use another logger than Log4j 2, you can use http://www.slf4j.org
 <dependency>
     <groupId>org.apache.logging.log4j</groupId>
     <artifactId>log4j-to-slf4j</artifactId>
-    <version>2.11.1</version>
+    <version>2.17.1</version>
 </dependency>
 <dependency>
     <groupId>org.slf4j</groupId>
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
deleted file mode 100644
index fad46c4bc20fb..0000000000000
--- a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1ec25ce0254749c94549ea9c3cea34bd0488c9c6
\ No newline at end of file
diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.17.1.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.17.1.jar.sha1
new file mode 100644
index 0000000000000..894ed8d886c3f
--- /dev/null
+++ b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.17.1.jar.sha1
@@ -0,0 +1 @@
+84692d456bcce689355d33d68167875e486954dd
\ No newline at end of file
diff --git a/server/licenses/log4j-1.2-api-2.17.0.jar.sha1 b/server/licenses/log4j-1.2-api-2.17.0.jar.sha1
deleted file mode 100644
index e589ba5d981a0..0000000000000
--- a/server/licenses/log4j-1.2-api-2.17.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-aaf998968370edf738322fb750fbda118055508b
\ No newline at end of file
diff --git a/server/licenses/log4j-1.2-api-2.17.1.jar.sha1 b/server/licenses/log4j-1.2-api-2.17.1.jar.sha1
new file mode 100644
index 0000000000000..23aa5c60bd596
--- /dev/null
+++ b/server/licenses/log4j-1.2-api-2.17.1.jar.sha1
@@ -0,0 +1 @@
+db3a7e7f07e878b92ac4a8f1100bee8325d5713a
\ No newline at end of file
diff --git a/server/licenses/log4j-api-2.17.0.jar.sha1 b/server/licenses/log4j-api-2.17.0.jar.sha1
deleted file mode 100644
index 400d6bd606f5b..0000000000000
--- a/server/licenses/log4j-api-2.17.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bbd791e9c8c9421e45337c4fe0a10851c086e36c
\ No newline at end of file
diff --git a/server/licenses/log4j-api-2.17.1.jar.sha1 b/server/licenses/log4j-api-2.17.1.jar.sha1
new file mode 100644
index 0000000000000..9d0e5dc631ed5
--- /dev/null
+++ b/server/licenses/log4j-api-2.17.1.jar.sha1
@@ -0,0 +1 @@
+d771af8e336e372fb5399c99edabe0919aeaf5b2
\ No newline at end of file
diff --git a/server/licenses/log4j-core-2.17.0.jar.sha1 b/server/licenses/log4j-core-2.17.0.jar.sha1
deleted file mode 100644
index a83a26a8ae8d6..0000000000000
--- a/server/licenses/log4j-core-2.17.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-587127e2f8c5daaef9ba3806848675a1652959d3
\ No newline at end of file
diff --git a/server/licenses/log4j-core-2.17.1.jar.sha1 b/server/licenses/log4j-core-2.17.1.jar.sha1
new file mode 100644
index 0000000000000..e5549bbed79de
--- /dev/null
+++ b/server/licenses/log4j-core-2.17.1.jar.sha1
@@ -0,0 +1 @@
+a367b74bed3ed6b1cbcbf219159541393d38333b
\ No newline at end of file
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
deleted file mode 100644
index fad46c4bc20fb..0000000000000
--- a/x-pack/plugin/security/licenses/log4j-slf4j-impl-2.17.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1ec25ce0254749c94549ea9c3cea34bd0488c9c6
\ No newline at end of file
diff --git a/x-pack/plugin/security/licenses/log4j-slf4j-impl-2.17.1.jar.sha1 b/x-pack/plugin/security/licenses/log4j-slf4j-impl-2.17.1.jar.sha1
new file mode 100644
index 0000000000000..894ed8d886c3f
--- /dev/null
+++ b/x-pack/plugin/security/licenses/log4j-slf4j-impl-2.17.1.jar.sha1
@@ -0,0 +1 @@
+84692d456bcce689355d33d68167875e486954dd
\ No newline at end of file
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
deleted file mode 100644
index 400d6bd606f5b..0000000000000
--- a/x-pack/plugin/sql/sql-action/licenses/log4j-api-2.17.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bbd791e9c8c9421e45337c4fe0a10851c086e36c
\ No newline at end of file
diff --git a/x-pack/plugin/sql/sql-action/licenses/log4j-api-2.17.1.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/log4j-api-2.17.1.jar.sha1
new file mode 100644
index 0000000000000..9d0e5dc631ed5
--- /dev/null
+++ b/x-pack/plugin/sql/sql-action/licenses/log4j-api-2.17.1.jar.sha1
@@ -0,0 +1 @@
+d771af8e336e372fb5399c99edabe0919aeaf5b2
\ No newline at end of file
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
deleted file mode 100644
index 933b9701a5ec9..0000000000000
--- a/x-pack/plugin/sql/sql-action/licenses/log4j-core-2.17.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fe6e7a32c1228884b9691a744f953a55d0dd8ead
\ No newline at end of file
diff --git a/x-pack/plugin/sql/sql-action/licenses/log4j-core-2.17.1.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/log4j-core-2.17.1.jar.sha1
new file mode 100644
index 0000000000000..7d4634f3d4e18
--- /dev/null
+++ b/x-pack/plugin/sql/sql-action/licenses/log4j-core-2.17.1.jar.sha1
@@ -0,0 +1 @@
+779f60f3844dadc3ef597976fcb1e5127b1f343d
\ No newline at end of file