diff --git a/plugins/discovery-ec2/build.gradle b/plugins/discovery-ec2/build.gradle index 31a20f09f0b..f154c3d7189 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.6.7.1' - compile 'com.fasterxml.jackson.core:jackson-annotations:2.6.0' + compile 'com.fasterxml.jackson.core:jackson-databind:2.8.11.3' + compile "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}" } dependencyLicenses { 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 deleted file mode 100644 index bc4cae402d6..00000000000 --- a/plugins/discovery-ec2/licenses/jackson-annotations-2.6.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a0990e2e812ac6639b6ce955c91b13228500476e \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-annotations-2.8.11.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-annotations-2.8.11.jar.sha1 new file mode 100644 index 00000000000..30e7d1a7b1a --- /dev/null +++ b/plugins/discovery-ec2/licenses/jackson-annotations-2.8.11.jar.sha1 @@ -0,0 +1 @@ +391de20b4e29cb3fb07d2454ace64be2c82ac91f \ No newline at end of file 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 deleted file mode 100644 index 7d82dbddc52..00000000000 --- a/plugins/discovery-ec2/licenses/jackson-databind-2.6.7.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -306775aeb5164835a1dcbdf3f945587045cfb3b5 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/jackson-databind-2.8.11.3.jar.sha1 b/plugins/discovery-ec2/licenses/jackson-databind-2.8.11.3.jar.sha1 new file mode 100644 index 00000000000..253a1361931 --- /dev/null +++ b/plugins/discovery-ec2/licenses/jackson-databind-2.8.11.3.jar.sha1 @@ -0,0 +1 @@ +844df5aba5a1a56e00905b165b12bb34116ee858 \ No newline at end of file diff --git a/plugins/discovery-ec2/src/main/plugin-metadata/plugin-security.policy b/plugins/discovery-ec2/src/main/plugin-metadata/plugin-security.policy index 8f0278de392..f29319b4f77 100644 --- a/plugins/discovery-ec2/src/main/plugin-metadata/plugin-security.policy +++ b/plugins/discovery-ec2/src/main/plugin-metadata/plugin-security.policy @@ -27,4 +27,6 @@ grant { // ec2 client opens socket connections for discovery permission java.net.SocketPermission "*", "connect"; + + permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; }; diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle index 779274cfd5e..bcdbf5040d9 100644 --- a/plugins/repository-s3/build.gradle +++ b/plugins/repository-s3/build.gradle @@ -43,8 +43,8 @@ dependencies { compile "commons-logging:commons-logging:${versions.commonslogging}" compile "commons-codec:commons-codec:${versions.commonscodec}" compile "com.fasterxml.jackson.core:jackson-core:${versions.jackson}" - compile 'com.fasterxml.jackson.core:jackson-databind:2.6.7.1' - compile 'com.fasterxml.jackson.core:jackson-annotations:2.6.0' + compile 'com.fasterxml.jackson.core:jackson-databind:2.8.11.3' + compile "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}" compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}" compile "joda-time:joda-time:${versions.joda}" 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 deleted file mode 100644 index bc4cae402d6..00000000000 --- a/plugins/repository-s3/licenses/jackson-annotations-2.6.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a0990e2e812ac6639b6ce955c91b13228500476e \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-annotations-2.8.11.jar.sha1 b/plugins/repository-s3/licenses/jackson-annotations-2.8.11.jar.sha1 new file mode 100644 index 00000000000..30e7d1a7b1a --- /dev/null +++ b/plugins/repository-s3/licenses/jackson-annotations-2.8.11.jar.sha1 @@ -0,0 +1 @@ +391de20b4e29cb3fb07d2454ace64be2c82ac91f \ No newline at end of file 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 deleted file mode 100644 index 7d82dbddc52..00000000000 --- a/plugins/repository-s3/licenses/jackson-databind-2.6.7.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -306775aeb5164835a1dcbdf3f945587045cfb3b5 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jackson-databind-2.8.11.3.jar.sha1 b/plugins/repository-s3/licenses/jackson-databind-2.8.11.3.jar.sha1 new file mode 100644 index 00000000000..253a1361931 --- /dev/null +++ b/plugins/repository-s3/licenses/jackson-databind-2.8.11.3.jar.sha1 @@ -0,0 +1 @@ +844df5aba5a1a56e00905b165b12bb34116ee858 \ No newline at end of file