diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index a0c663b19a0c..c49e78c4abc2 100644 --- a/build-tools-internal/version.properties +++ b/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 diff --git a/docs/changelog/122431.yaml b/docs/changelog/122431.yaml new file mode 100644 index 000000000000..cb72dabc40aa --- /dev/null +++ b/docs/changelog/122431.yaml @@ -0,0 +1,5 @@ +pr: 122431 +summary: Upgrade AWS SDK to v1.12.746 +area: Snapshot/Restore +type: upgrade +issues: [] diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 64efd8e439df..eb5776d0e96e 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -89,29 +89,29 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/modules/repository-s3/build.gradle b/modules/repository-s3/build.gradle index 1db83b9e9bc4..db42e4c7ecaa 100644 --- a/modules/repository-s3/build.gradle +++ b/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', diff --git a/plugins/discovery-ec2/build.gradle b/plugins/discovery-ec2/build.gradle index a824eda6a462..6cf5997c24a8 100644 --- a/plugins/discovery-ec2/build.gradle +++ b/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',