From 9d5c163dba974bf260acecc61f75fc368872b797 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Tue, 28 Dec 2021 22:27:21 +0200 Subject: [PATCH 1/2] Upgrade to log4j 2.17.1 --- build-tools-internal/version.properties | 2 +- modules/repository-url/licenses/log4j-1.2-api-2.17.0.jar.sha1 | 1 - modules/repository-url/licenses/log4j-1.2-api-2.17.1.jar.sha1 | 1 + .../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 + plugins/repository-hdfs/licenses/log4j-1.2-api-2.17.0.jar.sha1 | 1 - plugins/repository-hdfs/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 + x-pack/plugin/core/licenses/log4j-1.2-api-2.17.0.jar.sha1 | 1 - x-pack/plugin/core/licenses/log4j-1.2-api-2.17.1.jar.sha1 | 1 + .../identity-provider/licenses/log4j-slf4j-impl-2.17.0.jar.sha1 | 1 - .../identity-provider/licenses/log4j-slf4j-impl-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 + x-pack/plugin/sql/sql-action/licenses/log4j-api-2.17.0.jar.sha1 | 1 - x-pack/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 + .../vector-tile/licenses/log4j-slf4j-impl-2.17.0.jar.sha1 | 1 - .../vector-tile/licenses/log4j-slf4j-impl-2.17.1.jar.sha1 | 1 + 33 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 modules/repository-url/licenses/log4j-1.2-api-2.17.0.jar.sha1 create mode 100644 modules/repository-url/licenses/log4j-1.2-api-2.17.1.jar.sha1 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-1.2-api-2.17.0.jar.sha1 create mode 100644 plugins/repository-hdfs/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 delete mode 100644 x-pack/plugin/core/licenses/log4j-1.2-api-2.17.0.jar.sha1 create mode 100644 x-pack/plugin/core/licenses/log4j-1.2-api-2.17.1.jar.sha1 delete mode 100644 x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-2.17.0.jar.sha1 create mode 100644 x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-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 delete mode 100644 x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-2.17.0.jar.sha1 create mode 100644 x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-2.17.1.jar.sha1 diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index d73c673e6a15f..1f1c19cc830e6 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -14,7 +14,7 @@ snakeyaml = 1.26 icu4j = 68.2 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 ecsLogging = 1.2.0 diff --git a/modules/repository-url/licenses/log4j-1.2-api-2.17.0.jar.sha1 b/modules/repository-url/licenses/log4j-1.2-api-2.17.0.jar.sha1 deleted file mode 100644 index e589ba5d981a0..0000000000000 --- a/modules/repository-url/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/modules/repository-url/licenses/log4j-1.2-api-2.17.1.jar.sha1 b/modules/repository-url/licenses/log4j-1.2-api-2.17.1.jar.sha1 new file mode 100644 index 0000000000000..23aa5c60bd596 --- /dev/null +++ b/modules/repository-url/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-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 e589ba5d981a0..0000000000000 --- 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 0000000000000..23aa5c60bd596 --- /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 e589ba5d981a0..0000000000000 --- 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 0000000000000..23aa5c60bd596 --- /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 e589ba5d981a0..0000000000000 --- 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 0000000000000..23aa5c60bd596 --- /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 e589ba5d981a0..0000000000000 --- 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 0000000000000..23aa5c60bd596 --- /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-1.2-api-2.17.0.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-1.2-api-2.17.0.jar.sha1 deleted file mode 100644 index e589ba5d981a0..0000000000000 --- a/plugins/repository-hdfs/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-hdfs/licenses/log4j-1.2-api-2.17.1.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-1.2-api-2.17.1.jar.sha1 new file mode 100644 index 0000000000000..23aa5c60bd596 --- /dev/null +++ b/plugins/repository-hdfs/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 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/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 e589ba5d981a0..0000000000000 --- 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 0000000000000..23aa5c60bd596 --- /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 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 933b9701a5ec9..0000000000000 --- 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 0000000000000..7d4634f3d4e18 --- /dev/null +++ b/server/licenses/log4j-core-2.17.1.jar.sha1 @@ -0,0 +1 @@ +779f60f3844dadc3ef597976fcb1e5127b1f343d \ No newline at end of file diff --git a/x-pack/plugin/core/licenses/log4j-1.2-api-2.17.0.jar.sha1 b/x-pack/plugin/core/licenses/log4j-1.2-api-2.17.0.jar.sha1 deleted file mode 100644 index e589ba5d981a0..0000000000000 --- a/x-pack/plugin/core/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/x-pack/plugin/core/licenses/log4j-1.2-api-2.17.1.jar.sha1 b/x-pack/plugin/core/licenses/log4j-1.2-api-2.17.1.jar.sha1 new file mode 100644 index 0000000000000..23aa5c60bd596 --- /dev/null +++ b/x-pack/plugin/core/licenses/log4j-1.2-api-2.17.1.jar.sha1 @@ -0,0 +1 @@ +db3a7e7f07e878b92ac4a8f1100bee8325d5713a \ No newline at end of file diff --git a/x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-2.17.0.jar.sha1 b/x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-2.17.0.jar.sha1 deleted file mode 100644 index fad46c4bc20fb..0000000000000 --- a/x-pack/plugin/identity-provider/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/identity-provider/licenses/log4j-slf4j-impl-2.17.1.jar.sha1 b/x-pack/plugin/identity-provider/licenses/log4j-slf4j-impl-2.17.1.jar.sha1 new file mode 100644 index 0000000000000..894ed8d886c3f --- /dev/null +++ b/x-pack/plugin/identity-provider/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/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 diff --git a/x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-2.17.0.jar.sha1 b/x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-2.17.0.jar.sha1 deleted file mode 100644 index fad46c4bc20fb..0000000000000 --- a/x-pack/plugin/vector-tile/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/vector-tile/licenses/log4j-slf4j-impl-2.17.1.jar.sha1 b/x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-2.17.1.jar.sha1 new file mode 100644 index 0000000000000..894ed8d886c3f --- /dev/null +++ b/x-pack/plugin/vector-tile/licenses/log4j-slf4j-impl-2.17.1.jar.sha1 @@ -0,0 +1 @@ +84692d456bcce689355d33d68167875e486954dd \ No newline at end of file From b1b1e4d80d860af17e2c4616dc5b5ffc5859a3f4 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Tue, 28 Dec 2021 22:29:59 +0200 Subject: [PATCH 2/2] Update docs/changelog/82111.yaml --- docs/changelog/82111.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/changelog/82111.yaml diff --git a/docs/changelog/82111.yaml b/docs/changelog/82111.yaml new file mode 100644 index 0000000000000..28e2fd46268f5 --- /dev/null +++ b/docs/changelog/82111.yaml @@ -0,0 +1,5 @@ +pr: 82111 +summary: Upgrade to log4j 2.17.1 +area: Infra/Logging +type: upgrade +issues: []