Skip to content

Commit 6e0679d

Browse files
authored
[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 #88932
1 parent 4ba1572 commit 6e0679d

File tree

5 files changed

+25
-14
lines changed

5 files changed

+25
-14
lines changed

docs/changelog/104346.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 104346
2+
summary: "[7x] upgrade aws client depdencies"
3+
area: Snapshot/Restore
4+
type: upgrade
5+
issues: []

gradle/verification-metadata.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,24 +59,24 @@
5959
<sha256 value="3366d2c88fb576e486d830f521184e8f1839f8c15dcd2151a3f6e1f62b0b37a0" origin="Generated by Gradle"/>
6060
</artifact>
6161
</component>
62-
<component group="com.amazonaws" name="aws-java-sdk-core" version="1.11.749">
63-
<artifact name="aws-java-sdk-core-1.11.749.jar">
64-
<sha256 value="06d4035a0b2373f0fef529de0e6f81ff43ef7a36ecf476e5d5f1aecba8ee4fad" origin="Generated by Gradle"/>
62+
<component group="com.amazonaws" name="aws-java-sdk-core" version="1.12.270">
63+
<artifact name="aws-java-sdk-core-1.12.270.jar">
64+
<sha256 value="4e41d9f54606151674fc550e5e6291b0ddf917d55a2a3465a45a4e6ac98c9f8f" origin="Generated by Gradle"/>
6565
</artifact>
6666
</component>
67-
<component group="com.amazonaws" name="aws-java-sdk-ec2" version="1.11.749">
68-
<artifact name="aws-java-sdk-ec2-1.11.749.jar">
69-
<sha256 value="293cc44d21aac78f5d974992606e7c4bbff20e8d0b897d0f13476424c59df843" origin="Generated by Gradle"/>
67+
<component group="com.amazonaws" name="aws-java-sdk-ec2" version="1.12.270">
68+
<artifact name="aws-java-sdk-ec2-1.12.270.jar">
69+
<sha256 value="faadf443751822e205338e80d2cea5eabd6373c1c3cef6348c24809ca82a9dd0" origin="Generated by Gradle"/>
7070
</artifact>
7171
</component>
72-
<component group="com.amazonaws" name="aws-java-sdk-s3" version="1.11.749">
73-
<artifact name="aws-java-sdk-s3-1.11.749.jar">
74-
<sha256 value="fc17c0e186c36ac153e9f871a510e485527c911edeb9f736160b37609f51e7c2" origin="Generated by Gradle"/>
72+
<component group="com.amazonaws" name="aws-java-sdk-s3" version="1.12.270">
73+
<artifact name="aws-java-sdk-s3-1.12.270.jar">
74+
<sha256 value="41bbea44bac7cfce3898e2e598a17526984337e265f6b16814839c17168a570e" origin="Generated by Gradle"/>
7575
</artifact>
7676
</component>
77-
<component group="com.amazonaws" name="jmespath-java" version="1.11.749">
78-
<artifact name="jmespath-java-1.11.749.jar">
79-
<sha256 value="0a73428ee8e19b0a1cb4a39f5b4a7af8f5c2d736bd6b171d7054d517cd528c3e" origin="Generated by Gradle"/>
77+
<component group="com.amazonaws" name="jmespath-java" version="1.12.270">
78+
<artifact name="jmespath-java-1.12.270.jar">
79+
<sha256 value="515d1afb0cd0176630c0707acabd4a3e48424ea938b89359774f61a24b6450f1" origin="Generated by Gradle"/>
8080
</artifact>
8181
</component>
8282
<component group="com.avast.gradle" name="gradle-docker-compose-plugin" version="0.17.5">

plugins/discovery-ec2/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ esplugin {
1616
}
1717

1818
versions << [
19-
'aws': '1.11.749'
19+
'aws': '1.12.270'
2020
]
2121

2222
dependencies {

plugins/repository-s3/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ esplugin {
2323
}
2424

2525
versions << [
26-
'aws': '1.11.749'
26+
'aws': '1.12.270'
2727
]
2828

2929
dependencies {
@@ -318,6 +318,7 @@ tasks.named("thirdPartyAudit").configure {
318318
// We don't use the kms dependency
319319
'com.amazonaws.services.kms.AWSKMS',
320320
'com.amazonaws.services.kms.AWSKMSClient',
321+
'com.amazonaws.services.kms.AWSKMSClientBuilder',
321322
'com.amazonaws.services.kms.model.DecryptRequest',
322323
'com.amazonaws.services.kms.model.DecryptResult',
323324
'com.amazonaws.services.kms.model.EncryptRequest',

x-pack/snapshot-tool/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ import org.elasticsearch.gradle.ElasticsearchDistribution
1313

1414
apply plugin: 'elasticsearch.build'
1515

16+
versions << [
17+
'aws': '1.12.270'
18+
]
19+
1620
dependencies {
1721
api project(":server")
1822
api project(":libs:elasticsearch-cli")
@@ -158,6 +162,7 @@ tasks.named("thirdPartyAudit").configure {
158162
// We don't use the kms dependency
159163
'com.amazonaws.services.kms.AWSKMS',
160164
'com.amazonaws.services.kms.AWSKMSClient',
165+
'com.amazonaws.services.kms.AWSKMSClientBuilder',
161166
'com.amazonaws.services.kms.model.DecryptRequest',
162167
'com.amazonaws.services.kms.model.DecryptResult',
163168
'com.amazonaws.services.kms.model.EncryptRequest',

0 commit comments

Comments
 (0)