From c67fb80d8a8074c0c9c5716de789ac4dc6dfc096 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Mon, 13 Nov 2017 10:12:51 -0500 Subject: [PATCH] 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. --- plugins/discovery-ec2/build.gradle | 4 ++-- .../discovery-ec2/licenses/jackson-annotations-2.5.0.jar.sha1 | 1 - .../discovery-ec2/licenses/jackson-annotations-2.6.0.jar.sha1 | 1 + .../discovery-ec2/licenses/jackson-databind-2.5.3.jar.sha1 | 1 - .../discovery-ec2/licenses/jackson-databind-2.6.7.1.jar.sha1 | 1 + plugins/repository-s3/build.gradle | 4 ++-- .../repository-s3/licenses/jackson-annotations-2.5.0.jar.sha1 | 1 - .../repository-s3/licenses/jackson-annotations-2.6.0.jar.sha1 | 1 + .../repository-s3/licenses/jackson-databind-2.5.3.jar.sha1 | 1 - .../repository-s3/licenses/jackson-databind-2.6.7.1.jar.sha1 | 1 + 10 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 plugins/discovery-ec2/licenses/jackson-annotations-2.5.0.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/jackson-annotations-2.6.0.jar.sha1 delete mode 100644 plugins/discovery-ec2/licenses/jackson-databind-2.5.3.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/jackson-databind-2.6.7.1.jar.sha1 delete mode 100644 plugins/repository-s3/licenses/jackson-annotations-2.5.0.jar.sha1 create mode 100644 plugins/repository-s3/licenses/jackson-annotations-2.6.0.jar.sha1 delete mode 100644 plugins/repository-s3/licenses/jackson-databind-2.5.3.jar.sha1 create mode 100644 plugins/repository-s3/licenses/jackson-databind-2.6.7.1.jar.sha1 diff --git a/plugins/discovery-ec2/build.gradle b/plugins/discovery-ec2/build.gradle index f6941a9260e4b..88f25f72e72f9 100644 --- a/plugins/discovery-ec2/build.gradle +++ b/plugins/discovery-ec2/build.gradle @@ -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 { diff --git a/plugins/discovery-ec2/licenses/jackson-annotations-2.5.0.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-annotations-2.5.0.jar.sha1 deleted file mode 100644 index 862ac6f304f54..0000000000000 --- a/plugins/discovery-ec2/licenses/jackson-annotations-2.5.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a2a55a3375bc1cef830ca426d68d2ea22961190e diff --git a/plugins/discovery-ec2/licenses/jackson-annotations-2.6.0.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-annotations-2.6.0.jar.sha1 new file mode 100644 index 0000000000000..bc4cae402d631 --- /dev/null +++ b/plugins/discovery-ec2/licenses/jackson-annotations-2.6.0.jar.sha1 @@ -0,0 +1 @@ +a0990e2e812ac6639b6ce955c91b13228500476e \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-databind-2.5.3.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-databind-2.5.3.jar.sha1 deleted file mode 100644 index cdc6695805932..0000000000000 --- a/plugins/discovery-ec2/licenses/jackson-databind-2.5.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c37875ff66127d93e5f672708cb2dcc14c8232ab diff --git a/plugins/discovery-ec2/licenses/jackson-databind-2.6.7.1.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-databind-2.6.7.1.jar.sha1 new file mode 100644 index 0000000000000..7d82dbddc52d0 --- /dev/null +++ b/plugins/discovery-ec2/licenses/jackson-databind-2.6.7.1.jar.sha1 @@ -0,0 +1 @@ +306775aeb5164835a1dcbdf3f945587045cfb3b5 \ No newline at end of file diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle index 7071307fbc3c2..ae971cfe4e1ec 100644 --- a/plugins/repository-s3/build.gradle +++ b/plugins/repository-s3/build.gradle @@ -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 diff --git a/plugins/repository-s3/licenses/jackson-annotations-2.5.0.jar.sha1 b/plugins/repository-s3/licenses/jackson-annotations-2.5.0.jar.sha1 deleted file mode 100644 index 862ac6f304f54..0000000000000 --- a/plugins/repository-s3/licenses/jackson-annotations-2.5.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a2a55a3375bc1cef830ca426d68d2ea22961190e diff --git a/plugins/repository-s3/licenses/jackson-annotations-2.6.0.jar.sha1 b/plugins/repository-s3/licenses/jackson-annotations-2.6.0.jar.sha1 new file mode 100644 index 0000000000000..bc4cae402d631 --- /dev/null +++ b/plugins/repository-s3/licenses/jackson-annotations-2.6.0.jar.sha1 @@ -0,0 +1 @@ +a0990e2e812ac6639b6ce955c91b13228500476e \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-databind-2.5.3.jar.sha1 b/plugins/repository-s3/licenses/jackson-databind-2.5.3.jar.sha1 deleted file mode 100644 index cdc6695805932..0000000000000 --- a/plugins/repository-s3/licenses/jackson-databind-2.5.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c37875ff66127d93e5f672708cb2dcc14c8232ab diff --git a/plugins/repository-s3/licenses/jackson-databind-2.6.7.1.jar.sha1 b/plugins/repository-s3/licenses/jackson-databind-2.6.7.1.jar.sha1 new file mode 100644 index 0000000000000..7d82dbddc52d0 --- /dev/null +++ b/plugins/repository-s3/licenses/jackson-databind-2.6.7.1.jar.sha1 @@ -0,0 +1 @@ +306775aeb5164835a1dcbdf3f945587045cfb3b5 \ No newline at end of file