Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions modules/ingest-geoip/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
35753201d0cdb1dbe998ab289bca1180b68d4368

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
35753201d0cdb1dbe998ab289bca1180b68d4368

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
35753201d0cdb1dbe998ab289bca1180b68d4368