From 33669c042004664783c9876de116d02dfe4db45d Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Wed, 6 May 2020 17:19:22 -0400 Subject: [PATCH] Upgrade to Jackson 2.10.4 (#56188) Another Jackson release is available. There are some CVEs addressed, none of which impact us, but since we can now bump Jackson easily, let us move along with the train to avoid the false positives from security scanners. --- buildSrc/version.properties | 4 ++-- client/sniffer/licenses/jackson-core-2.10.3.jar.sha1 | 1 - client/sniffer/licenses/jackson-core-2.10.4.jar.sha1 | 1 + libs/x-content/licenses/jackson-core-2.10.3.jar.sha1 | 1 - libs/x-content/licenses/jackson-core-2.10.4.jar.sha1 | 1 + .../licenses/jackson-dataformat-cbor-2.10.3.jar.sha1 | 1 - .../licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 | 1 + .../licenses/jackson-dataformat-smile-2.10.3.jar.sha1 | 1 - .../licenses/jackson-dataformat-smile-2.10.4.jar.sha1 | 1 + .../licenses/jackson-dataformat-yaml-2.10.3.jar.sha1 | 1 - .../licenses/jackson-dataformat-yaml-2.10.4.jar.sha1 | 1 + libs/x-content/licenses/snakeyaml-1.24.jar.sha1 | 1 - libs/x-content/licenses/snakeyaml-1.26.jar.sha1 | 1 + .../ingest-geoip/licenses/jackson-annotations-2.10.3.jar.sha1 | 1 - .../ingest-geoip/licenses/jackson-annotations-2.10.4.jar.sha1 | 1 + .../ingest-geoip/licenses/jackson-databind-2.10.3.jar.sha1 | 1 - .../ingest-geoip/licenses/jackson-databind-2.10.4.jar.sha1 | 1 + .../licenses/jackson-annotations-2.10.3.jar.sha1 | 1 - .../licenses/jackson-annotations-2.10.4.jar.sha1 | 1 + .../discovery-ec2/licenses/jackson-databind-2.10.3.jar.sha1 | 1 - .../discovery-ec2/licenses/jackson-databind-2.10.4.jar.sha1 | 1 + .../licenses/jackson-annotations-2.10.3.jar.sha1 | 1 - .../licenses/jackson-annotations-2.10.4.jar.sha1 | 1 + .../repository-s3/licenses/jackson-databind-2.10.3.jar.sha1 | 1 - .../repository-s3/licenses/jackson-databind-2.10.4.jar.sha1 | 1 + x-pack/plugin/sql/jdbc/licenses/jackson-core-2.10.3.jar.sha1 | 1 - x-pack/plugin/sql/jdbc/licenses/jackson-core-2.10.4.jar.sha1 | 1 + .../sql/jdbc/licenses/jackson-dataformat-cbor-2.10.3.jar.sha1 | 1 - .../sql/jdbc/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 | 1 + .../sql/sql-action/licenses/jackson-core-2.10.3.jar.sha1 | 1 - .../sql/sql-action/licenses/jackson-core-2.10.4.jar.sha1 | 1 + .../sql/sql-client/licenses/jackson-core-2.10.3.jar.sha1 | 1 - .../sql/sql-client/licenses/jackson-core-2.10.4.jar.sha1 | 1 + .../sql/sql-proto/licenses/jackson-core-2.10.3.jar.sha1 | 1 - .../sql/sql-proto/licenses/jackson-core-2.10.4.jar.sha1 | 1 + 35 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 client/sniffer/licenses/jackson-core-2.10.3.jar.sha1 create mode 100644 client/sniffer/licenses/jackson-core-2.10.4.jar.sha1 delete mode 100644 libs/x-content/licenses/jackson-core-2.10.3.jar.sha1 create mode 100644 libs/x-content/licenses/jackson-core-2.10.4.jar.sha1 delete mode 100644 libs/x-content/licenses/jackson-dataformat-cbor-2.10.3.jar.sha1 create mode 100644 libs/x-content/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 delete mode 100644 libs/x-content/licenses/jackson-dataformat-smile-2.10.3.jar.sha1 create mode 100644 libs/x-content/licenses/jackson-dataformat-smile-2.10.4.jar.sha1 delete mode 100644 libs/x-content/licenses/jackson-dataformat-yaml-2.10.3.jar.sha1 create mode 100644 libs/x-content/licenses/jackson-dataformat-yaml-2.10.4.jar.sha1 delete mode 100644 libs/x-content/licenses/snakeyaml-1.24.jar.sha1 create mode 100644 libs/x-content/licenses/snakeyaml-1.26.jar.sha1 delete mode 100644 modules/ingest-geoip/licenses/jackson-annotations-2.10.3.jar.sha1 create mode 100644 modules/ingest-geoip/licenses/jackson-annotations-2.10.4.jar.sha1 delete mode 100644 modules/ingest-geoip/licenses/jackson-databind-2.10.3.jar.sha1 create mode 100644 modules/ingest-geoip/licenses/jackson-databind-2.10.4.jar.sha1 delete mode 100644 plugins/discovery-ec2/licenses/jackson-annotations-2.10.3.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/jackson-annotations-2.10.4.jar.sha1 delete mode 100644 plugins/discovery-ec2/licenses/jackson-databind-2.10.3.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/jackson-databind-2.10.4.jar.sha1 delete mode 100644 plugins/repository-s3/licenses/jackson-annotations-2.10.3.jar.sha1 create mode 100644 plugins/repository-s3/licenses/jackson-annotations-2.10.4.jar.sha1 delete mode 100644 plugins/repository-s3/licenses/jackson-databind-2.10.3.jar.sha1 create mode 100644 plugins/repository-s3/licenses/jackson-databind-2.10.4.jar.sha1 delete mode 100644 x-pack/plugin/sql/jdbc/licenses/jackson-core-2.10.3.jar.sha1 create mode 100644 x-pack/plugin/sql/jdbc/licenses/jackson-core-2.10.4.jar.sha1 delete mode 100644 x-pack/plugin/sql/jdbc/licenses/jackson-dataformat-cbor-2.10.3.jar.sha1 create mode 100644 x-pack/plugin/sql/jdbc/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 delete mode 100644 x-pack/plugin/sql/sql-action/licenses/jackson-core-2.10.3.jar.sha1 create mode 100644 x-pack/plugin/sql/sql-action/licenses/jackson-core-2.10.4.jar.sha1 delete mode 100644 x-pack/plugin/sql/sql-client/licenses/jackson-core-2.10.3.jar.sha1 create mode 100644 x-pack/plugin/sql/sql-client/licenses/jackson-core-2.10.4.jar.sha1 delete mode 100644 x-pack/plugin/sql/sql-proto/licenses/jackson-core-2.10.3.jar.sha1 create mode 100644 x-pack/plugin/sql/sql-proto/licenses/jackson-core-2.10.4.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 300696c8385..ccc25b2df2e 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -9,8 +9,8 @@ checkstyle = 8.20 # optional dependencies spatial4j = 0.7 jts = 1.15.0 -jackson = 2.10.3 -snakeyaml = 1.24 +jackson = 2.10.4 +snakeyaml = 1.26 icu4j = 62.1 supercsv = 2.4.0 # when updating log4j, please update also docs/java-api/index.asciidoc diff --git a/client/sniffer/licenses/jackson-core-2.10.3.jar.sha1 b/client/sniffer/licenses/jackson-core-2.10.3.jar.sha1 deleted file mode 100644 index f23937b0d82..00000000000 --- a/client/sniffer/licenses/jackson-core-2.10.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f7ee7b55c7d292ac72fbaa7648c089f069c938d2 \ No newline at end of file diff --git a/client/sniffer/licenses/jackson-core-2.10.4.jar.sha1 b/client/sniffer/licenses/jackson-core-2.10.4.jar.sha1 new file mode 100644 index 00000000000..f83a4ac442b --- /dev/null +++ b/client/sniffer/licenses/jackson-core-2.10.4.jar.sha1 @@ -0,0 +1 @@ +8796585e716440d6dd5128b30359932a9eb74d0d \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-core-2.10.3.jar.sha1 b/libs/x-content/licenses/jackson-core-2.10.3.jar.sha1 deleted file mode 100644 index f23937b0d82..00000000000 --- a/libs/x-content/licenses/jackson-core-2.10.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f7ee7b55c7d292ac72fbaa7648c089f069c938d2 \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-core-2.10.4.jar.sha1 b/libs/x-content/licenses/jackson-core-2.10.4.jar.sha1 new file mode 100644 index 00000000000..f83a4ac442b --- /dev/null +++ b/libs/x-content/licenses/jackson-core-2.10.4.jar.sha1 @@ -0,0 +1 @@ +8796585e716440d6dd5128b30359932a9eb74d0d \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-dataformat-cbor-2.10.3.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-cbor-2.10.3.jar.sha1 deleted file mode 100644 index 6c96c20f482..00000000000 --- a/libs/x-content/licenses/jackson-dataformat-cbor-2.10.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1ba01fef9c3b7ed388d91e71dc733b315c7374cd \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 new file mode 100644 index 00000000000..d34470c70b9 --- /dev/null +++ b/libs/x-content/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 @@ -0,0 +1 @@ +c854bb2d46138198cb5d4aae86ef6c04b8bc1e70 \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-dataformat-smile-2.10.3.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-smile-2.10.3.jar.sha1 deleted file mode 100644 index 24ac4b32095..00000000000 --- a/libs/x-content/licenses/jackson-dataformat-smile-2.10.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ff397547ff168e77279a1cd549e2ca4923c991aa \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-dataformat-smile-2.10.4.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-smile-2.10.4.jar.sha1 new file mode 100644 index 00000000000..a8611e152f9 --- /dev/null +++ b/libs/x-content/licenses/jackson-dataformat-smile-2.10.4.jar.sha1 @@ -0,0 +1 @@ +c872c2e224cfdcc5481037d477f5890f05c001b4 \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-dataformat-yaml-2.10.3.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-yaml-2.10.3.jar.sha1 deleted file mode 100644 index 8f1ecab9ecb..00000000000 --- a/libs/x-content/licenses/jackson-dataformat-yaml-2.10.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4dc1a172812d9da27c1afd6a08f4f12aad7b14dd \ No newline at end of file diff --git a/libs/x-content/licenses/jackson-dataformat-yaml-2.10.4.jar.sha1 b/libs/x-content/licenses/jackson-dataformat-yaml-2.10.4.jar.sha1 new file mode 100644 index 00000000000..5fe3ec1a7e3 --- /dev/null +++ b/libs/x-content/licenses/jackson-dataformat-yaml-2.10.4.jar.sha1 @@ -0,0 +1 @@ +8a7f3c6b640bd89214807af6d8160b4b3b16af93 \ No newline at end of file diff --git a/libs/x-content/licenses/snakeyaml-1.24.jar.sha1 b/libs/x-content/licenses/snakeyaml-1.24.jar.sha1 deleted file mode 100644 index a6e7bd5a1e7..00000000000 --- a/libs/x-content/licenses/snakeyaml-1.24.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -13a9c0d6776483c3876e3ff9384f9bb55b17001b \ No newline at end of file diff --git a/libs/x-content/licenses/snakeyaml-1.26.jar.sha1 b/libs/x-content/licenses/snakeyaml-1.26.jar.sha1 new file mode 100644 index 00000000000..fde3aba8eda --- /dev/null +++ b/libs/x-content/licenses/snakeyaml-1.26.jar.sha1 @@ -0,0 +1 @@ +a78a8747147d2c5807683e76ec2b633e95c14fe9 \ No newline at end of file diff --git a/modules/ingest-geoip/licenses/jackson-annotations-2.10.3.jar.sha1 b/modules/ingest-geoip/licenses/jackson-annotations-2.10.3.jar.sha1 deleted file mode 100644 index 9c725f2d90e..00000000000 --- a/modules/ingest-geoip/licenses/jackson-annotations-2.10.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0f63b3b1da563767d04d2e4d3fc1ae0cdeffebe7 \ No newline at end of file diff --git a/modules/ingest-geoip/licenses/jackson-annotations-2.10.4.jar.sha1 b/modules/ingest-geoip/licenses/jackson-annotations-2.10.4.jar.sha1 new file mode 100644 index 00000000000..0c548bb0e77 --- /dev/null +++ b/modules/ingest-geoip/licenses/jackson-annotations-2.10.4.jar.sha1 @@ -0,0 +1 @@ +6ae6028aff033f194c9710ad87c224ccaadeed6c \ No newline at end of file diff --git a/modules/ingest-geoip/licenses/jackson-databind-2.10.3.jar.sha1 b/modules/ingest-geoip/licenses/jackson-databind-2.10.3.jar.sha1 deleted file mode 100644 index 688ae92d107..00000000000 --- a/modules/ingest-geoip/licenses/jackson-databind-2.10.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aae92628b5447fa25af79871ca98668da6edd439 \ No newline at end of file diff --git a/modules/ingest-geoip/licenses/jackson-databind-2.10.4.jar.sha1 b/modules/ingest-geoip/licenses/jackson-databind-2.10.4.jar.sha1 new file mode 100644 index 00000000000..27d5a72cd27 --- /dev/null +++ b/modules/ingest-geoip/licenses/jackson-databind-2.10.4.jar.sha1 @@ -0,0 +1 @@ +76e9152e93d4cf052f93a64596f633ba5b1c8ed9 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-annotations-2.10.3.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-annotations-2.10.3.jar.sha1 deleted file mode 100644 index 9c725f2d90e..00000000000 --- a/plugins/discovery-ec2/licenses/jackson-annotations-2.10.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0f63b3b1da563767d04d2e4d3fc1ae0cdeffebe7 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-annotations-2.10.4.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-annotations-2.10.4.jar.sha1 new file mode 100644 index 00000000000..0c548bb0e77 --- /dev/null +++ b/plugins/discovery-ec2/licenses/jackson-annotations-2.10.4.jar.sha1 @@ -0,0 +1 @@ +6ae6028aff033f194c9710ad87c224ccaadeed6c \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-databind-2.10.3.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-databind-2.10.3.jar.sha1 deleted file mode 100644 index 688ae92d107..00000000000 --- a/plugins/discovery-ec2/licenses/jackson-databind-2.10.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aae92628b5447fa25af79871ca98668da6edd439 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-databind-2.10.4.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-databind-2.10.4.jar.sha1 new file mode 100644 index 00000000000..27d5a72cd27 --- /dev/null +++ b/plugins/discovery-ec2/licenses/jackson-databind-2.10.4.jar.sha1 @@ -0,0 +1 @@ +76e9152e93d4cf052f93a64596f633ba5b1c8ed9 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-annotations-2.10.3.jar.sha1 b/plugins/repository-s3/licenses/jackson-annotations-2.10.3.jar.sha1 deleted file mode 100644 index 9c725f2d90e..00000000000 --- a/plugins/repository-s3/licenses/jackson-annotations-2.10.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0f63b3b1da563767d04d2e4d3fc1ae0cdeffebe7 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-annotations-2.10.4.jar.sha1 b/plugins/repository-s3/licenses/jackson-annotations-2.10.4.jar.sha1 new file mode 100644 index 00000000000..0c548bb0e77 --- /dev/null +++ b/plugins/repository-s3/licenses/jackson-annotations-2.10.4.jar.sha1 @@ -0,0 +1 @@ +6ae6028aff033f194c9710ad87c224ccaadeed6c \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-databind-2.10.3.jar.sha1 b/plugins/repository-s3/licenses/jackson-databind-2.10.3.jar.sha1 deleted file mode 100644 index 688ae92d107..00000000000 --- a/plugins/repository-s3/licenses/jackson-databind-2.10.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aae92628b5447fa25af79871ca98668da6edd439 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-databind-2.10.4.jar.sha1 b/plugins/repository-s3/licenses/jackson-databind-2.10.4.jar.sha1 new file mode 100644 index 00000000000..27d5a72cd27 --- /dev/null +++ b/plugins/repository-s3/licenses/jackson-databind-2.10.4.jar.sha1 @@ -0,0 +1 @@ +76e9152e93d4cf052f93a64596f633ba5b1c8ed9 \ No newline at end of file diff --git a/x-pack/plugin/sql/jdbc/licenses/jackson-core-2.10.3.jar.sha1 b/x-pack/plugin/sql/jdbc/licenses/jackson-core-2.10.3.jar.sha1 deleted file mode 100644 index f23937b0d82..00000000000 --- a/x-pack/plugin/sql/jdbc/licenses/jackson-core-2.10.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f7ee7b55c7d292ac72fbaa7648c089f069c938d2 \ No newline at end of file diff --git a/x-pack/plugin/sql/jdbc/licenses/jackson-core-2.10.4.jar.sha1 b/x-pack/plugin/sql/jdbc/licenses/jackson-core-2.10.4.jar.sha1 new file mode 100644 index 00000000000..f83a4ac442b --- /dev/null +++ b/x-pack/plugin/sql/jdbc/licenses/jackson-core-2.10.4.jar.sha1 @@ -0,0 +1 @@ +8796585e716440d6dd5128b30359932a9eb74d0d \ No newline at end of file diff --git a/x-pack/plugin/sql/jdbc/licenses/jackson-dataformat-cbor-2.10.3.jar.sha1 b/x-pack/plugin/sql/jdbc/licenses/jackson-dataformat-cbor-2.10.3.jar.sha1 deleted file mode 100644 index 6c96c20f482..00000000000 --- a/x-pack/plugin/sql/jdbc/licenses/jackson-dataformat-cbor-2.10.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1ba01fef9c3b7ed388d91e71dc733b315c7374cd \ No newline at end of file diff --git a/x-pack/plugin/sql/jdbc/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 b/x-pack/plugin/sql/jdbc/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 new file mode 100644 index 00000000000..d34470c70b9 --- /dev/null +++ b/x-pack/plugin/sql/jdbc/licenses/jackson-dataformat-cbor-2.10.4.jar.sha1 @@ -0,0 +1 @@ +c854bb2d46138198cb5d4aae86ef6c04b8bc1e70 \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-action/licenses/jackson-core-2.10.3.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/jackson-core-2.10.3.jar.sha1 deleted file mode 100644 index f23937b0d82..00000000000 --- a/x-pack/plugin/sql/sql-action/licenses/jackson-core-2.10.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f7ee7b55c7d292ac72fbaa7648c089f069c938d2 \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-action/licenses/jackson-core-2.10.4.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/jackson-core-2.10.4.jar.sha1 new file mode 100644 index 00000000000..f83a4ac442b --- /dev/null +++ b/x-pack/plugin/sql/sql-action/licenses/jackson-core-2.10.4.jar.sha1 @@ -0,0 +1 @@ +8796585e716440d6dd5128b30359932a9eb74d0d \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-client/licenses/jackson-core-2.10.3.jar.sha1 b/x-pack/plugin/sql/sql-client/licenses/jackson-core-2.10.3.jar.sha1 deleted file mode 100644 index f23937b0d82..00000000000 --- a/x-pack/plugin/sql/sql-client/licenses/jackson-core-2.10.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f7ee7b55c7d292ac72fbaa7648c089f069c938d2 \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-client/licenses/jackson-core-2.10.4.jar.sha1 b/x-pack/plugin/sql/sql-client/licenses/jackson-core-2.10.4.jar.sha1 new file mode 100644 index 00000000000..f83a4ac442b --- /dev/null +++ b/x-pack/plugin/sql/sql-client/licenses/jackson-core-2.10.4.jar.sha1 @@ -0,0 +1 @@ +8796585e716440d6dd5128b30359932a9eb74d0d \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-proto/licenses/jackson-core-2.10.3.jar.sha1 b/x-pack/plugin/sql/sql-proto/licenses/jackson-core-2.10.3.jar.sha1 deleted file mode 100644 index f23937b0d82..00000000000 --- a/x-pack/plugin/sql/sql-proto/licenses/jackson-core-2.10.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f7ee7b55c7d292ac72fbaa7648c089f069c938d2 \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-proto/licenses/jackson-core-2.10.4.jar.sha1 b/x-pack/plugin/sql/sql-proto/licenses/jackson-core-2.10.4.jar.sha1 new file mode 100644 index 00000000000..f83a4ac442b --- /dev/null +++ b/x-pack/plugin/sql/sql-proto/licenses/jackson-core-2.10.4.jar.sha1 @@ -0,0 +1 @@ +8796585e716440d6dd5128b30359932a9eb74d0d \ No newline at end of file