From b086af593c67884078b641a8dad723c1f24a0f34 Mon Sep 17 00:00:00 2001 From: Sarat Vemulapalli Date: Fri, 24 Jun 2022 11:20:15 -0700 Subject: [PATCH] Centralizing AWS dependencies for plugins Signed-off-by: Sarat Vemulapalli --- buildSrc/version.properties | 3 +++ plugins/discovery-ec2/build.gradle | 4 ---- .../licenses/aws-java-sdk-core-1.11.749.jar.sha1 | 1 - .../licenses/aws-java-sdk-core-1.12.247.jar.sha1 | 1 + .../licenses/aws-java-sdk-ec2-1.11.749.jar.sha1 | 1 - .../licenses/aws-java-sdk-ec2-1.12.247.jar.sha1 | 1 + plugins/repository-s3/build.gradle | 7 ++----- 7 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 plugins/discovery-ec2/licenses/aws-java-sdk-core-1.11.749.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/aws-java-sdk-core-1.12.247.jar.sha1 delete mode 100644 plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.11.749.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.12.247.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 87dbad73229b4..2a7f8aeaae705 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -31,6 +31,9 @@ httpasyncclient = 4.1.4 commonslogging = 1.2 commonscodec = 1.13 +# plugin dependencies +aws = 1.12.247 + # when updating this version, you need to ensure compatibility with: # - plugins/ingest-attachment (transitive dependency, check the upstream POM) # - distribution/tools/plugin-cli diff --git a/plugins/discovery-ec2/build.gradle b/plugins/discovery-ec2/build.gradle index 0e096958538a4..1766aa14ea9e9 100644 --- a/plugins/discovery-ec2/build.gradle +++ b/plugins/discovery-ec2/build.gradle @@ -38,10 +38,6 @@ opensearchplugin { classname 'org.opensearch.discovery.ec2.Ec2DiscoveryPlugin' } -versions << [ - 'aws': '1.11.749' -] - dependencies { api "com.amazonaws:aws-java-sdk-ec2:${versions.aws}" api "com.amazonaws:aws-java-sdk-core:${versions.aws}" diff --git a/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.11.749.jar.sha1 b/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.11.749.jar.sha1 deleted file mode 100644 index 7bc18d6d4f681..0000000000000 --- a/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.11.749.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1da5c1549295cfeebc67fc1c7539785a9441755b \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.12.247.jar.sha1 b/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.12.247.jar.sha1 new file mode 100644 index 0000000000000..5b3f4a3511769 --- /dev/null +++ b/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.12.247.jar.sha1 @@ -0,0 +1 @@ +70f59d940c965a899f69743ec36a8eb099f539ef \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.11.749.jar.sha1 b/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.11.749.jar.sha1 deleted file mode 100644 index c7c7220005fc3..0000000000000 --- a/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.11.749.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0865e0937c6500acf62ce9c8964eac76a8718f5f \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.12.247.jar.sha1 b/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.12.247.jar.sha1 new file mode 100644 index 0000000000000..03505417f3e26 --- /dev/null +++ b/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.12.247.jar.sha1 @@ -0,0 +1 @@ +30120ff6617fb653d525856480d7ba99528d875d \ No newline at end of file diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle index fb99a0bb95adc..e207b472ee665 100644 --- a/plugins/repository-s3/build.gradle +++ b/plugins/repository-s3/build.gradle @@ -44,10 +44,6 @@ opensearchplugin { classname 'org.opensearch.repositories.s3.S3RepositoryPlugin' } -versions << [ - 'aws': '1.12.247' -] - dependencies { api "com.amazonaws:aws-java-sdk-s3:${versions.aws}" api "com.amazonaws:aws-java-sdk-core:${versions.aws}" @@ -386,7 +382,8 @@ thirdPartyAudit.ignoreMissingClasses( 'com.amazonaws.services.kms.model.EncryptRequest', 'com.amazonaws.services.kms.model.EncryptResult', 'com.amazonaws.services.kms.model.GenerateDataKeyRequest', - 'com.amazonaws.services.kms.model.GenerateDataKeyResult' + 'com.amazonaws.services.kms.model.GenerateDataKeyResult', + 'com.amazonaws.services.kms.AWSKMSClientBuilder' ) // jarhell with jdk (intentionally, because jaxb was removed from default modules in java 9)