From 377251f323308ada6a9d7ea08505ed22f5f06bb6 Mon Sep 17 00:00:00 2001
From: Andriy Redko <andriy.redko@aiven.io>
Date: Tue, 14 Dec 2021 12:19:35 -0500
Subject: [PATCH] Upgrade to log4j 2.16.0 (#1721) (#1723)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
---
 buildSrc/version.properties                                     | 2 +-
 .../licenses/log4j-1.2-api-2.15.0.jar.sha1                      | 1 -
 .../licenses/log4j-1.2-api-2.16.0.jar.sha1                      | 1 +
 plugins/discovery-ec2/licenses/log4j-1.2-api-2.15.0.jar.sha1    | 1 -
 plugins/discovery-ec2/licenses/log4j-1.2-api-2.16.0.jar.sha1    | 1 +
 plugins/discovery-gce/licenses/log4j-1.2-api-2.15.0.jar.sha1    | 1 -
 plugins/discovery-gce/licenses/log4j-1.2-api-2.16.0.jar.sha1    | 1 +
 plugins/repository-gcs/licenses/log4j-1.2-api-2.15.0.jar.sha1   | 1 -
 plugins/repository-gcs/licenses/log4j-1.2-api-2.16.0.jar.sha1   | 1 +
 .../repository-hdfs/licenses/log4j-slf4j-impl-2.15.0.jar.sha1   | 1 -
 .../repository-hdfs/licenses/log4j-slf4j-impl-2.16.0.jar.sha1   | 1 +
 plugins/repository-s3/licenses/log4j-1.2-api-2.15.0.jar.sha1    | 1 -
 plugins/repository-s3/licenses/log4j-1.2-api-2.16.0.jar.sha1    | 1 +
 server/licenses/log4j-api-2.15.0.jar.sha1                       | 1 -
 server/licenses/log4j-api-2.16.0.jar.sha1                       | 1 +
 server/licenses/log4j-core-2.15.0.jar.sha1                      | 1 -
 server/licenses/log4j-core-2.16.0.jar.sha1                      | 1 +
 17 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.15.0.jar.sha1
 create mode 100644 plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.16.0.jar.sha1
 delete mode 100644 plugins/discovery-ec2/licenses/log4j-1.2-api-2.15.0.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/log4j-1.2-api-2.16.0.jar.sha1
 delete mode 100644 plugins/discovery-gce/licenses/log4j-1.2-api-2.15.0.jar.sha1
 create mode 100644 plugins/discovery-gce/licenses/log4j-1.2-api-2.16.0.jar.sha1
 delete mode 100644 plugins/repository-gcs/licenses/log4j-1.2-api-2.15.0.jar.sha1
 create mode 100644 plugins/repository-gcs/licenses/log4j-1.2-api-2.16.0.jar.sha1
 delete mode 100644 plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
 create mode 100644 plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.16.0.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/log4j-1.2-api-2.15.0.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/log4j-1.2-api-2.16.0.jar.sha1
 delete mode 100644 server/licenses/log4j-api-2.15.0.jar.sha1
 create mode 100644 server/licenses/log4j-api-2.16.0.jar.sha1
 delete mode 100644 server/licenses/log4j-core-2.15.0.jar.sha1
 create mode 100644 server/licenses/log4j-core-2.16.0.jar.sha1

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index c2d593c2f1cd1..c5ff7c0cd361e 100644
--- 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.15.0
+log4j             = 2.16.0
 slf4j             = 1.6.2
 
 # when updating the JNA version, also update the version in buildSrc/build.gradle
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
deleted file mode 100644
index 2dc80601173be..0000000000000
--- a/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bc960fe2acbe6f3952011f88a771de18301534e7
\ No newline at end of file
diff --git a/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.16.0.jar.sha1 b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.16.0.jar.sha1
new file mode 100644
index 0000000000000..02c135508434f
--- /dev/null
+++ b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.16.0.jar.sha1
@@ -0,0 +1 @@
+ecbcfa4162e35b831705e97bbee546f81280ee6f
\ No newline at end of file
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
deleted file mode 100644
index 2dc80601173be..0000000000000
--- a/plugins/discovery-ec2/licenses/log4j-1.2-api-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bc960fe2acbe6f3952011f88a771de18301534e7
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/log4j-1.2-api-2.16.0.jar.sha1 b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.16.0.jar.sha1
new file mode 100644
index 0000000000000..02c135508434f
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.16.0.jar.sha1
@@ -0,0 +1 @@
+ecbcfa4162e35b831705e97bbee546f81280ee6f
\ No newline at end of file
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
deleted file mode 100644
index 2dc80601173be..0000000000000
--- a/plugins/discovery-gce/licenses/log4j-1.2-api-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bc960fe2acbe6f3952011f88a771de18301534e7
\ No newline at end of file
diff --git a/plugins/discovery-gce/licenses/log4j-1.2-api-2.16.0.jar.sha1 b/plugins/discovery-gce/licenses/log4j-1.2-api-2.16.0.jar.sha1
new file mode 100644
index 0000000000000..02c135508434f
--- /dev/null
+++ b/plugins/discovery-gce/licenses/log4j-1.2-api-2.16.0.jar.sha1
@@ -0,0 +1 @@
+ecbcfa4162e35b831705e97bbee546f81280ee6f
\ No newline at end of file
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
deleted file mode 100644
index 2dc80601173be..0000000000000
--- a/plugins/repository-gcs/licenses/log4j-1.2-api-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bc960fe2acbe6f3952011f88a771de18301534e7
\ No newline at end of file
diff --git a/plugins/repository-gcs/licenses/log4j-1.2-api-2.16.0.jar.sha1 b/plugins/repository-gcs/licenses/log4j-1.2-api-2.16.0.jar.sha1
new file mode 100644
index 0000000000000..02c135508434f
--- /dev/null
+++ b/plugins/repository-gcs/licenses/log4j-1.2-api-2.16.0.jar.sha1
@@ -0,0 +1 @@
+ecbcfa4162e35b831705e97bbee546f81280ee6f
\ No newline at end of file
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
deleted file mode 100644
index 1f976e2cc5aa2..0000000000000
--- a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8bb417869ab3baa19f2fc70e6d776d041f0a8ebc
\ No newline at end of file
diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.16.0.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.16.0.jar.sha1
new file mode 100644
index 0000000000000..daa05f650a40f
--- /dev/null
+++ b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.16.0.jar.sha1
@@ -0,0 +1 @@
+d4cc7712ebb4744681db815679248e4312f61b32
\ No newline at end of file
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
deleted file mode 100644
index 2dc80601173be..0000000000000
--- a/plugins/repository-s3/licenses/log4j-1.2-api-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bc960fe2acbe6f3952011f88a771de18301534e7
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/log4j-1.2-api-2.16.0.jar.sha1 b/plugins/repository-s3/licenses/log4j-1.2-api-2.16.0.jar.sha1
new file mode 100644
index 0000000000000..02c135508434f
--- /dev/null
+++ b/plugins/repository-s3/licenses/log4j-1.2-api-2.16.0.jar.sha1
@@ -0,0 +1 @@
+ecbcfa4162e35b831705e97bbee546f81280ee6f
\ No newline at end of file
diff --git a/server/licenses/log4j-api-2.15.0.jar.sha1 b/server/licenses/log4j-api-2.15.0.jar.sha1
deleted file mode 100644
index a699db85f74ec..0000000000000
--- a/server/licenses/log4j-api-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4a5aa7e55a29391c6f66e0b259d5189aa11e45d0
\ No newline at end of file
diff --git a/server/licenses/log4j-api-2.16.0.jar.sha1 b/server/licenses/log4j-api-2.16.0.jar.sha1
new file mode 100644
index 0000000000000..589563722a09d
--- /dev/null
+++ b/server/licenses/log4j-api-2.16.0.jar.sha1
@@ -0,0 +1 @@
+4727d93a76616ffc4149dffac5801827c0f4ac71
\ No newline at end of file
diff --git a/server/licenses/log4j-core-2.15.0.jar.sha1 b/server/licenses/log4j-core-2.15.0.jar.sha1
deleted file mode 100644
index b0ab8d9f40fde..0000000000000
--- a/server/licenses/log4j-core-2.15.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ba55c13d7ac2fd44df9cc8074455719a33f375b9
\ No newline at end of file
diff --git a/server/licenses/log4j-core-2.16.0.jar.sha1 b/server/licenses/log4j-core-2.16.0.jar.sha1
new file mode 100644
index 0000000000000..01953b895b0b6
--- /dev/null
+++ b/server/licenses/log4j-core-2.16.0.jar.sha1
@@ -0,0 +1 @@
+ca12fb3902ecfcba1e1357ebfc55407acec30ede
\ No newline at end of file