Skip to content

Commit

Permalink
Upgrade AWS SDK Jackson Databind to 2.6.7.1
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jasontedor committed Nov 13, 2017
1 parent c83f112 commit c67fb80
Show file tree
Hide file tree
Showing 10 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions plugins/discovery-ec2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ dependencies {
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
compile "commons-logging:commons-logging:${versions.commonslogging}"
compile "commons-codec:commons-codec:${versions.commonscodec}"
compile 'com.fasterxml.jackson.core:jackson-databind:2.5.3'
compile 'com.fasterxml.jackson.core:jackson-annotations:2.5.0'
compile 'com.fasterxml.jackson.core:jackson-databind:2.6.7.1'
compile 'com.fasterxml.jackson.core:jackson-annotations:2.6.0'
}

dependencyLicenses {
Expand Down

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
306775aeb5164835a1dcbdf3f945587045cfb3b5
4 changes: 2 additions & 2 deletions plugins/repository-s3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ dependencies {
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
compile "commons-logging:commons-logging:${versions.commonslogging}"
compile "commons-codec:commons-codec:${versions.commonscodec}"
compile "com.fasterxml.jackson.core:jackson-databind:2.5.3"
compile "com.fasterxml.jackson.core:jackson-annotations:2.5.0"
compile 'com.fasterxml.jackson.core:jackson-databind:2.6.7.1'
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,
// and whitelist this hack in JarHell
Expand Down

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
306775aeb5164835a1dcbdf3f945587045cfb3b5

0 comments on commit c67fb80

Please sign in to comment.