From 751c05eff98672663a531b6c9b59ab4e2eafcd4c Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Wed, 20 Feb 2019 11:38:42 -0500 Subject: [PATCH] Bump jackson-databind version for ingest-geoip (#39182) This commit bumps the jackson-databind version for ingest-geoip to 2.8.11.3. --- buildSrc/version.properties | 3 +++ modules/ingest-geoip/build.gradle | 2 +- .../ingest-geoip/licenses/jackson-databind-2.8.11.3.jar.sha1 | 1 + modules/ingest-geoip/licenses/jackson-databind-2.8.11.jar.sha1 | 1 - 4 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 modules/ingest-geoip/licenses/jackson-databind-2.8.11.3.jar.sha1 delete mode 100644 modules/ingest-geoip/licenses/jackson-databind-2.8.11.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index ca2f4786e64..dd99bf4eaf5 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -4,6 +4,9 @@ lucene = 8.0.0-snapshot-83f9835 # optional dependencies spatial4j = 0.7 jts = 1.15.0 +# note that ingest-geoip has a hard-coded version; if you modify this version, +# 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 snakeyaml = 1.17 icu4j = 62.1 diff --git a/modules/ingest-geoip/build.gradle b/modules/ingest-geoip/build.gradle index 1f356792032..f2dec9cd7b7 100644 --- a/modules/ingest-geoip/build.gradle +++ b/modules/ingest-geoip/build.gradle @@ -27,7 +27,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:${versions.jackson}") + compile("com.fasterxml.jackson.core:jackson-databind:2.8.11.3") compile('com.maxmind.db:maxmind-db:1.2.2') testCompile 'org.elasticsearch:geolite2-databases:20180911' 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 new file mode 100644 index 00000000000..253a1361931 --- /dev/null +++ b/modules/ingest-geoip/licenses/jackson-databind-2.8.11.3.jar.sha1 @@ -0,0 +1 @@ +844df5aba5a1a56e00905b165b12bb34116ee858 \ No newline at end of file diff --git a/modules/ingest-geoip/licenses/jackson-databind-2.8.11.jar.sha1 b/modules/ingest-geoip/licenses/jackson-databind-2.8.11.jar.sha1 deleted file mode 100644 index 53d6c1fa208..00000000000 --- a/modules/ingest-geoip/licenses/jackson-databind-2.8.11.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0569a9f220273024523799dba9dd358121b0ee09 \ No newline at end of file