Upgrade AWS Java SDK to 2.31.78 (#131050) (#131354)

This picks up the fix for the locale bug reported at
https://github.com/aws/aws-sdk-java-v2/issues/5968.

This reverts the patching of the library added in commit
2697a3a87215c92efb3c9bd6c42b99ae8a63f2a7, except for the test
enhancement.

Fix confirmed in e.g. locale `ar-ER` with

    ./gradlew ":plugins:discovery-ec2:test" \
        --tests "org.elasticsearch.discovery.ec2.Ec2DiscoveryTests.testFilterByTags" \
        -Dtests.seed=596874EED28A2B92 -Dtests.locale=ar-ER -Dtests.timezone=NET \
        -Druntime.java=24

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/dependencies/patches/awsv2sdk/Awsv2ClassPatcher.java

@@ -1,61 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
- * Public License v 1"; you may not use this file except in compliance with, at
- * your election, the "Elastic License 2.0", the "GNU Affero General Public
- * License v3.0 only", or the "Server Side Public License, v 1".
- */
-
-package org.elasticsearch.gradle.internal.dependencies.patches.awsv2sdk;
-
-import org.elasticsearch.gradle.internal.dependencies.patches.PatcherInfo;
-import org.elasticsearch.gradle.internal.dependencies.patches.Utils;
-import org.gradle.api.artifacts.transform.CacheableTransform;
-import org.gradle.api.artifacts.transform.InputArtifact;
-import org.gradle.api.artifacts.transform.TransformAction;
-import org.gradle.api.artifacts.transform.TransformOutputs;
-import org.gradle.api.artifacts.transform.TransformParameters;
-import org.gradle.api.file.FileSystemLocation;
-import org.gradle.api.provider.Provider;
-import org.gradle.api.tasks.Classpath;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.util.List;
-
-import static org.elasticsearch.gradle.internal.dependencies.patches.PatcherInfo.classPatcher;
-
-@CacheableTransform
-public abstract class Awsv2ClassPatcher implements TransformAction<TransformParameters.None> {
-
-    private static final String JAR_FILE_TO_PATCH = "aws-query-protocol";
-
-    private static final List<PatcherInfo> CLASS_PATCHERS = List.of(
-        // This patcher is needed because of this AWS bug: https://github.com/aws/aws-sdk-java-v2/issues/5968
-        // As soon as the bug is resolved and we upgrade our AWS SDK v2 libraries, we can remove this.
-        classPatcher(
-            "software/amazon/awssdk/protocols/query/internal/marshall/ListQueryMarshaller.class",
-            "213e84d9a745bdae4b844334d17aecdd6499b36df32aa73f82dc114b35043009",
-            StringFormatInPathResolverPatcher::new
-        )
-    );
-
-    @Classpath
-    @InputArtifact
-    public abstract Provider<FileSystemLocation> getInputArtifact();
-
-    @Override
-    public void transform(@NotNull TransformOutputs outputs) {
-        File inputFile = getInputArtifact().get().getAsFile();
-
-        if (inputFile.getName().startsWith(JAR_FILE_TO_PATCH)) {
-            System.out.println("Patching " + inputFile.getName());
-            File outputFile = outputs.file(inputFile.getName().replace(".jar", "-patched.jar"));
-            Utils.patchJar(inputFile, outputFile, CLASS_PATCHERS);
-        } else {
-            System.out.println("Skipping " + inputFile.getName());
-            outputs.file(getInputArtifact());
-        }
-    }
-}

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/dependencies/patches/awsv2sdk/StringFormatInPathResolverPatcher.java

@@ -1,89 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
- * Public License v 1"; you may not use this file except in compliance with, at
- * your election, the "Elastic License 2.0", the "GNU Affero General Public
- * License v3.0 only", or the "Server Side Public License, v 1".
- */
-
-package org.elasticsearch.gradle.internal.dependencies.patches.awsv2sdk;
-
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Type;
-
-import java.util.Locale;
-
-import static org.objectweb.asm.Opcodes.ASM9;
-import static org.objectweb.asm.Opcodes.GETSTATIC;
-import static org.objectweb.asm.Opcodes.INVOKESTATIC;
-
-class StringFormatInPathResolverPatcher extends ClassVisitor {
-
-    StringFormatInPathResolverPatcher(ClassWriter classWriter) {
-        super(ASM9, classWriter);
-    }
-
-    @Override
-    public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
-        return new ReplaceCallMethodVisitor(super.visitMethod(access, name, descriptor, signature, exceptions));
-    }
-
-    /**
-     * Replaces calls to String.format(format, args); with calls to String.format(Locale.ROOT, format, args);
-     */
-    private static class ReplaceCallMethodVisitor extends MethodVisitor {
-        private static final String CLASS_INTERNAL_NAME = Type.getInternalName(String.class);
-        private static final String METHOD_NAME = "format";
-        private static final String OLD_METHOD_DESCRIPTOR = Type.getMethodDescriptor(
-            Type.getType(String.class),
-            Type.getType(String.class),
-            Type.getType(Object[].class)
-        );
-        private static final String NEW_METHOD_DESCRIPTOR = Type.getMethodDescriptor(
-            Type.getType(String.class),
-            Type.getType(Locale.class),
-            Type.getType(String.class),
-            Type.getType(Object[].class)
-        );
-
-        private boolean foundFormatPattern = false;
-
-        ReplaceCallMethodVisitor(MethodVisitor methodVisitor) {
-            super(ASM9, methodVisitor);
-        }
-
-        @Override
-        public void visitLdcInsn(Object value) {
-            if (value instanceof String s && s.startsWith("%s")) {
-                if (foundFormatPattern) {
-                    throw new IllegalStateException(
-                        "A previous string format constant was not paired with a String.format() call. "
-                            + "Patching would generate an unbalances stack"
-                    );
-                }
-                // Push the extra arg on the stack
-                mv.visitFieldInsn(GETSTATIC, Type.getInternalName(Locale.class), "ROOT", Type.getDescriptor(Locale.class));
-                foundFormatPattern = true;
-            }
-            super.visitLdcInsn(value);
-        }
-
-        @Override
-        public void visitMethodInsn(int opcode, String owner, String name, String descriptor, boolean isInterface) {
-            if (opcode == INVOKESTATIC
-                && foundFormatPattern
-                && CLASS_INTERNAL_NAME.equals(owner)
-                && METHOD_NAME.equals(name)
-                && OLD_METHOD_DESCRIPTOR.equals(descriptor)) {
-                // Replace the call with String.format(Locale.ROOT, format, args)
-                mv.visitMethodInsn(INVOKESTATIC, CLASS_INTERNAL_NAME, METHOD_NAME, NEW_METHOD_DESCRIPTOR, false);
-                foundFormatPattern = false;
-            } else {
-                super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
-            }
-        }
-    }
-}

build-tools-internal/version.properties

@@ -17,7 +17,7 @@ jna               = 5.12.1
 netty             = 4.1.118.Final
 commons_lang3     = 3.9
 google_oauth_client = 1.34.1
-awsv2sdk            = 2.30.38
+awsv2sdk            = 2.31.78
 reactive_streams    = 1.0.4
 
 antlr4            = 4.13.1

docs/changelog/131050.yaml

@@ -0,0 +1,6 @@
+pr: 131050
+summary: Upgrade AWS Java SDK to 2.31.78
+area: "Snapshot/Restore"
+type: upgrade
+issues: []
+

gradle/verification-metadata.xml

@@ -4954,174 +4954,174 @@
             <sha256 value="880c9d896e4b74a06c549c15ca496450165d6909fa15d7e662bee8f6a66d7afa" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="annotations" version="2.30.38">
-         <artifact name="annotations-2.30.38.jar">
-            <sha256 value="64d8c2bcccd33c20ccdbafa101b01d8e0f750c4e4bd227b0b765046f601eb944" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="annotations" version="2.31.78">
+         <artifact name="annotations-2.31.78.jar">
+            <sha256 value="978bfe6a929aeb6e0ce602462a26015f68d38d673b2635a8b5df57092bc623a2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="apache-client" version="2.30.38">
-         <artifact name="apache-client-2.30.38.jar">
-            <sha256 value="ebb1d3d05711ccf2aa9bfc43fcc69fbe32e7be69e006e7952679c2f37d149f4d" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="apache-client" version="2.31.78">
+         <artifact name="apache-client-2.31.78.jar">
+            <sha256 value="f6f31b4e950ea0cf118d572f5d3437e13bb0d064894ca2b999f1a25082a973a7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="arns" version="2.30.38">
-         <artifact name="arns-2.30.38.jar">
-            <sha256 value="8e2f30384e603bfe793932a143dc6d55fabaaefe85567d09ee6e29adce3892fe" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="arns" version="2.31.78">
+         <artifact name="arns-2.31.78.jar">
+            <sha256 value="8ba1e469cac45eb3d9ac3a6a78aa3ae05ce838ec99cd6babf5f50c8a927d60f8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="auth" version="2.30.38">
-         <artifact name="auth-2.30.38.jar">
-            <sha256 value="22d59f9af8111be5219eb33ef480d84c616565913da57cb4eac686076fea370e" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="auth" version="2.31.78">
+         <artifact name="auth-2.31.78.jar">
+            <sha256 value="6cf0ebb8f2cebfa99a3037ea73df5a2e8c40c10ceb4252f513f4e95d9584b8c2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="aws-core" version="2.30.38">
-         <artifact name="aws-core-2.30.38.jar">
-            <sha256 value="ec404c92a17f324ef4b08cd11122cdcc3a7c472615f993904c1a100df0d00223" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="aws-core" version="2.31.78">
+         <artifact name="aws-core-2.31.78.jar">
+            <sha256 value="37a383179350512140788fc23fc2c96ae0f1f54ca3b003f40b04edec94f373e4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="aws-json-protocol" version="2.30.38">
-         <artifact name="aws-json-protocol-2.30.38.jar">
-            <sha256 value="b62be02560a46135181342afc9fb2d99373a9f04f384caf30863e2e7fe5b3892" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="aws-json-protocol" version="2.31.78">
+         <artifact name="aws-json-protocol-2.31.78.jar">
+            <sha256 value="89ccabb857b0825a96c0df46389409b91dd3a0bba54aee22d57e0406e529bc40" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="aws-query-protocol" version="2.30.38">
-         <artifact name="aws-query-protocol-2.30.38.jar">
-            <sha256 value="bfd558e937de70c3260df2356b47a25b562c59b5ebeded6b199846cc9a354fe5" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="aws-query-protocol" version="2.31.78">
+         <artifact name="aws-query-protocol-2.31.78.jar">
+            <sha256 value="2f176b32e94ff45ebd5209f5438f6ab82a744767206c6cb35815a85ee30b1b61" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="aws-xml-protocol" version="2.30.38">
-         <artifact name="aws-xml-protocol-2.30.38.jar">
-            <sha256 value="6940bdaaa0dd135a6389bcd51a7bc613cf040cb8a689b5db7dcc18443b33d1fe" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="aws-xml-protocol" version="2.31.78">
+         <artifact name="aws-xml-protocol-2.31.78.jar">
+            <sha256 value="f928fb16b154a852e8e3373eeba3a09740db75ddb4d3f55f043e818e82f8d802" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="bedrockruntime" version="2.30.38">
-         <artifact name="bedrockruntime-2.30.38.jar">
-            <sha256 value="4424437b49fdf263ea460f4da634d3279ada7f4763827d74fea48c0f8f2afea3" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="bedrockruntime" version="2.31.78">
+         <artifact name="bedrockruntime-2.31.78.jar">
+            <sha256 value="2671cfb5d2e4943274845c53caea9bf345616fc8a304e08a1b09a56282864cab" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="checksums" version="2.30.38">
-         <artifact name="checksums-2.30.38.jar">
-            <sha256 value="38d051e2c6aa4ea08ccf758adc7f30323503d9c759b4862f7f5e5b20a4871a37" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="checksums" version="2.31.78">
+         <artifact name="checksums-2.31.78.jar">
+            <sha256 value="96717d9f20561b0400ed501685d3b85aee556d1a1e3d5fee5406c84d59f4e9ef" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="checksums-spi" version="2.30.38">
-         <artifact name="checksums-spi-2.30.38.jar">
-            <sha256 value="82d97bcbb18d8f369b00c9971ca8c24ad94769d20836e0c4f86ebcdfea994cdb" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="checksums-spi" version="2.31.78">
+         <artifact name="checksums-spi-2.31.78.jar">
+            <sha256 value="3c995f07b86dd3978279cf984aedb5d1f02a00e333a22dc92a6529c13c14ab60" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="ec2" version="2.30.38">
-         <artifact name="ec2-2.30.38.jar">
-            <sha256 value="a2e52ca80aac79553f9da1463256db0177b12c5c24c1b5660a3bb7874b66222f" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="ec2" version="2.31.78">
+         <artifact name="ec2-2.31.78.jar">
+            <sha256 value="47023ae9c5777a739c8fee0041eec70600d8fe72296a63b4678e81e1ef2587e3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="endpoints-spi" version="2.30.38">
-         <artifact name="endpoints-spi-2.30.38.jar">
-            <sha256 value="80620e3020a29871073a8a4efbcaa4d546667eeb92dfd478de808dca7e0500aa" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="endpoints-spi" version="2.31.78">
+         <artifact name="endpoints-spi-2.31.78.jar">
+            <sha256 value="fd47a6095d9ad42eee8b80d323282ffb6e7328df0a5f50bcdb0dd08f3b3ba804" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="http-auth" version="2.30.38">
-         <artifact name="http-auth-2.30.38.jar">
-            <sha256 value="ec16c0da3df9d5f0b13e469054d824b8a7a6ea4b910ec423fefac794043e22b0" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="http-auth" version="2.31.78">
+         <artifact name="http-auth-2.31.78.jar">
+            <sha256 value="ff598a45d5e1e9cad0fc144b2556f7626d469cbed941870417bce2879f56f816" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="http-auth-aws" version="2.30.38">
-         <artifact name="http-auth-aws-2.30.38.jar">
-            <sha256 value="014949af1202f007b5a847510988a63cea5420699aefb3bda01bc86aa4c01198" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="http-auth-aws" version="2.31.78">
+         <artifact name="http-auth-aws-2.31.78.jar">
+            <sha256 value="946d887e66d13a76b4189f78ad0678f8aa17bf17e5c3b8cd26d18d0fa2bff9b4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="http-auth-aws-eventstream" version="2.30.38">
-         <artifact name="http-auth-aws-eventstream-2.30.38.jar">
-            <sha256 value="84d1167b24b8437434c0c023a95dbddd3438f9ae2252c12b704e5152e0208027" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="http-auth-aws-eventstream" version="2.31.78">
+         <artifact name="http-auth-aws-eventstream-2.31.78.jar">
+            <sha256 value="c7597431e3174361c6a6d884a996750c527f4c0a014b6028ad7470fb9ac67fce" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="http-auth-spi" version="2.30.38">
-         <artifact name="http-auth-spi-2.30.38.jar">
-            <sha256 value="b014537453ff24bee7665088e56f2cb93fe66fa3d9276a78bb8cd990da667663" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="http-auth-spi" version="2.31.78">
+         <artifact name="http-auth-spi-2.31.78.jar">
+            <sha256 value="c307fa628158e86e639f6d744c291f866860b9a73ebc28564c4acb399163bd55" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="http-client-spi" version="2.30.38">
-         <artifact name="http-client-spi-2.30.38.jar">
-            <sha256 value="1f802f578939e15eb48a816f3d519f4cb6234d48f674bfc9f81f06040b0855d2" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="http-client-spi" version="2.31.78">
+         <artifact name="http-client-spi-2.31.78.jar">
+            <sha256 value="22af2d3d2d14b0f498611807571822b9f944c51d3e162e7d7828c1308c34cb19" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="identity-spi" version="2.30.38">
-         <artifact name="identity-spi-2.30.38.jar">
-            <sha256 value="e784929d8a51591b6ed51344f41b37f2a68582d2e912e8310ea3e57a56d4d6bf" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="identity-spi" version="2.31.78">
+         <artifact name="identity-spi-2.31.78.jar">
+            <sha256 value="6e7c87776ccb7e353d7ef62f98fe2f94d2a9b292478353ad6d0e375b7cc46c0e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="imds" version="2.30.38">
-         <artifact name="imds-2.30.38.jar">
-            <sha256 value="1586c80dfee0d09e26ad9cb313529530f1fb75d9360b05b1f1f1ca246f39d1b2" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="imds" version="2.31.78">
+         <artifact name="imds-2.31.78.jar">
+            <sha256 value="37d7c4b2910b0e901c631634fdaf820e89d3b03466dfd9cfe672bbd424ca2c6c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="json-utils" version="2.30.38">
-         <artifact name="json-utils-2.30.38.jar">
-            <sha256 value="823f565bc6d4031e4b3dada05c1e66c1344f34d498344b7186a2f2d048ba01d8" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="json-utils" version="2.31.78">
+         <artifact name="json-utils-2.31.78.jar">
+            <sha256 value="b2c88e9b055b4b950b24115a93313195a0b4ecd3877bc282113320e7d4ad7298" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="metrics-spi" version="2.30.38">
-         <artifact name="metrics-spi-2.30.38.jar">
-            <sha256 value="1c16e68387ef1fade5ed848811f4c1779fedfe5965e33a1264ebf608e50ad902" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="metrics-spi" version="2.31.78">
+         <artifact name="metrics-spi-2.31.78.jar">
+            <sha256 value="4cd6124153a29a775e1a024af90307acb50e30f68af5199869ca2f7fbd9f83de" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="netty-nio-client" version="2.30.38">
-         <artifact name="netty-nio-client-2.30.38.jar">
-            <sha256 value="1cf334d5df80dcfd09ed8b03d57b0c3153d16807a6f8e8b98eeefce86f6e62c2" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="netty-nio-client" version="2.31.78">
+         <artifact name="netty-nio-client-2.31.78.jar">
+            <sha256 value="819524b1566960778bd29d647246431c8a6eea52050f13ff67fda5bfb3df9fff" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="profiles" version="2.30.38">
-         <artifact name="profiles-2.30.38.jar">
-            <sha256 value="212e182bad994236ea3f63d76080f5855e342759b0af970376500e4d06aa12d2" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="profiles" version="2.31.78">
+         <artifact name="profiles-2.31.78.jar">
+            <sha256 value="b6b1db610412cdf5253d615e2d909f561525a21165c650809240e91ac3902342" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="protocol-core" version="2.30.38">
-         <artifact name="protocol-core-2.30.38.jar">
-            <sha256 value="ead8ea1eb125e5d0dc4a69312f816bdb1b353604bf4b51dd2070d14e78f00d6d" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="protocol-core" version="2.31.78">
+         <artifact name="protocol-core-2.31.78.jar">
+            <sha256 value="1daaca896acd27b65d8567ad1f7e4c678f37916988fb10092ac2f349f6a9519a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="regions" version="2.30.38">
-         <artifact name="regions-2.30.38.jar">
-            <sha256 value="e1674ff1f8d09c0585a60422b4c3ff73a06912d5fd999b91b0a398977655425e" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="regions" version="2.31.78">
+         <artifact name="regions-2.31.78.jar">
+            <sha256 value="b69dfc83837e9d6126934b7dc3375f531c216ebff494fd6d6c636f3ba6dd0057" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="retries" version="2.30.38">
-         <artifact name="retries-2.30.38.jar">
-            <sha256 value="1191db8e9540430e63c2e1fef08311f95fef29cbcda1a353810d6b02ce0495cc" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="retries" version="2.31.78">
+         <artifact name="retries-2.31.78.jar">
+            <sha256 value="be1a123a42cbc0250c4a41b172de77793dd033a3ae36699baac72c86031b8b4b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="retries-spi" version="2.30.38">
-         <artifact name="retries-spi-2.30.38.jar">
-            <sha256 value="da37cb021156b6aae5a30337e270a33a43817a64c59ca7aa4c39074cfda39a4b" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="retries-spi" version="2.31.78">
+         <artifact name="retries-spi-2.31.78.jar">
+            <sha256 value="78736dbdcd897fe2edf19371b59d92eba6cb68dbe4341bfe0144588767d7c5ae" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="s3" version="2.30.38">
-         <artifact name="s3-2.30.38.jar">
-            <sha256 value="c83dd82a9d82ff8c7d2eb1bdb2ae9f9505b312dad9a6bf0b80bc0136653a3a24" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="s3" version="2.31.78">
+         <artifact name="s3-2.31.78.jar">
+            <sha256 value="da437c531544d27825ee65a262a8fbf2e9fb684c1a18116f4cf8327d725b8790" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="sagemakerruntime" version="2.30.38">
-         <artifact name="sagemakerruntime-2.30.38.jar">
-            <sha256 value="b26ee73fa06d047eab9a174e49627972e646c0bbe909f479c18dbff193b561f5" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="sagemakerruntime" version="2.31.78">
+         <artifact name="sagemakerruntime-2.31.78.jar">
+            <sha256 value="5e69d736773fa29d78dc6dc6d847a69519c8e2200a2bf07ba2c090bbb1ab5402" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="sdk-core" version="2.30.38">
-         <artifact name="sdk-core-2.30.38.jar">
-            <sha256 value="556463b8c353408d93feab74719d141fcfda7fd3d7b7d1ad3a8a548b7cc2982d" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="sdk-core" version="2.31.78">
+         <artifact name="sdk-core-2.31.78.jar">
+            <sha256 value="192c9c55bd9cba7ae0ee8667e58c9edcce795b02ed4e671d45323f6d2222f0f6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="sts" version="2.30.38">
-         <artifact name="sts-2.30.38.jar">
-            <sha256 value="29a4eb10332893b17a59f81c9d5b3fbf5caa8a386479f9edf5e81b9b8961af63" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="sts" version="2.31.78">
+         <artifact name="sts-2.31.78.jar">
+            <sha256 value="b144aa0b5c7b43ec52e862bd543a166fd6632bda7dfae68cf7ed5699c4a43aa9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="third-party-jackson-core" version="2.30.38">
-         <artifact name="third-party-jackson-core-2.30.38.jar">
-            <sha256 value="979215cd78fe0b4abfa7465e6400b29ed90ced24d76323e87b6717195f0214af" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="third-party-jackson-core" version="2.31.78">
+         <artifact name="third-party-jackson-core-2.31.78.jar">
+            <sha256 value="fd90d52f5852ad731b754aa23fc0037942a514a43ec29e472d035fd0075a55ca" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="software.amazon.awssdk" name="utils" version="2.30.38">
-         <artifact name="utils-2.30.38.jar">
-            <sha256 value="977f7f03cfd8957889c478b134ce89172217d2ef77bbf81e954efe371ca1f1a8" origin="Generated by Gradle"/>
+      <component group="software.amazon.awssdk" name="utils" version="2.31.78">
+         <artifact name="utils-2.31.78.jar">
+            <sha256 value="f0442908bb9694f9d334f7f171ae3479733462a8ea893708ca2ed939321eb6a2" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="software.amazon.eventstream" name="eventstream" version="1.0.1">

plugins/discovery-ec2/build.gradle

@@ -15,31 +15,6 @@ esplugin {
   classname ='org.elasticsearch.discovery.ec2.Ec2DiscoveryPlugin'
 }
 
-def patched = Attribute.of('patched', Boolean)
-
-configurations {
-  compileClasspath {
-    attributes {
-      attribute(patched, true)
-    }
-  }
-  runtimeClasspath {
-    attributes {
-      attribute(patched, true)
-    }
-  }
-  testCompileClasspath {
-    attributes {
-      attribute(patched, true)
-    }
-  }
-  testRuntimeClasspath {
-    attributes {
-      attribute(patched, true)
-    }
-  }
-}
-
 dependencies {
 
   implementation "software.amazon.awssdk:annotations:${versions.awsv2sdk}"
@@ -90,17 +65,6 @@ dependencies {
   testImplementation project(':test:fixtures:ec2-imds-fixture')
 
   internalClusterTestImplementation project(':test:fixtures:ec2-imds-fixture')
-
-  attributesSchema {
-    attribute(patched)
-  }
-  artifactTypes.getByName("jar") {
-    attributes.attribute(patched, false)
-  }
-  registerTransform(org.elasticsearch.gradle.internal.dependencies.patches.awsv2sdk.Awsv2ClassPatcher) {
-    from.attribute(patched, false)
-    to.attribute(patched, true)
-  }
 }
 
 tasks.named("dependencyLicenses").configure {