From 32dd852210274c5986a8b43e5a3d5f0477b203eb Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Thu, 12 Mar 2020 20:14:30 -0400 Subject: [PATCH] Update jackson-databind to 2.8.11.6 (#53522) This commit upgrades the jackson-databind depdendency to 2.8.11.6. Additionally, we revert a previous change that put ingest-geoip on the version of jackson-databind from the version properties file. This is because upgrading ingest-geoip to a later version of jackson-databind also requires an upgrade to the geoip2 dependency which is currently blocked. Therefore, if we can get to a point where we otherwise upgrade our Jackson dependencies, we do not want ingest-geoip to automatically come along with it. --- buildSrc/version.properties | 2 +- modules/ingest-geoip/build.gradle | 5 +++-- .../ingest-geoip/licenses/jackson-databind-2.8.11.4.jar.sha1 | 1 - .../ingest-geoip/licenses/jackson-databind-2.8.11.6.jar.sha1 | 1 + .../licenses/jackson-databind-2.8.11.4.jar.sha1 | 1 - .../licenses/jackson-databind-2.8.11.6.jar.sha1 | 1 + .../licenses/jackson-databind-2.8.11.4.jar.sha1 | 1 - .../licenses/jackson-databind-2.8.11.6.jar.sha1 | 1 + 8 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 modules/ingest-geoip/licenses/jackson-databind-2.8.11.4.jar.sha1 create mode 100644 modules/ingest-geoip/licenses/jackson-databind-2.8.11.6.jar.sha1 delete mode 100644 plugins/discovery-ec2/licenses/jackson-databind-2.8.11.4.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/jackson-databind-2.8.11.6.jar.sha1 delete mode 100644 plugins/repository-s3/licenses/jackson-databind-2.8.11.4.jar.sha1 create mode 100644 plugins/repository-s3/licenses/jackson-databind-2.8.11.6.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index e93690707ab..c746ad45a35 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -11,7 +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 +jacksondatabind = 2.8.11.6 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 6b49c26c415..2d791021097 100644 --- a/modules/ingest-geoip/build.gradle +++ b/modules/ingest-geoip/build.gradle @@ -28,8 +28,9 @@ dependencies { // Upgrade to 2.10.0 or higher when jackson-core gets upgraded to 2.9.x. Blocked by #27032 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:${versions.jacksondatabind}") + // do not hardcode this to the version in version.properties, it needs to be upgraded separately with geoip2 + compile("com.fasterxml.jackson.core:jackson-annotations:2.8.11") + compile("com.fasterxml.jackson.core:jackson-databind:2.8.11.6") 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.4.jar.sha1 b/modules/ingest-geoip/licenses/jackson-databind-2.8.11.4.jar.sha1 deleted file mode 100644 index 5203969bcf5..00000000000 --- a/modules/ingest-geoip/licenses/jackson-databind-2.8.11.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -596d6923ff4cf7ea72ded3ac32903b9c618ce9f1 \ No newline at end of file diff --git a/modules/ingest-geoip/licenses/jackson-databind-2.8.11.6.jar.sha1 b/modules/ingest-geoip/licenses/jackson-databind-2.8.11.6.jar.sha1 new file mode 100644 index 00000000000..f491259db56 --- /dev/null +++ b/modules/ingest-geoip/licenses/jackson-databind-2.8.11.6.jar.sha1 @@ -0,0 +1 @@ +35753201d0cdb1dbe998ab289bca1180b68d4368 \ 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 deleted file mode 100644 index 5203969bcf5..00000000000 --- a/plugins/discovery-ec2/licenses/jackson-databind-2.8.11.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -596d6923ff4cf7ea72ded3ac32903b9c618ce9f1 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-databind-2.8.11.6.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-databind-2.8.11.6.jar.sha1 new file mode 100644 index 00000000000..f491259db56 --- /dev/null +++ b/plugins/discovery-ec2/licenses/jackson-databind-2.8.11.6.jar.sha1 @@ -0,0 +1 @@ +35753201d0cdb1dbe998ab289bca1180b68d4368 \ 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 deleted file mode 100644 index 5203969bcf5..00000000000 --- a/plugins/repository-s3/licenses/jackson-databind-2.8.11.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -596d6923ff4cf7ea72ded3ac32903b9c618ce9f1 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-databind-2.8.11.6.jar.sha1 b/plugins/repository-s3/licenses/jackson-databind-2.8.11.6.jar.sha1 new file mode 100644 index 00000000000..f491259db56 --- /dev/null +++ b/plugins/repository-s3/licenses/jackson-databind-2.8.11.6.jar.sha1 @@ -0,0 +1 @@ +35753201d0cdb1dbe998ab289bca1180b68d4368 \ No newline at end of file