[7x] upgrade aws client depdencies (#104346)

This commit bumps the aws client dependencies from from 1.11.749 to
1.12.270.  This aligns the versions used in 7.17.x with main. 

(partial) backport of
https://github.com/elastic/elasticsearch/pull/88932
This commit is contained in:
Jake Landis 2024-01-22 09:52:12 -06:00 committed by GitHub
parent 4ba1572dc5
commit 6e0679d6d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 25 additions and 14 deletions

View file

@ -0,0 +1,5 @@
pr: 104346
summary: "[7x] upgrade aws client depdencies"
area: Snapshot/Restore
type: upgrade
issues: []

View file

@ -59,24 +59,24 @@
<sha256 value="3366d2c88fb576e486d830f521184e8f1839f8c15dcd2151a3f6e1f62b0b37a0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.amazonaws" name="aws-java-sdk-core" version="1.11.749">
<artifact name="aws-java-sdk-core-1.11.749.jar">
<sha256 value="06d4035a0b2373f0fef529de0e6f81ff43ef7a36ecf476e5d5f1aecba8ee4fad" origin="Generated by Gradle"/>
<component group="com.amazonaws" name="aws-java-sdk-core" version="1.12.270">
<artifact name="aws-java-sdk-core-1.12.270.jar">
<sha256 value="4e41d9f54606151674fc550e5e6291b0ddf917d55a2a3465a45a4e6ac98c9f8f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.amazonaws" name="aws-java-sdk-ec2" version="1.11.749">
<artifact name="aws-java-sdk-ec2-1.11.749.jar">
<sha256 value="293cc44d21aac78f5d974992606e7c4bbff20e8d0b897d0f13476424c59df843" origin="Generated by Gradle"/>
<component group="com.amazonaws" name="aws-java-sdk-ec2" version="1.12.270">
<artifact name="aws-java-sdk-ec2-1.12.270.jar">
<sha256 value="faadf443751822e205338e80d2cea5eabd6373c1c3cef6348c24809ca82a9dd0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.amazonaws" name="aws-java-sdk-s3" version="1.11.749">
<artifact name="aws-java-sdk-s3-1.11.749.jar">
<sha256 value="fc17c0e186c36ac153e9f871a510e485527c911edeb9f736160b37609f51e7c2" origin="Generated by Gradle"/>
<component group="com.amazonaws" name="aws-java-sdk-s3" version="1.12.270">
<artifact name="aws-java-sdk-s3-1.12.270.jar">
<sha256 value="41bbea44bac7cfce3898e2e598a17526984337e265f6b16814839c17168a570e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.amazonaws" name="jmespath-java" version="1.11.749">
<artifact name="jmespath-java-1.11.749.jar">
<sha256 value="0a73428ee8e19b0a1cb4a39f5b4a7af8f5c2d736bd6b171d7054d517cd528c3e" origin="Generated by Gradle"/>
<component group="com.amazonaws" name="jmespath-java" version="1.12.270">
<artifact name="jmespath-java-1.12.270.jar">
<sha256 value="515d1afb0cd0176630c0707acabd4a3e48424ea938b89359774f61a24b6450f1" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.avast.gradle" name="gradle-docker-compose-plugin" version="0.17.5">

View file

@ -16,7 +16,7 @@ esplugin {
}
versions << [
'aws': '1.11.749'
'aws': '1.12.270'
]
dependencies {

View file

@ -23,7 +23,7 @@ esplugin {
}
versions << [
'aws': '1.11.749'
'aws': '1.12.270'
]
dependencies {
@ -318,6 +318,7 @@ tasks.named("thirdPartyAudit").configure {
// We don't use the kms dependency
'com.amazonaws.services.kms.AWSKMS',
'com.amazonaws.services.kms.AWSKMSClient',
'com.amazonaws.services.kms.AWSKMSClientBuilder',
'com.amazonaws.services.kms.model.DecryptRequest',
'com.amazonaws.services.kms.model.DecryptResult',
'com.amazonaws.services.kms.model.EncryptRequest',

View file

@ -13,6 +13,10 @@ import org.elasticsearch.gradle.ElasticsearchDistribution
apply plugin: 'elasticsearch.build'
versions << [
'aws': '1.12.270'
]
dependencies {
api project(":server")
api project(":libs:elasticsearch-cli")
@ -158,6 +162,7 @@ tasks.named("thirdPartyAudit").configure {
// We don't use the kms dependency
'com.amazonaws.services.kms.AWSKMS',
'com.amazonaws.services.kms.AWSKMSClient',
'com.amazonaws.services.kms.AWSKMSClientBuilder',
'com.amazonaws.services.kms.model.DecryptRequest',
'com.amazonaws.services.kms.model.DecryptResult',
'com.amazonaws.services.kms.model.EncryptRequest',