From ca27c8fd4fdb4c6aa896fe0b1b9284d60f98a544 Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Sat, 18 Dec 2021 12:36:59 -0500 Subject: [PATCH] Update to log4j 2.17.0 (#1771) --- buildSrc/version.properties | 2 +- .../licenses/log4j-1.2-api-2.16.0.jar.sha1 | 1 - .../licenses/log4j-1.2-api-2.17.0.jar.sha1 | 1 + plugins/discovery-ec2/licenses/log4j-1.2-api-2.16.0.jar.sha1 | 1 - plugins/discovery-ec2/licenses/log4j-1.2-api-2.17.0.jar.sha1 | 1 + plugins/discovery-gce/licenses/log4j-1.2-api-2.16.0.jar.sha1 | 1 - plugins/discovery-gce/licenses/log4j-1.2-api-2.17.0.jar.sha1 | 1 + plugins/repository-gcs/licenses/log4j-1.2-api-2.16.0.jar.sha1 | 1 - plugins/repository-gcs/licenses/log4j-1.2-api-2.17.0.jar.sha1 | 1 + .../repository-hdfs/licenses/log4j-slf4j-impl-2.16.0.jar.sha1 | 1 - .../repository-hdfs/licenses/log4j-slf4j-impl-2.17.0.jar.sha1 | 1 + plugins/repository-s3/licenses/log4j-1.2-api-2.16.0.jar.sha1 | 1 - plugins/repository-s3/licenses/log4j-1.2-api-2.17.0.jar.sha1 | 1 + server/licenses/log4j-api-2.16.0.jar.sha1 | 1 - server/licenses/log4j-api-2.17.0.jar.sha1 | 1 + server/licenses/log4j-core-2.16.0.jar.sha1 | 1 - server/licenses/log4j-core-2.17.0.jar.sha1 | 1 + 17 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.16.0.jar.sha1 create mode 100644 plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.17.0.jar.sha1 delete mode 100644 plugins/discovery-ec2/licenses/log4j-1.2-api-2.16.0.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/log4j-1.2-api-2.17.0.jar.sha1 delete mode 100644 plugins/discovery-gce/licenses/log4j-1.2-api-2.16.0.jar.sha1 create mode 100644 plugins/discovery-gce/licenses/log4j-1.2-api-2.17.0.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/log4j-1.2-api-2.16.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/log4j-1.2-api-2.17.0.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.16.0.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.17.0.jar.sha1 delete mode 100644 plugins/repository-s3/licenses/log4j-1.2-api-2.16.0.jar.sha1 create mode 100644 plugins/repository-s3/licenses/log4j-1.2-api-2.17.0.jar.sha1 delete mode 100644 server/licenses/log4j-api-2.16.0.jar.sha1 create mode 100644 server/licenses/log4j-api-2.17.0.jar.sha1 delete mode 100644 server/licenses/log4j-core-2.16.0.jar.sha1 create mode 100644 server/licenses/log4j-core-2.17.0.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 255e2ae2844..d1c3b113158 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.16.0 +log4j = 2.17.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.16.0.jar.sha1 b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.16.0.jar.sha1 deleted file mode 100644 index 02c13550843..00000000000 --- a/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.16.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ecbcfa4162e35b831705e97bbee546f81280ee6f \ No newline at end of file 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 new file mode 100644 index 00000000000..e589ba5d981 --- /dev/null +++ b/plugins/discovery-azure-classic/licenses/log4j-1.2-api-2.17.0.jar.sha1 @@ -0,0 +1 @@ +aaf998968370edf738322fb750fbda118055508b \ 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 deleted file mode 100644 index 02c13550843..00000000000 --- a/plugins/discovery-ec2/licenses/log4j-1.2-api-2.16.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ecbcfa4162e35b831705e97bbee546f81280ee6f \ 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 new file mode 100644 index 00000000000..e589ba5d981 --- /dev/null +++ b/plugins/discovery-ec2/licenses/log4j-1.2-api-2.17.0.jar.sha1 @@ -0,0 +1 @@ +aaf998968370edf738322fb750fbda118055508b \ 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 deleted file mode 100644 index 02c13550843..00000000000 --- a/plugins/discovery-gce/licenses/log4j-1.2-api-2.16.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ecbcfa4162e35b831705e97bbee546f81280ee6f \ 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 new file mode 100644 index 00000000000..e589ba5d981 --- /dev/null +++ b/plugins/discovery-gce/licenses/log4j-1.2-api-2.17.0.jar.sha1 @@ -0,0 +1 @@ +aaf998968370edf738322fb750fbda118055508b \ 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 deleted file mode 100644 index 02c13550843..00000000000 --- a/plugins/repository-gcs/licenses/log4j-1.2-api-2.16.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ecbcfa4162e35b831705e97bbee546f81280ee6f \ 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 new file mode 100644 index 00000000000..e589ba5d981 --- /dev/null +++ b/plugins/repository-gcs/licenses/log4j-1.2-api-2.17.0.jar.sha1 @@ -0,0 +1 @@ +aaf998968370edf738322fb750fbda118055508b \ 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 deleted file mode 100644 index daa05f650a4..00000000000 --- a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.16.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d4cc7712ebb4744681db815679248e4312f61b32 \ 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 new file mode 100644 index 00000000000..fad46c4bc20 --- /dev/null +++ b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.17.0.jar.sha1 @@ -0,0 +1 @@ +1ec25ce0254749c94549ea9c3cea34bd0488c9c6 \ 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 deleted file mode 100644 index 02c13550843..00000000000 --- a/plugins/repository-s3/licenses/log4j-1.2-api-2.16.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ecbcfa4162e35b831705e97bbee546f81280ee6f \ 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 new file mode 100644 index 00000000000..e589ba5d981 --- /dev/null +++ b/plugins/repository-s3/licenses/log4j-1.2-api-2.17.0.jar.sha1 @@ -0,0 +1 @@ +aaf998968370edf738322fb750fbda118055508b \ 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 deleted file mode 100644 index 589563722a0..00000000000 --- a/server/licenses/log4j-api-2.16.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4727d93a76616ffc4149dffac5801827c0f4ac71 \ 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 new file mode 100644 index 00000000000..400d6bd606f --- /dev/null +++ b/server/licenses/log4j-api-2.17.0.jar.sha1 @@ -0,0 +1 @@ +bbd791e9c8c9421e45337c4fe0a10851c086e36c \ 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 deleted file mode 100644 index 01953b895b0..00000000000 --- a/server/licenses/log4j-core-2.16.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ca12fb3902ecfcba1e1357ebfc55407acec30ede \ 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 new file mode 100644 index 00000000000..933b9701a5e --- /dev/null +++ b/server/licenses/log4j-core-2.17.0.jar.sha1 @@ -0,0 +1 @@ +fe6e7a32c1228884b9691a744f953a55d0dd8ead \ No newline at end of file