honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 02:14:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update jackson-databind to 2.8.11.6 (#53522)

Browse Source 
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.
This commit is contained in:
Jason Tedor 2020-03-12 20:14:30 -04:00
parent fe2f6b359e
commit 32dd852210
No known key found for this signature in database
GPG Key ID: FA89F05560F16BC5
8 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/version.properties
View File

@ -11,7 +11,7 @@ jts = 1.15.0
# you should also inspect that version to see if it can be advanced along with # you should also inspect that version to see if it can be advanced along with
# the com.maxmind.geoip2:geoip2 dependency # the com.maxmind.geoip2:geoip2 dependency
jackson = 2.8.11 jackson = 2.8.11
jacksondatabind = 2.8.11.4 jacksondatabind = 2.8.11.6
snakeyaml = 1.17 snakeyaml = 1.17
icu4j = 62.1 icu4j = 62.1
supercsv = 2.4.0 supercsv = 2.4.0

5
modules/ingest-geoip/build.gradle
View File

@ -28,8 +28,9 @@ dependencies {
// Upgrade to 2.10.0 or higher when jackson-core gets upgraded to 2.9.x. Blocked by #27032 // 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') compile('com.maxmind.geoip2:geoip2:2.9.0')
// geoip2 dependencies: // geoip2 dependencies:
compile("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}") // do not hardcode this to the version in version.properties, it needs to be upgraded separately with geoip2
compile("com.fasterxml.jackson.core:jackson-databind:${versions.jacksondatabind}") 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') compile('com.maxmind.db:maxmind-db:1.2.2')
testCompile 'org.elasticsearch:geolite2-databases:20191119' testCompile 'org.elasticsearch:geolite2-databases:20191119'

1
modules/ingest-geoip/licenses/jackson-databind-2.8.11.4.jar.sha1
View File

@ -1 +0,0 @@
596d6923ff4cf7ea72ded3ac32903b9c618ce9f1

1
modules/ingest-geoip/licenses/jackson-databind-2.8.11.6.jar.sha1 Normal file
View File

@ -0,0 +1 @@
35753201d0cdb1dbe998ab289bca1180b68d4368

1
plugins/discovery-ec2/licenses/jackson-databind-2.8.11.4.jar.sha1
View File

@ -1 +0,0 @@
596d6923ff4cf7ea72ded3ac32903b9c618ce9f1

1
plugins/discovery-ec2/licenses/jackson-databind-2.8.11.6.jar.sha1 Normal file
View File

@ -0,0 +1 @@
35753201d0cdb1dbe998ab289bca1180b68d4368

1
plugins/repository-s3/licenses/jackson-databind-2.8.11.4.jar.sha1
View File

@ -1 +0,0 @@
596d6923ff4cf7ea72ded3ac32903b9c618ce9f1

1
plugins/repository-s3/licenses/jackson-databind-2.8.11.6.jar.sha1 Normal file
View File

@ -0,0 +1 @@
35753201d0cdb1dbe998ab289bca1180b68d4368