From 1c5a139968a821fd3f56a30cb498fe2b84e080ad Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Fri, 6 Dec 2019 13:39:33 -0600 Subject: [PATCH] Update jackson-databind to 2.8.11.4 (#49347) (#49937) --- buildSrc/version.properties | 1 + modules/ingest-geoip/build.gradle | 2 +- .../ingest-geoip/licenses/jackson-databind-2.8.11.3.jar.sha1 | 1 - .../ingest-geoip/licenses/jackson-databind-2.8.11.4.jar.sha1 | 1 + plugins/discovery-ec2/build.gradle | 2 +- .../discovery-ec2/licenses/jackson-databind-2.8.11.3.jar.sha1 | 1 - .../discovery-ec2/licenses/jackson-databind-2.8.11.4.jar.sha1 | 1 + plugins/repository-s3/build.gradle | 2 +- .../repository-s3/licenses/jackson-databind-2.8.11.3.jar.sha1 | 1 - .../repository-s3/licenses/jackson-databind-2.8.11.4.jar.sha1 | 1 + x-pack/snapshot-tool/build.gradle | 2 +- .../snapshot-tool/licenses/jackson-databind-2.8.11.3.jar.sha1 | 1 - .../snapshot-tool/licenses/jackson-databind-2.8.11.4.jar.sha1 | 1 + 13 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 modules/ingest-geoip/licenses/jackson-databind-2.8.11.3.jar.sha1 create mode 100644 modules/ingest-geoip/licenses/jackson-databind-2.8.11.4.jar.sha1 delete mode 100644 plugins/discovery-ec2/licenses/jackson-databind-2.8.11.3.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/jackson-databind-2.8.11.4.jar.sha1 delete mode 100644 plugins/repository-s3/licenses/jackson-databind-2.8.11.3.jar.sha1 create mode 100644 plugins/repository-s3/licenses/jackson-databind-2.8.11.4.jar.sha1 delete mode 100644 x-pack/snapshot-tool/licenses/jackson-databind-2.8.11.3.jar.sha1 create mode 100644 x-pack/snapshot-tool/licenses/jackson-databind-2.8.11.4.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 1b8f83f607d..aba90f29bb3 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -11,6 +11,7 @@ jts = 1.15.0 # you should also inspect that version to see if it can be advanced along with # the com.maxmind.geoip2:geoip2 dependency jackson = 2.8.11 +jacksondatabind = 2.8.11.4 snakeyaml = 1.17 icu4j = 62.1 supercsv = 2.4.0 diff --git a/modules/ingest-geoip/build.gradle b/modules/ingest-geoip/build.gradle index b99bb66ee8d..6b49c26c415 100644 --- a/modules/ingest-geoip/build.gradle +++ b/modules/ingest-geoip/build.gradle @@ -29,7 +29,7 @@ dependencies { compile('com.maxmind.geoip2:geoip2:2.9.0') // geoip2 dependencies: compile("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}") - compile("com.fasterxml.jackson.core:jackson-databind:2.8.11.3") + compile("com.fasterxml.jackson.core:jackson-databind:${versions.jacksondatabind}") compile('com.maxmind.db:maxmind-db:1.2.2') testCompile 'org.elasticsearch:geolite2-databases:20191119' diff --git a/modules/ingest-geoip/licenses/jackson-databind-2.8.11.3.jar.sha1 b/modules/ingest-geoip/licenses/jackson-databind-2.8.11.3.jar.sha1 deleted file mode 100644 index 253a1361931..00000000000 --- a/modules/ingest-geoip/licenses/jackson-databind-2.8.11.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -844df5aba5a1a56e00905b165b12bb34116ee858 \ No newline at end of file diff --git a/modules/ingest-geoip/licenses/jackson-databind-2.8.11.4.jar.sha1 b/modules/ingest-geoip/licenses/jackson-databind-2.8.11.4.jar.sha1 new file mode 100644 index 00000000000..5203969bcf5 --- /dev/null +++ b/modules/ingest-geoip/licenses/jackson-databind-2.8.11.4.jar.sha1 @@ -0,0 +1 @@ +596d6923ff4cf7ea72ded3ac32903b9c618ce9f1 \ No newline at end of file diff --git a/plugins/discovery-ec2/build.gradle b/plugins/discovery-ec2/build.gradle index c3c6d0b832d..e92dddf1f2b 100644 --- a/plugins/discovery-ec2/build.gradle +++ b/plugins/discovery-ec2/build.gradle @@ -36,7 +36,7 @@ dependencies { compile "commons-logging:commons-logging:${versions.commonslogging}" compile "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}" compile "commons-codec:commons-codec:${versions.commonscodec}" - compile 'com.fasterxml.jackson.core:jackson-databind:2.8.11.3' + compile "com.fasterxml.jackson.core:jackson-databind:${versions.jacksondatabind}" compile "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}" } diff --git a/plugins/discovery-ec2/licenses/jackson-databind-2.8.11.3.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-databind-2.8.11.3.jar.sha1 deleted file mode 100644 index 253a1361931..00000000000 --- a/plugins/discovery-ec2/licenses/jackson-databind-2.8.11.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -844df5aba5a1a56e00905b165b12bb34116ee858 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-databind-2.8.11.4.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-databind-2.8.11.4.jar.sha1 new file mode 100644 index 00000000000..5203969bcf5 --- /dev/null +++ b/plugins/discovery-ec2/licenses/jackson-databind-2.8.11.4.jar.sha1 @@ -0,0 +1 @@ +596d6923ff4cf7ea72ded3ac32903b9c618ce9f1 \ No newline at end of file diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle index 6845cb50c75..445ac15cca8 100644 --- a/plugins/repository-s3/build.gradle +++ b/plugins/repository-s3/build.gradle @@ -43,7 +43,7 @@ dependencies { compile "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}" compile "commons-codec:commons-codec:${versions.commonscodec}" compile "com.fasterxml.jackson.core:jackson-core:${versions.jackson}" - compile 'com.fasterxml.jackson.core:jackson-databind:2.8.11.3' + compile "com.fasterxml.jackson.core:jackson-databind:${versions.jacksondatabind}" compile "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}" compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}" compile "joda-time:joda-time:${versions.joda}" diff --git a/plugins/repository-s3/licenses/jackson-databind-2.8.11.3.jar.sha1 b/plugins/repository-s3/licenses/jackson-databind-2.8.11.3.jar.sha1 deleted file mode 100644 index 253a1361931..00000000000 --- a/plugins/repository-s3/licenses/jackson-databind-2.8.11.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -844df5aba5a1a56e00905b165b12bb34116ee858 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-databind-2.8.11.4.jar.sha1 b/plugins/repository-s3/licenses/jackson-databind-2.8.11.4.jar.sha1 new file mode 100644 index 00000000000..5203969bcf5 --- /dev/null +++ b/plugins/repository-s3/licenses/jackson-databind-2.8.11.4.jar.sha1 @@ -0,0 +1 @@ +596d6923ff4cf7ea72ded3ac32903b9c618ce9f1 \ No newline at end of file diff --git a/x-pack/snapshot-tool/build.gradle b/x-pack/snapshot-tool/build.gradle index a18ac738ad2..ee39a4c1bba 100644 --- a/x-pack/snapshot-tool/build.gradle +++ b/x-pack/snapshot-tool/build.gradle @@ -26,7 +26,7 @@ dependencies { compile "commons-codec:commons-codec:${versions.commonscodec}" compile "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}" compile "com.fasterxml.jackson.core:jackson-core:${versions.jackson}" - compile 'com.fasterxml.jackson.core:jackson-databind:2.8.11.3' + compile "com.fasterxml.jackson.core:jackson-databind:${versions.jacksondatabind}" compile "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}" // GCS dependencies diff --git a/x-pack/snapshot-tool/licenses/jackson-databind-2.8.11.3.jar.sha1 b/x-pack/snapshot-tool/licenses/jackson-databind-2.8.11.3.jar.sha1 deleted file mode 100644 index 253a1361931..00000000000 --- a/x-pack/snapshot-tool/licenses/jackson-databind-2.8.11.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -844df5aba5a1a56e00905b165b12bb34116ee858 \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/jackson-databind-2.8.11.4.jar.sha1 b/x-pack/snapshot-tool/licenses/jackson-databind-2.8.11.4.jar.sha1 new file mode 100644 index 00000000000..5203969bcf5 --- /dev/null +++ b/x-pack/snapshot-tool/licenses/jackson-databind-2.8.11.4.jar.sha1 @@ -0,0 +1 @@ +596d6923ff4cf7ea72ded3ac32903b9c618ce9f1 \ No newline at end of file