Upgrade AWS SDK Jackson Databind to 2.6.7.1

The AWS SDK has a transitive dependency on Jackson Databind. While the
AWS SDK was recently upgraded, the Jackson Databind dependency was not
pulled along with it to the version that the AWS SDK depends on. This
commit upgrades the dependencies for discovery-ec2 and repository-s3
plugins to match versions on the AWS SDK transitive dependencies.

Relates #27361
This commit is contained in:
Jason Tedor 2017-11-13 12:05:14 -05:00 committed by GitHub
parent c83f112b1a
commit d375cef73c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 8 additions and 8 deletions

View File

@ -33,8 +33,8 @@ dependencies {
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}" compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
compile "commons-logging:commons-logging:${versions.commonslogging}" compile "commons-logging:commons-logging:${versions.commonslogging}"
compile "commons-codec:commons-codec:${versions.commonscodec}" compile "commons-codec:commons-codec:${versions.commonscodec}"
compile 'com.fasterxml.jackson.core:jackson-databind:2.5.3' compile 'com.fasterxml.jackson.core:jackson-databind:2.6.7.1'
compile 'com.fasterxml.jackson.core:jackson-annotations:2.5.0' compile 'com.fasterxml.jackson.core:jackson-annotations:2.6.0'
} }
dependencyLicenses { dependencyLicenses {

View File

@ -1 +0,0 @@
a2a55a3375bc1cef830ca426d68d2ea22961190e

View File

@ -0,0 +1 @@
a0990e2e812ac6639b6ce955c91b13228500476e

View File

@ -1 +0,0 @@
c37875ff66127d93e5f672708cb2dcc14c8232ab

View File

@ -0,0 +1 @@
306775aeb5164835a1dcbdf3f945587045cfb3b5

View File

@ -34,8 +34,8 @@ dependencies {
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}" compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
compile "commons-logging:commons-logging:${versions.commonslogging}" compile "commons-logging:commons-logging:${versions.commonslogging}"
compile "commons-codec:commons-codec:${versions.commonscodec}" compile "commons-codec:commons-codec:${versions.commonscodec}"
compile "com.fasterxml.jackson.core:jackson-databind:2.5.3" compile 'com.fasterxml.jackson.core:jackson-databind:2.6.7.1'
compile "com.fasterxml.jackson.core:jackson-annotations:2.5.0" compile 'com.fasterxml.jackson.core:jackson-annotations:2.6.0'
// HACK: javax.xml.bind was removed from default modules in java 9, so we pull the api in here, // HACK: javax.xml.bind was removed from default modules in java 9, so we pull the api in here,
// and whitelist this hack in JarHell // and whitelist this hack in JarHell

View File

@ -1 +0,0 @@
a2a55a3375bc1cef830ca426d68d2ea22961190e

View File

@ -0,0 +1 @@
a0990e2e812ac6639b6ce955c91b13228500476e

View File

@ -1 +0,0 @@
c37875ff66127d93e5f672708cb2dcc14c8232ab

View File

@ -0,0 +1 @@
306775aeb5164835a1dcbdf3f945587045cfb3b5