浏览代码

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
Jason Tedor 8 年之前
父节点
当前提交
d375cef73c

+ 2 - 2
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 {

+ 0 - 1
plugins/discovery-ec2/licenses/jackson-annotations-2.5.0.jar.sha1

@@ -1 +0,0 @@
-a2a55a3375bc1cef830ca426d68d2ea22961190e

+ 1 - 0
plugins/discovery-ec2/licenses/jackson-annotations-2.6.0.jar.sha1

@@ -0,0 +1 @@
+a0990e2e812ac6639b6ce955c91b13228500476e

+ 0 - 1
plugins/discovery-ec2/licenses/jackson-databind-2.5.3.jar.sha1

@@ -1 +0,0 @@
-c37875ff66127d93e5f672708cb2dcc14c8232ab

+ 1 - 0
plugins/discovery-ec2/licenses/jackson-databind-2.6.7.1.jar.sha1

@@ -0,0 +1 @@
+306775aeb5164835a1dcbdf3f945587045cfb3b5

+ 2 - 2
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 

+ 0 - 1
plugins/repository-s3/licenses/jackson-annotations-2.5.0.jar.sha1

@@ -1 +0,0 @@
-a2a55a3375bc1cef830ca426d68d2ea22961190e

+ 1 - 0
plugins/repository-s3/licenses/jackson-annotations-2.6.0.jar.sha1

@@ -0,0 +1 @@
+a0990e2e812ac6639b6ce955c91b13228500476e

+ 0 - 1
plugins/repository-s3/licenses/jackson-databind-2.5.3.jar.sha1

@@ -1 +0,0 @@
-c37875ff66127d93e5f672708cb2dcc14c8232ab

+ 1 - 0
plugins/repository-s3/licenses/jackson-databind-2.6.7.1.jar.sha1

@@ -0,0 +1 @@
+306775aeb5164835a1dcbdf3f945587045cfb3b5