Skip to content

[repository-s3] Update the AWS SDK to 1.12.270 #88932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 5, 2022
Merged

[repository-s3] Update the AWS SDK to 1.12.270 #88932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
040bc7f
[repository-s3] Update the AWS SDK to 1.12.270
arteam Aug 16, 2022
5b9d8df
Update commons-code to 1.15
arteam Aug 16, 2022
2617241
Add exceptions to unused classes
arteam Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build-tools-internal/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bundled_jdk = 18.0.2+9@f6ad4b4450fd4d298113270ec84f30ee
# optional dependencies
spatial4j = 0.7
jts = 1.15.0
jackson = 2.13.2
jackson = 2.13.3
snakeyaml = 1.26
icu4j = 68.2
supercsv = 2.4.0
Expand Down Expand Up @@ -35,7 +35,7 @@ httpclient = 4.5.13
httpcore = 4.4.13
httpasyncclient = 4.1.5
commonslogging = 1.2
commonscodec = 1.14
commonscodec = 1.15
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we should only upgrades those dependencies for the module only? This is going to impact many projects/modules. @rjernst do you have an opinion?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Usually, we update the transitive dependencies when we do library upgrades, but we can also don't do it in this case because jackson and commonscodec updates are really minor.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked at release notes for jackson 2.3.13 and commons codec 1.15 and saw nothing outstanding. There are changes around Base64 and MurmurHash3 but IIUC existing behaviors are not changed.


# test dependencies
randomizedrunner = 2.8.0
Expand Down
50 changes: 50 additions & 0 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@
<sha256 value="06d4035a0b2373f0fef529de0e6f81ff43ef7a36ecf476e5d5f1aecba8ee4fad" origin="Generated by Gradle"/>
</artifact>
</component>
<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"/>
Expand All @@ -94,16 +99,31 @@
<sha256 value="fc17c0e186c36ac153e9f871a510e485527c911edeb9f736160b37609f51e7c2" origin="Generated by Gradle"/>
</artifact>
</component>
<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="aws-java-sdk-sts" version="1.11.749">
<artifact name="aws-java-sdk-sts-1.11.749.jar">
<sha256 value="ad753f2b17690010a2dde4b1a84e8f67916c79301a8d44b6224d8132febdc152" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.amazonaws" name="aws-java-sdk-sts" version="1.12.270">
<artifact name="aws-java-sdk-sts-1.12.270.jar">
<sha256 value="8cf2d3705381b81808c2e75a5e25a7097385b121ef15c001b18fde3d79657571" 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"/>
</artifact>
</component>
<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.14.13">
<artifact name="gradle-docker-compose-plugin-0.14.13.jar">
<sha256 value="3a444766b2a7ed012ef73e35f3187aea3e2d589be74ef9ce232190b1f9b25f2d" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -214,6 +234,11 @@
<sha256 value="7d3df5aafa2dc61ad1dbad30f411548c0184ed92d94628c63168721f08237cd4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.13.3">
<artifact name="jackson-annotations-2.13.3.jar">
<sha256 value="5326a6fbcde7cf8817f36c254101cd45f6acea4258518cd3c80ee5b89f4e4b9b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.core" name="jackson-core" version="2.10.5">
<artifact name="jackson-core-2.10.5.jar">
<sha256 value="2656010d1e921ac69b76fc7e0c0f5a6b14aca62fa9603e78831e6148eb7c77ba" origin="Generated by Gradle"/>
Expand All @@ -229,6 +254,11 @@
<sha256 value="9bfa278ad05179fb68087851caf607652702ca25424bec8358a3716e751405c8" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.core" name="jackson-core" version="2.13.3">
<artifact name="jackson-core-2.13.3.jar">
<sha256 value="ab119a8ea3cc69472ebc0e870b849bfbbe536ad57d613dc38453ccd592ca6a3d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.10.5.1">
<artifact name="jackson-databind-2.10.5.1.jar">
<sha256 value="f93db83891a53e8d268e2cc8fcd88ead2981edc2163e35c2a52c88d9ab57b4a0" origin="Generated by Gradle"/>
Expand All @@ -249,11 +279,21 @@
<sha256 value="efb86b148712a838b94b3cfc95769785a116b3461f709b4cc510055a58b804b2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.13.3">
<artifact name="jackson-databind-2.13.3.jar">
<sha256 value="6444bf08d8cd4629740afc3db1276938f494728deb663ce585c4e91f6b45eb84" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-cbor" version="2.13.2">
<artifact name="jackson-dataformat-cbor-2.13.2.jar">
<sha256 value="bc2055d3c199f47b425ac527f895152b80174b43c53a9cf13a818df692a3f91e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-cbor" version="2.13.3">
<artifact name="jackson-dataformat-cbor-2.13.3.jar">
<sha256 value="8a6a687759739421b1f3c3f9678e7bc1cb37df5832e365996e2f412d7ca7e860" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-smile" version="2.13.2">
<artifact name="jackson-dataformat-smile-2.13.2.jar">
<sha256 value="cc492aaeeb5cdb899d175c8433846eeddf2a52e92aee79e94ce6a34f86f38f98" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -969,6 +1009,11 @@
<sha256 value="a128e4f93fabe5381ded64cf2873019e06030b718eb43ceeae0b0e5d17ad33e9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-codec" name="commons-codec" version="1.15">
<artifact name="commons-codec-1.15.jar">
<sha256 value="b3e9f6d63a790109bf0d056611fbed1cf69055826defeb9894a71369d246ed63" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-codec" name="commons-codec" version="1.9">
<artifact name="commons-codec-1.9.jar">
<sha256 value="ad19d2601c3abf0b946b5c3a4113e226a8c1e3305e395b90013b78dd94a723ce" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -1379,6 +1424,11 @@
<sha256 value="dd8e7c92185a678d1b7b933f31209b6203c8ffa91e9880475a1be0346b9617e3" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="joda-time" name="joda-time" version="2.10.14">
<artifact name="joda-time-2.10.14.jar">
<sha256 value="d65b4f127d36cf52b9b7b439552db22f3de92b892014512870cb3c98a3cf505e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="joda-time" name="joda-time" version="2.8.1">
<artifact name="joda-time-2.8.1.jar">
<sha256 value="b4670b95f75957c974284c5f3ada966040be2578f643c5c6083d262162061fa2" origin="Generated by Gradle"/>
Expand Down
5 changes: 3 additions & 2 deletions modules/repository-s3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ esplugin {
}

versions << [
'aws': '1.11.749'
'aws': '1.12.270'
]

dependencies {
Expand All @@ -40,7 +40,7 @@ dependencies {
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
api "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
api "joda-time:joda-time:2.8.1"
api "joda-time:joda-time:2.10.14"

// 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
Expand Down Expand Up @@ -368,6 +368,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',
Expand Down