From 2bbd0d939ce7ea9ec3aa905e6caf6e291c25564c Mon Sep 17 00:00:00 2001 From: Peter Nied Date: Mon, 21 Mar 2022 18:44:13 -0500 Subject: [PATCH 1/2] Move Jackson-databind to 2.13.2 (#2548) Resolves CVE-2020-36518 Signed-off-by: Peter Nied (cherry picked from commit d43235c5cfc3f6253530bf51cb6fb4d6dd7e0154) --- buildSrc/version.properties | 2 +- client/sniffer/licenses/jackson-core-2.12.6.jar.sha1 | 1 - client/sniffer/licenses/jackson-core-2.13.2.jar.sha1 | 1 + .../upgrade-cli/licenses/jackson-annotations-2.12.6.jar.sha1 | 1 - .../upgrade-cli/licenses/jackson-annotations-2.13.2.jar.sha1 | 1 + .../tools/upgrade-cli/licenses/jackson-databind-2.13.2.jar.sha1 | 1 + libs/x-content/licenses/jackson-core-2.12.6.jar.sha1 | 1 - libs/x-content/licenses/jackson-core-2.13.2.jar.sha1 | 1 + libs/x-content/licenses/jackson-dataformat-cbor-2.12.6.jar.sha1 | 1 - libs/x-content/licenses/jackson-dataformat-cbor-2.13.2.jar.sha1 | 1 + .../x-content/licenses/jackson-dataformat-smile-2.12.6.jar.sha1 | 1 - .../x-content/licenses/jackson-dataformat-smile-2.13.2.jar.sha1 | 1 + libs/x-content/licenses/jackson-dataformat-yaml-2.12.6.jar.sha1 | 1 - libs/x-content/licenses/jackson-dataformat-yaml-2.13.2.jar.sha1 | 1 + .../ingest-geoip/licenses/jackson-annotations-2.12.6.jar.sha1 | 1 - .../ingest-geoip/licenses/jackson-annotations-2.13.2.jar.sha1 | 1 + modules/ingest-geoip/licenses/jackson-databind-2.13.2.jar.sha1 | 1 + .../discovery-ec2/licenses/jackson-annotations-2.12.6.jar.sha1 | 1 - .../discovery-ec2/licenses/jackson-annotations-2.13.2.jar.sha1 | 1 + plugins/discovery-ec2/licenses/jackson-databind-2.13.2.jar.sha1 | 1 + .../licenses/jackson-annotations-2.12.6.jar.sha1 | 1 - .../licenses/jackson-annotations-2.13.2.jar.sha1 | 1 + .../repository-azure/licenses/jackson-databind-2.13.2.jar.sha1 | 1 + .../licenses/jackson-dataformat-xml-2.12.6.jar.sha1 | 1 - .../licenses/jackson-dataformat-xml-2.13.2.jar.sha1 | 1 + .../licenses/jackson-datatype-jsr310-2.12.6.jar.sha1 | 1 - .../licenses/jackson-datatype-jsr310-2.13.2.jar.sha1 | 1 + .../licenses/jackson-module-jaxb-annotations-2.12.6.jar.sha1 | 1 - .../licenses/jackson-module-jaxb-annotations-2.13.2.jar.sha1 | 1 + .../repository-hdfs/licenses/jackson-databind-2.13.2.jar.sha1 | 1 + .../repository-s3/licenses/jackson-annotations-2.12.6.jar.sha1 | 1 - .../repository-s3/licenses/jackson-annotations-2.13.2.jar.sha1 | 1 + plugins/repository-s3/licenses/jackson-databind-2.13.2.jar.sha1 | 1 + 33 files changed, 20 insertions(+), 14 deletions(-) delete mode 100644 client/sniffer/licenses/jackson-core-2.12.6.jar.sha1 create mode 100644 client/sniffer/licenses/jackson-core-2.13.2.jar.sha1 delete mode 100644 distribution/tools/upgrade-cli/licenses/jackson-annotations-2.12.6.jar.sha1 create mode 100644 distribution/tools/upgrade-cli/licenses/jackson-annotations-2.13.2.jar.sha1 create mode 100644 distribution/tools/upgrade-cli/licenses/jackson-databind-2.13.2.jar.sha1 delete mode 100644 libs/x-content/licenses/jackson-core-2.12.6.jar.sha1 create mode 100644 libs/x-content/licenses/jackson-core-2.13.2.jar.sha1 delete mode 100644 libs/x-content/licenses/jackson-dataformat-cbor-2.12.6.jar.sha1 create mode 100644 libs/x-content/licenses/jackson-dataformat-cbor-2.13.2.jar.sha1 delete mode 100644 libs/x-content/licenses/jackson-dataformat-smile-2.12.6.jar.sha1 create mode 100644 libs/x-content/licenses/jackson-dataformat-smile-2.13.2.jar.sha1 delete mode 100644 libs/x-content/licenses/jackson-dataformat-yaml-2.12.6.jar.sha1 create mode 100644 libs/x-content/licenses/jackson-dataformat-yaml-2.13.2.jar.sha1 delete mode 100644 modules/ingest-geoip/licenses/jackson-annotations-2.12.6.jar.sha1 create mode 100644 modules/ingest-geoip/licenses/jackson-annotations-2.13.2.jar.sha1 create mode 100644 modules/ingest-geoip/licenses/jackson-databind-2.13.2.jar.sha1 delete mode 100644 plugins/discovery-ec2/licenses/jackson-annotations-2.12.6.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/jackson-annotations-2.13.2.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/jackson-databind-2.13.2.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/jackson-annotations-2.12.6.jar.sha1 create mode 100644 plugins/repository-azure/licenses/jackson-annotations-2.13.2.jar.sha1 create mode 100644 plugins/repository-azure/licenses/jackson-databind-2.13.2.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/jackson-dataformat-xml-2.12.6.jar.sha1 create mode 100644 plugins/repository-azure/licenses/jackson-dataformat-xml-2.13.2.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/jackson-datatype-jsr310-2.12.6.jar.sha1 create mode 100644 plugins/repository-azure/licenses/jackson-datatype-jsr310-2.13.2.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.12.6.jar.sha1 create mode 100644 plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.13.2.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/jackson-databind-2.13.2.jar.sha1 delete mode 100644 plugins/repository-s3/licenses/jackson-annotations-2.12.6.jar.sha1 create mode 100644 plugins/repository-s3/licenses/jackson-annotations-2.13.2.jar.sha1 create mode 100644 plugins/repository-s3/licenses/jackson-databind-2.13.2.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 055770903f87f..c4d4d4cd1e417 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -9,7 +9,7 @@ bundled_jdk = 11.0.15+10 # optional dependencies spatial4j = 0.7 jts = 1.15.0 -jackson = 2.12.6 +jackson = 2.13.2 jackson_databind = 2.12.6.1 snakeyaml = 1.26 icu4j = 62.1 diff --git a/client/sniffer/licenses/jackson-core-2.12.6.jar.sha1 b/client/sniffer/licenses/jackson-core-2.12.6.jar.sha1 deleted file mode 100644 index d62c70d6b0f11..0000000000000 --- a/client/sniffer/licenses/jackson-core-2.12.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5bf206c0b5982cfcd868b3d9349dc5190db8bab5 \ No newline at end of file diff --git a/client/sniffer/licenses/jackson-core-2.13.2.jar.sha1 b/client/sniffer/licenses/jackson-core-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..eb8a8bc45f041 --- /dev/null +++ b/client/sniffer/licenses/jackson-core-2.13.2.jar.sha1 @@ -0,0 +1 @@ +0a6a0e0620d51833feffc67bccb51937b2345763 \ No newline at end of file diff --git a/distribution/tools/upgrade-cli/licenses/jackson-annotations-2.12.6.jar.sha1 b/distribution/tools/upgrade-cli/licenses/jackson-annotations-2.12.6.jar.sha1 deleted file mode 100644 index 48ee3bf53c630..0000000000000 --- a/distribution/tools/upgrade-cli/licenses/jackson-annotations-2.12.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9487231edd6b0b1f14692c9cba9e0462809215d1 \ No newline at end of file diff --git a/distribution/tools/upgrade-cli/licenses/jackson-annotations-2.13.2.jar.sha1 b/distribution/tools/upgrade-cli/licenses/jackson-annotations-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..ecd3fb49d5b12 --- /dev/null +++ b/distribution/tools/upgrade-cli/licenses/jackson-annotations-2.13.2.jar.sha1 @@ -0,0 +1 @@ +ec18851f1976d5b810ae1a5fcc32520d2d38f77a \ No newline at end of file diff --git a/distribution/tools/upgrade-cli/licenses/jackson-databind-2.13.2.jar.sha1 b/distribution/tools/upgrade-cli/licenses/jackson-databind-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..5d356f3fd045f --- /dev/null +++ b/distribution/tools/upgrade-cli/licenses/jackson-databind-2.13.2.jar.sha1 @@ -0,0 +1 @@ +926e48c451166a291f1ce6c6276d9abbefa7c00f \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-core-2.12.6.jar.sha1 b/libs/x-content/licenses/jackson-core-2.12.6.jar.sha1 deleted file mode 100644 index d62c70d6b0f11..0000000000000 --- a/libs/x-content/licenses/jackson-core-2.12.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5bf206c0b5982cfcd868b3d9349dc5190db8bab5 \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-core-2.13.2.jar.sha1 b/libs/x-content/licenses/jackson-core-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..eb8a8bc45f041 --- /dev/null +++ b/libs/x-content/licenses/jackson-core-2.13.2.jar.sha1 @@ -0,0 +1 @@ +0a6a0e0620d51833feffc67bccb51937b2345763 \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-dataformat-cbor-2.12.6.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-cbor-2.12.6.jar.sha1 deleted file mode 100644 index 9fdb5a5012b8d..0000000000000 --- a/libs/x-content/licenses/jackson-dataformat-cbor-2.12.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3cd2e6a538f73483c6c59c354ce2276bcdc5ba7b \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-dataformat-cbor-2.13.2.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-cbor-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..3a4f0e1b17565 --- /dev/null +++ b/libs/x-content/licenses/jackson-dataformat-cbor-2.13.2.jar.sha1 @@ -0,0 +1 @@ +4fc77e1ec6922fc48bf1181e4b38f600dac222ff \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-dataformat-smile-2.12.6.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-smile-2.12.6.jar.sha1 deleted file mode 100644 index a8eb043684fac..0000000000000 --- a/libs/x-content/licenses/jackson-dataformat-smile-2.12.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bc9b6bcf12a14382424324ee067456ee354a0dfb \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-dataformat-smile-2.13.2.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-smile-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..86a53f72de66e --- /dev/null +++ b/libs/x-content/licenses/jackson-dataformat-smile-2.13.2.jar.sha1 @@ -0,0 +1 @@ +984bb22f310ebbedc967d206e672f8acf766a98e \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-dataformat-yaml-2.12.6.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-yaml-2.12.6.jar.sha1 deleted file mode 100644 index e2ed10942b3b6..0000000000000 --- a/libs/x-content/licenses/jackson-dataformat-yaml-2.12.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cfba448bc4e92b8656968756a9c4af1ad8e502e4 \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-dataformat-yaml-2.13.2.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-yaml-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..1cba175acf2ae --- /dev/null +++ b/libs/x-content/licenses/jackson-dataformat-yaml-2.13.2.jar.sha1 @@ -0,0 +1 @@ +5601496b5b6e43d947aeeffbffadb2b18961c731 \ No newline at end of file diff --git a/modules/ingest-geoip/licenses/jackson-annotations-2.12.6.jar.sha1 b/modules/ingest-geoip/licenses/jackson-annotations-2.12.6.jar.sha1 deleted file mode 100644 index 48ee3bf53c630..0000000000000 --- a/modules/ingest-geoip/licenses/jackson-annotations-2.12.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9487231edd6b0b1f14692c9cba9e0462809215d1 \ No newline at end of file diff --git a/modules/ingest-geoip/licenses/jackson-annotations-2.13.2.jar.sha1 b/modules/ingest-geoip/licenses/jackson-annotations-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..ecd3fb49d5b12 --- /dev/null +++ b/modules/ingest-geoip/licenses/jackson-annotations-2.13.2.jar.sha1 @@ -0,0 +1 @@ +ec18851f1976d5b810ae1a5fcc32520d2d38f77a \ No newline at end of file diff --git a/modules/ingest-geoip/licenses/jackson-databind-2.13.2.jar.sha1 b/modules/ingest-geoip/licenses/jackson-databind-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..5d356f3fd045f --- /dev/null +++ b/modules/ingest-geoip/licenses/jackson-databind-2.13.2.jar.sha1 @@ -0,0 +1 @@ +926e48c451166a291f1ce6c6276d9abbefa7c00f \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-annotations-2.12.6.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-annotations-2.12.6.jar.sha1 deleted file mode 100644 index 48ee3bf53c630..0000000000000 --- a/plugins/discovery-ec2/licenses/jackson-annotations-2.12.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9487231edd6b0b1f14692c9cba9e0462809215d1 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-annotations-2.13.2.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-annotations-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..ecd3fb49d5b12 --- /dev/null +++ b/plugins/discovery-ec2/licenses/jackson-annotations-2.13.2.jar.sha1 @@ -0,0 +1 @@ +ec18851f1976d5b810ae1a5fcc32520d2d38f77a \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-databind-2.13.2.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-databind-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..5d356f3fd045f --- /dev/null +++ b/plugins/discovery-ec2/licenses/jackson-databind-2.13.2.jar.sha1 @@ -0,0 +1 @@ +926e48c451166a291f1ce6c6276d9abbefa7c00f \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-annotations-2.12.6.jar.sha1 b/plugins/repository-azure/licenses/jackson-annotations-2.12.6.jar.sha1 deleted file mode 100644 index 48ee3bf53c630..0000000000000 --- a/plugins/repository-azure/licenses/jackson-annotations-2.12.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9487231edd6b0b1f14692c9cba9e0462809215d1 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-annotations-2.13.2.jar.sha1 b/plugins/repository-azure/licenses/jackson-annotations-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..ecd3fb49d5b12 --- /dev/null +++ b/plugins/repository-azure/licenses/jackson-annotations-2.13.2.jar.sha1 @@ -0,0 +1 @@ +ec18851f1976d5b810ae1a5fcc32520d2d38f77a \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-databind-2.13.2.jar.sha1 b/plugins/repository-azure/licenses/jackson-databind-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..5d356f3fd045f --- /dev/null +++ b/plugins/repository-azure/licenses/jackson-databind-2.13.2.jar.sha1 @@ -0,0 +1 @@ +926e48c451166a291f1ce6c6276d9abbefa7c00f \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-dataformat-xml-2.12.6.jar.sha1 b/plugins/repository-azure/licenses/jackson-dataformat-xml-2.12.6.jar.sha1 deleted file mode 100644 index 43ee9816d99e3..0000000000000 --- a/plugins/repository-azure/licenses/jackson-dataformat-xml-2.12.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fecb8514c3a89102bd619b6c624f906a6098b588 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-dataformat-xml-2.13.2.jar.sha1 b/plugins/repository-azure/licenses/jackson-dataformat-xml-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..7d020f81a91ba --- /dev/null +++ b/plugins/repository-azure/licenses/jackson-dataformat-xml-2.13.2.jar.sha1 @@ -0,0 +1 @@ +cb6a722f128ff0ce2494384d419b6ff20fad25ab \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-datatype-jsr310-2.12.6.jar.sha1 b/plugins/repository-azure/licenses/jackson-datatype-jsr310-2.12.6.jar.sha1 deleted file mode 100644 index d005cc1bd5f11..0000000000000 --- a/plugins/repository-azure/licenses/jackson-datatype-jsr310-2.12.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0f7d0d854f24c4254885c275a09fb885ef578b48 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-datatype-jsr310-2.13.2.jar.sha1 b/plugins/repository-azure/licenses/jackson-datatype-jsr310-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..979d38bb38784 --- /dev/null +++ b/plugins/repository-azure/licenses/jackson-datatype-jsr310-2.13.2.jar.sha1 @@ -0,0 +1 @@ +cddd9380efd4b81ea01e98be8fbdc9765a81793b \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.12.6.jar.sha1 b/plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.12.6.jar.sha1 deleted file mode 100644 index 686d813e002c8..0000000000000 --- a/plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.12.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a0bea2c6f98eb0dc24208b54a53da80ea459c156 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.13.2.jar.sha1 b/plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..c71c4fe5ee90c --- /dev/null +++ b/plugins/repository-azure/licenses/jackson-module-jaxb-annotations-2.13.2.jar.sha1 @@ -0,0 +1 @@ +e2f198c512f0f0ccbd6d618baecc9dde9975eadf \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/jackson-databind-2.13.2.jar.sha1 b/plugins/repository-hdfs/licenses/jackson-databind-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..5d356f3fd045f --- /dev/null +++ b/plugins/repository-hdfs/licenses/jackson-databind-2.13.2.jar.sha1 @@ -0,0 +1 @@ +926e48c451166a291f1ce6c6276d9abbefa7c00f \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-annotations-2.12.6.jar.sha1 b/plugins/repository-s3/licenses/jackson-annotations-2.12.6.jar.sha1 deleted file mode 100644 index 48ee3bf53c630..0000000000000 --- a/plugins/repository-s3/licenses/jackson-annotations-2.12.6.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9487231edd6b0b1f14692c9cba9e0462809215d1 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-annotations-2.13.2.jar.sha1 b/plugins/repository-s3/licenses/jackson-annotations-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..ecd3fb49d5b12 --- /dev/null +++ b/plugins/repository-s3/licenses/jackson-annotations-2.13.2.jar.sha1 @@ -0,0 +1 @@ +ec18851f1976d5b810ae1a5fcc32520d2d38f77a \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-databind-2.13.2.jar.sha1 b/plugins/repository-s3/licenses/jackson-databind-2.13.2.jar.sha1 new file mode 100644 index 0000000000000..5d356f3fd045f --- /dev/null +++ b/plugins/repository-s3/licenses/jackson-databind-2.13.2.jar.sha1 @@ -0,0 +1 @@ +926e48c451166a291f1ce6c6276d9abbefa7c00f \ No newline at end of file From 61e22cde09ae811ebe691d7f6f8bae758d146ebd Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Fri, 1 Apr 2022 16:36:54 -0400 Subject: [PATCH 2/2] [CVE-2020-36518] Update jackson-databind to 2.13.2.2 (#2705) Signed-off-by: Andriy Redko --- buildSrc/version.properties | 2 +- .../upgrade-cli/licenses/jackson-databind-2.12.6.1.jar.sha1 | 1 - .../upgrade-cli/licenses/jackson-databind-2.13.2.2.jar.sha1 | 1 + .../tools/upgrade-cli/licenses/jackson-databind-2.13.2.jar.sha1 | 1 - .../ingest-geoip/licenses/jackson-databind-2.12.6.1.jar.sha1 | 1 - .../ingest-geoip/licenses/jackson-databind-2.13.2.2.jar.sha1 | 1 + modules/ingest-geoip/licenses/jackson-databind-2.13.2.jar.sha1 | 1 - .../discovery-ec2/licenses/jackson-databind-2.12.6.1.jar.sha1 | 1 - .../discovery-ec2/licenses/jackson-databind-2.13.2.2.jar.sha1 | 1 + plugins/discovery-ec2/licenses/jackson-databind-2.13.2.jar.sha1 | 1 - .../licenses/jackson-databind-2.12.6.1.jar.sha1 | 1 - .../licenses/jackson-databind-2.13.2.2.jar.sha1 | 1 + .../repository-azure/licenses/jackson-databind-2.13.2.jar.sha1 | 1 - .../repository-hdfs/licenses/jackson-databind-2.12.6.1.jar.sha1 | 1 - .../repository-hdfs/licenses/jackson-databind-2.13.2.2.jar.sha1 | 1 + .../repository-hdfs/licenses/jackson-databind-2.13.2.jar.sha1 | 1 - .../repository-s3/licenses/jackson-databind-2.12.6.1.jar.sha1 | 1 - .../repository-s3/licenses/jackson-databind-2.13.2.2.jar.sha1 | 1 + plugins/repository-s3/licenses/jackson-databind-2.13.2.jar.sha1 | 1 - 19 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 distribution/tools/upgrade-cli/licenses/jackson-databind-2.12.6.1.jar.sha1 create mode 100644 distribution/tools/upgrade-cli/licenses/jackson-databind-2.13.2.2.jar.sha1 delete mode 100644 distribution/tools/upgrade-cli/licenses/jackson-databind-2.13.2.jar.sha1 delete mode 100644 modules/ingest-geoip/licenses/jackson-databind-2.12.6.1.jar.sha1 create mode 100644 modules/ingest-geoip/licenses/jackson-databind-2.13.2.2.jar.sha1 delete mode 100644 modules/ingest-geoip/licenses/jackson-databind-2.13.2.jar.sha1 delete mode 100644 plugins/discovery-ec2/licenses/jackson-databind-2.12.6.1.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/jackson-databind-2.13.2.2.jar.sha1 delete mode 100644 plugins/discovery-ec2/licenses/jackson-databind-2.13.2.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/jackson-databind-2.12.6.1.jar.sha1 create mode 100644 plugins/repository-azure/licenses/jackson-databind-2.13.2.2.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/jackson-databind-2.13.2.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/jackson-databind-2.12.6.1.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/jackson-databind-2.13.2.2.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/jackson-databind-2.13.2.jar.sha1 delete mode 100644 plugins/repository-s3/licenses/jackson-databind-2.12.6.1.jar.sha1 create mode 100644 plugins/repository-s3/licenses/jackson-databind-2.13.2.2.jar.sha1 delete mode 100644 plugins/repository-s3/licenses/jackson-databind-2.13.2.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index c4d4d4cd1e417..414b4de98ffe4 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -10,7 +10,7 @@ bundled_jdk = 11.0.15+10 spatial4j = 0.7 jts = 1.15.0 jackson = 2.13.2 -jackson_databind = 2.12.6.1 +jackson_databind = 2.13.2.2 snakeyaml = 1.26 icu4j = 62.1 supercsv = 2.4.0 diff --git a/distribution/tools/upgrade-cli/licenses/jackson-databind-2.12.6.1.jar.sha1 b/distribution/tools/upgrade-cli/licenses/jackson-databind-2.12.6.1.jar.sha1 deleted file mode 100644 index 98f8ca2831cca..0000000000000 --- a/distribution/tools/upgrade-cli/licenses/jackson-databind-2.12.6.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -df01cc0c2d4acb913d73d587274986a12e3dec8c \ No newline at end of file diff --git a/distribution/tools/upgrade-cli/licenses/jackson-databind-2.13.2.2.jar.sha1 b/distribution/tools/upgrade-cli/licenses/jackson-databind-2.13.2.2.jar.sha1 new file mode 100644 index 0000000000000..9d9266300feef --- /dev/null +++ b/distribution/tools/upgrade-cli/licenses/jackson-databind-2.13.2.2.jar.sha1 @@ -0,0 +1 @@ +ffeb635597d093509f33e1e94274d14be610f933 \ No newline at end of file diff --git a/distribution/tools/upgrade-cli/licenses/jackson-databind-2.13.2.jar.sha1 b/distribution/tools/upgrade-cli/licenses/jackson-databind-2.13.2.jar.sha1 deleted file mode 100644 index 5d356f3fd045f..0000000000000 --- a/distribution/tools/upgrade-cli/licenses/jackson-databind-2.13.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -926e48c451166a291f1ce6c6276d9abbefa7c00f \ No newline at end of file diff --git a/modules/ingest-geoip/licenses/jackson-databind-2.12.6.1.jar.sha1 b/modules/ingest-geoip/licenses/jackson-databind-2.12.6.1.jar.sha1 deleted file mode 100644 index 98f8ca2831cca..0000000000000 --- a/modules/ingest-geoip/licenses/jackson-databind-2.12.6.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -df01cc0c2d4acb913d73d587274986a12e3dec8c \ No newline at end of file diff --git a/modules/ingest-geoip/licenses/jackson-databind-2.13.2.2.jar.sha1 b/modules/ingest-geoip/licenses/jackson-databind-2.13.2.2.jar.sha1 new file mode 100644 index 0000000000000..9d9266300feef --- /dev/null +++ b/modules/ingest-geoip/licenses/jackson-databind-2.13.2.2.jar.sha1 @@ -0,0 +1 @@ +ffeb635597d093509f33e1e94274d14be610f933 \ No newline at end of file diff --git a/modules/ingest-geoip/licenses/jackson-databind-2.13.2.jar.sha1 b/modules/ingest-geoip/licenses/jackson-databind-2.13.2.jar.sha1 deleted file mode 100644 index 5d356f3fd045f..0000000000000 --- a/modules/ingest-geoip/licenses/jackson-databind-2.13.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -926e48c451166a291f1ce6c6276d9abbefa7c00f \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-databind-2.12.6.1.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-databind-2.12.6.1.jar.sha1 deleted file mode 100644 index 98f8ca2831cca..0000000000000 --- a/plugins/discovery-ec2/licenses/jackson-databind-2.12.6.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -df01cc0c2d4acb913d73d587274986a12e3dec8c \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-databind-2.13.2.2.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-databind-2.13.2.2.jar.sha1 new file mode 100644 index 0000000000000..9d9266300feef --- /dev/null +++ b/plugins/discovery-ec2/licenses/jackson-databind-2.13.2.2.jar.sha1 @@ -0,0 +1 @@ +ffeb635597d093509f33e1e94274d14be610f933 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-databind-2.13.2.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-databind-2.13.2.jar.sha1 deleted file mode 100644 index 5d356f3fd045f..0000000000000 --- a/plugins/discovery-ec2/licenses/jackson-databind-2.13.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -926e48c451166a291f1ce6c6276d9abbefa7c00f \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-databind-2.12.6.1.jar.sha1 b/plugins/repository-azure/licenses/jackson-databind-2.12.6.1.jar.sha1 deleted file mode 100644 index 98f8ca2831cca..0000000000000 --- a/plugins/repository-azure/licenses/jackson-databind-2.12.6.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -df01cc0c2d4acb913d73d587274986a12e3dec8c \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-databind-2.13.2.2.jar.sha1 b/plugins/repository-azure/licenses/jackson-databind-2.13.2.2.jar.sha1 new file mode 100644 index 0000000000000..9d9266300feef --- /dev/null +++ b/plugins/repository-azure/licenses/jackson-databind-2.13.2.2.jar.sha1 @@ -0,0 +1 @@ +ffeb635597d093509f33e1e94274d14be610f933 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/jackson-databind-2.13.2.jar.sha1 b/plugins/repository-azure/licenses/jackson-databind-2.13.2.jar.sha1 deleted file mode 100644 index 5d356f3fd045f..0000000000000 --- a/plugins/repository-azure/licenses/jackson-databind-2.13.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -926e48c451166a291f1ce6c6276d9abbefa7c00f \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/jackson-databind-2.12.6.1.jar.sha1 b/plugins/repository-hdfs/licenses/jackson-databind-2.12.6.1.jar.sha1 deleted file mode 100644 index 98f8ca2831cca..0000000000000 --- a/plugins/repository-hdfs/licenses/jackson-databind-2.12.6.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -df01cc0c2d4acb913d73d587274986a12e3dec8c \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/jackson-databind-2.13.2.2.jar.sha1 b/plugins/repository-hdfs/licenses/jackson-databind-2.13.2.2.jar.sha1 new file mode 100644 index 0000000000000..9d9266300feef --- /dev/null +++ b/plugins/repository-hdfs/licenses/jackson-databind-2.13.2.2.jar.sha1 @@ -0,0 +1 @@ +ffeb635597d093509f33e1e94274d14be610f933 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/jackson-databind-2.13.2.jar.sha1 b/plugins/repository-hdfs/licenses/jackson-databind-2.13.2.jar.sha1 deleted file mode 100644 index 5d356f3fd045f..0000000000000 --- a/plugins/repository-hdfs/licenses/jackson-databind-2.13.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -926e48c451166a291f1ce6c6276d9abbefa7c00f \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-databind-2.12.6.1.jar.sha1 b/plugins/repository-s3/licenses/jackson-databind-2.12.6.1.jar.sha1 deleted file mode 100644 index 98f8ca2831cca..0000000000000 --- a/plugins/repository-s3/licenses/jackson-databind-2.12.6.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -df01cc0c2d4acb913d73d587274986a12e3dec8c \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-databind-2.13.2.2.jar.sha1 b/plugins/repository-s3/licenses/jackson-databind-2.13.2.2.jar.sha1 new file mode 100644 index 0000000000000..9d9266300feef --- /dev/null +++ b/plugins/repository-s3/licenses/jackson-databind-2.13.2.2.jar.sha1 @@ -0,0 +1 @@ +ffeb635597d093509f33e1e94274d14be610f933 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-databind-2.13.2.jar.sha1 b/plugins/repository-s3/licenses/jackson-databind-2.13.2.jar.sha1 deleted file mode 100644 index 5d356f3fd045f..0000000000000 --- a/plugins/repository-s3/licenses/jackson-databind-2.13.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -926e48c451166a291f1ce6c6276d9abbefa7c00f \ No newline at end of file