Browse Source

Upgrade AWS SDK to v1.12.746 (#122431)

Alex Kattathra Johnson 8 months ago
parent
commit
5462601fd6

+ 1 - 1
build-tools-internal/version.properties

@@ -17,7 +17,7 @@ jna               = 5.12.1
 netty             = 4.1.115.Final
 commons_lang3     = 3.9
 google_oauth_client = 1.34.1
-awsv1sdk            = 1.12.270
+awsv1sdk            = 1.12.746
 awsv2sdk            = 2.28.13
 reactive_streams    = 1.0.4
 

+ 5 - 0
docs/changelog/122431.yaml

@@ -0,0 +1,5 @@
+pr: 122431
+summary: Upgrade AWS SDK to v1.12.746
+area: Snapshot/Restore
+type: upgrade
+issues: []

+ 15 - 15
gradle/verification-metadata.xml

@@ -89,29 +89,29 @@
             <sha256 value="ccc7efe5cd3ce22d6046cafd4d2f8bff5adcb43e0d27da482178fac5daadef81" 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"/>
+      <component group="com.amazonaws" name="aws-java-sdk-core" version="1.12.746">
+         <artifact name="aws-java-sdk-core-1.12.746.jar">
+            <sha256 value="798fd30dafcf6816e760ad8aef8b3f09c43351ed2e166993bddc4527dbafb0be" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <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"/>
+      <component group="com.amazonaws" name="aws-java-sdk-ec2" version="1.12.746">
+         <artifact name="aws-java-sdk-ec2-1.12.746.jar">
+            <sha256 value="cec22d57e05ed75417b1342e9dd468c6fe7f2fab97c626c065d6495e44d732ad" 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"/>
+      <component group="com.amazonaws" name="aws-java-sdk-s3" version="1.12.746">
+         <artifact name="aws-java-sdk-s3-1.12.746.jar">
+            <sha256 value="dcd839802c71ffc4d3e6bebc8769a2149bc423baf95f3e6c8214f9c91536bc38" 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"/>
+      <component group="com.amazonaws" name="aws-java-sdk-sts" version="1.12.746">
+         <artifact name="aws-java-sdk-sts-1.12.746.jar">
+            <sha256 value="2916c28f9a6b6ade40c7e2ffdea3788b198a98b2b16830e02a24ec49fc0fb06f" 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"/>
+      <component group="com.amazonaws" name="jmespath-java" version="1.12.746">
+         <artifact name="jmespath-java-1.12.746.jar">
+            <sha256 value="d4239a7a1bfacbb9cd1f0e48a46ac95960ab7942c6fbb41ea825161efea72351" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.avast.gradle" name="gradle-docker-compose-plugin" version="0.17.5">

+ 0 - 9
modules/repository-s3/build.gradle

@@ -139,15 +139,6 @@ tasks.named("thirdPartyAudit").configure {
           'org.apache.log.Hierarchy',
           'org.apache.log.Logger',
           'javax.jms.Message',
-          'software.amazon.ion.IonReader',
-          'software.amazon.ion.IonSystem',
-          'software.amazon.ion.IonType',
-          'software.amazon.ion.IonWriter',
-          'software.amazon.ion.Timestamp',
-          'software.amazon.ion.system.IonBinaryWriterBuilder',
-          'software.amazon.ion.system.IonSystemBuilder',
-          'software.amazon.ion.system.IonTextWriterBuilder',
-          'software.amazon.ion.system.IonWriterBuilder',
           // We don't use the kms dependency
           'com.amazonaws.services.kms.AWSKMS',
           'com.amazonaws.services.kms.AWSKMSClient',

+ 0 - 9
plugins/discovery-ec2/build.gradle

@@ -106,15 +106,6 @@ tasks.named("thirdPartyAudit").configure {
           // classes are missing
           'com.amazonaws.jmespath.JmesPathExpression',
           'com.amazonaws.jmespath.ObjectMapperSingleton',
-          'software.amazon.ion.IonReader',
-          'software.amazon.ion.IonSystem',
-          'software.amazon.ion.IonType',
-          'software.amazon.ion.IonWriter',
-          'software.amazon.ion.Timestamp',
-          'software.amazon.ion.system.IonBinaryWriterBuilder',
-          'software.amazon.ion.system.IonSystemBuilder',
-          'software.amazon.ion.system.IonTextWriterBuilder',
-          'software.amazon.ion.system.IonWriterBuilder',
           'javax.servlet.ServletContextEvent',
           'javax.servlet.ServletContextListener',
           'org.apache.avalon.framework.logger.Logger',