From 65804d25a6820bc28cc088780acece029386fb67 Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Tue, 28 Dec 2021 17:06:42 -0500 Subject: [PATCH] Update to log4j 2.17.1 (#1820) Signed-off-by: Andriy Redko --- buildSrc/version.properties | 2 +- .../licenses/log4j-1.2-api-2.17.0.jar.sha1 | 1 - .../licenses/log4j-1.2-api-2.17.1.jar.sha1 | 1 + plugins/discovery-ec2/licenses/log4j-1.2-api-2.17.0.jar.sha1 | 1 - plugins/discovery-ec2/licenses/log4j-1.2-api-2.17.1.jar.sha1 | 1 + plugins/discovery-gce/licenses/log4j-1.2-api-2.17.0.jar.sha1 | 1 - plugins/discovery-gce/licenses/log4j-1.2-api-2.17.1.jar.sha1 | 1 + plugins/repository-gcs/licenses/log4j-1.2-api-2.17.0.jar.sha1 | 1 - plugins/repository-gcs/licenses/log4j-1.2-api-2.17.1.jar.sha1 | 1 + .../repository-hdfs/licenses/log4j-slf4j-impl-2.17.0.jar.sha1 | 1 - .../repository-hdfs/licenses/log4j-slf4j-impl-2.17.1.jar.sha1 | 1 + plugins/repository-s3/licenses/log4j-1.2-api-2.17.0.jar.sha1 | 1 - plugins/repository-s3/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 + 17 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.17.0.jar.sha1 create mode 100644 plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.17.1.jar.sha1 delete mode 100644 plugins/discovery-ec2/licenses/log4j-1.2-api-2.17.0.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/log4j-1.2-api-2.17.1.jar.sha1 delete mode 100644 plugins/discovery-gce/licenses/log4j-1.2-api-2.17.0.jar.sha1 create mode 100644 plugins/discovery-gce/licenses/log4j-1.2-api-2.17.1.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/log4j-1.2-api-2.17.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/log4j-1.2-api-2.17.1.jar.sha1 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 plugins/repository-s3/licenses/log4j-1.2-api-2.17.0.jar.sha1 create mode 100644 plugins/repository-s3/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 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index d1c3b113158..860f99370ab 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.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/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 deleted file mode 100644 index e589ba5d981..00000000000 --- a/plugins/discovery-azure-classic/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/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.17.1.jar.sha1 b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.17.1.jar.sha1 new file mode 100644 index 00000000000..23aa5c60bd5 --- /dev/null +++ b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.17.1.jar.sha1 @@ -0,0 +1 @@ +db3a7e7f07e878b92ac4a8f1100bee8325d5713a \ No newline at end of file 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 deleted file mode 100644 index e589ba5d981..00000000000 --- a/plugins/discovery-ec2/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/plugins/discovery-ec2/licenses/log4j-1.2-api-2.17.1.jar.sha1 b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.17.1.jar.sha1 new file mode 100644 index 00000000000..23aa5c60bd5 --- /dev/null +++ b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.17.1.jar.sha1 @@ -0,0 +1 @@ +db3a7e7f07e878b92ac4a8f1100bee8325d5713a \ No newline at end of file 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 deleted file mode 100644 index e589ba5d981..00000000000 --- a/plugins/discovery-gce/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/plugins/discovery-gce/licenses/log4j-1.2-api-2.17.1.jar.sha1 b/plugins/discovery-gce/licenses/log4j-1.2-api-2.17.1.jar.sha1 new file mode 100644 index 00000000000..23aa5c60bd5 --- /dev/null +++ b/plugins/discovery-gce/licenses/log4j-1.2-api-2.17.1.jar.sha1 @@ -0,0 +1 @@ +db3a7e7f07e878b92ac4a8f1100bee8325d5713a \ No newline at end of file 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 deleted file mode 100644 index e589ba5d981..00000000000 --- a/plugins/repository-gcs/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/plugins/repository-gcs/licenses/log4j-1.2-api-2.17.1.jar.sha1 b/plugins/repository-gcs/licenses/log4j-1.2-api-2.17.1.jar.sha1 new file mode 100644 index 00000000000..23aa5c60bd5 --- /dev/null +++ b/plugins/repository-gcs/licenses/log4j-1.2-api-2.17.1.jar.sha1 @@ -0,0 +1 @@ +db3a7e7f07e878b92ac4a8f1100bee8325d5713a \ No newline at end of file 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 fad46c4bc20..00000000000 --- 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 00000000000..894ed8d886c --- /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/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 deleted file mode 100644 index e589ba5d981..00000000000 --- a/plugins/repository-s3/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/plugins/repository-s3/licenses/log4j-1.2-api-2.17.1.jar.sha1 b/plugins/repository-s3/licenses/log4j-1.2-api-2.17.1.jar.sha1 new file mode 100644 index 00000000000..23aa5c60bd5 --- /dev/null +++ b/plugins/repository-s3/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 400d6bd606f..00000000000 --- 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 00000000000..9d0e5dc631e --- /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 933b9701a5e..00000000000 --- a/server/licenses/log4j-core-2.17.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fe6e7a32c1228884b9691a744f953a55d0dd8ead \ 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 00000000000..7d4634f3d4e --- /dev/null +++ b/server/licenses/log4j-core-2.17.1.jar.sha1 @@ -0,0 +1 @@ +779f60f3844dadc3ef597976fcb1e5127b1f343d \ No newline at end of file