Merge branch 'master' into sugmanue/unmarshalling-single-pass

aws · Oct 10, 2024 · 1b93fce · 1b93fce
2 parents b33fa34 + 0fa11d2
commit 1b93fce
Show file tree

Hide file tree

Showing 480 changed files with 1,013 additions and 881 deletions.
diff --git a/.changes/2.28.19.json b/.changes/2.28.19.json
@@ -0,0 +1,24 @@
+{
+    "version": "2.28.19",
+    "date": "2024-10-09",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "This change adds the default retry conditions in the client builder if none are configured to behave similarly to retry policies that are configured behind the scenes without the users having to do that themselves. This will prevent customers using directly the retry strategies builders from `DefaultRetryStrategy` to end up with a no-op strategy."
+        },
+        {
+            "type": "feature",
+            "category": "AWS CodePipeline",
+            "contributor": "",
+            "description": "AWS CodePipeline introduces a Compute category"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}
diff --git a/.changes/next-release/bugfix-AWSSDKforJavav2-8d6fb63.json b/.changes/next-release/bugfix-AWSSDKforJavav2-8d6fb63.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,16 @@
  #### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
+# __2.28.19__ __2024-10-09__
+## __AWS CodePipeline__
+  - ### Features
+    - AWS CodePipeline introduces a Compute category
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated endpoint and partition metadata.
+
+  - ### Bugfixes
+    - This change adds the default retry conditions in the client builder if none are configured to behave similarly to retry policies that are configured behind the scenes without the users having to do that themselves. This will prevent customers using directly the retry strategies builders from `DefaultRetryStrategy` to end up with a no-op strategy.
+
 # __2.28.18__ __2024-10-08__
 ## __AWS SDK for Java v2__
   - ### Features

diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.28.18</version>
+      <version>2.28.19</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -85,12 +85,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.28.18</version>
+  <version>2.28.19</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.28.18</version>
+  <version>2.28.19</version>
 </dependency>
 ```
 
@@ -102,7 +102,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>aws-sdk-java</artifactId>
-  <version>2.28.18</version>
+  <version>2.28.19</version>
 </dependency>
 ```
 

diff --git a/archetypes/archetype-app-quickstart/pom.xml b/archetypes/archetype-app-quickstart/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/archetypes/archetype-lambda/pom.xml b/archetypes/archetype-lambda/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetype-lambda</artifactId>

diff --git a/archetypes/archetype-tools/pom.xml b/archetypes/archetype-tools/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/archetypes/pom.xml b/archetypes/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetypes</artifactId>

diff --git a/aws-sdk-java/pom.xml b/aws-sdk-java/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

diff --git a/bom-internal/pom.xml b/bom-internal/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>

diff --git a/buildspecs/release-javadoc.yml b/buildspecs/release-javadoc.yml
@@ -1,11 +1,11 @@
 version: 0.2
 env:
   variables:
-    JAVA_HOME: "/usr/lib/jvm/java-21-amazon-corretto/"
+    JAVA_HOME: "/usr/lib/jvm/java-23-amazon-corretto/"
 phases:
   install:
     commands:
-    - apt-get update; apt-get install -y java-21-amazon-corretto-jdk
+    - apt-get update; apt-get install -y java-23-amazon-corretto-jdk
     - update-alternatives --auto javac
     - update-alternatives --auto java
     - pip install awscli==1.19.34 --upgrade --user

diff --git a/bundle-logging-bridge/pom.xml b/bundle-logging-bridge/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
     <artifactId>bundle-logging-bridge</artifactId>
     <packaging>jar</packaging>

diff --git a/bundle-sdk/pom.xml b/bundle-sdk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
     <artifactId>bundle-sdk</artifactId>
     <packaging>jar</packaging>

diff --git a/bundle/pom.xml b/bundle/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

diff --git a/codegen-lite-maven-plugin/pom.xml b/codegen-lite-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>

diff --git a/codegen-lite/pom.xml b/codegen-lite/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>

diff --git a/codegen-maven-plugin/pom.xml b/codegen-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>

diff --git a/codegen/pom.xml b/codegen/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

diff --git a/core/annotations/pom.xml b/core/annotations/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/arns/pom.xml b/core/arns/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/auth-crt/pom.xml b/core/auth-crt/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
 
     <artifactId>auth-crt</artifactId>

diff --git a/core/auth/pom.xml b/core/auth/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
 
     <artifactId>auth</artifactId>

diff --git a/core/aws-core/pom.xml b/core/aws-core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
 
     <artifactId>aws-core</artifactId>

diff --git a/.../src/main/java/software/amazon/awssdk/awscore/client/builder/AwsDefaultClientBuilder.java b/.../src/main/java/software/amazon/awssdk/awscore/client/builder/AwsDefaultClientBuilder.java
@@ -424,11 +424,15 @@ private void configureRetryPolicy(SdkClientConfiguration.Builder config) {
     private void configureRetryStrategy(SdkClientConfiguration.Builder config) {
         RetryStrategy strategy = config.option(SdkClientOption.RETRY_STRATEGY);
         if (strategy != null) {
-            // Fix the retry strategy if no retry predicates were configured. Users using
-            // DefaultRetryStrategy do not have any conditions configured as that package
-            // does not know anything about the SDK or AWS retry conditions. This mimics the
-            // retry policies behavior that are configured behind the scenes and avoids the
-            // risk of customers inadvertently using a no-op retry strategy.
+            // TODO(10/09/24) This is a temporal workaround and not a long term solution. It will fail to add the SDK and AWS
+            //  defaults if the users add one or more if their own retry predicates. A long term fix is needed that can
+            //  "remember" which defaults have been already applied, e.g.,
+            //    if (strategy.shouldAddDefaults("aws")) {
+            //       strategy = strategy.toBuilder()
+            //                          .applyMutation(AwsRetryStrategy::applyDefaults)
+            //                          .markDefaultsAdded("aws")
+            //                          .build();
+            //    }
             if (strategy.maxAttempts() > 1
                 && (strategy instanceof BaseRetryStrategy)
                 && !((BaseRetryStrategy) strategy).hasRetryPredicates()

diff --git a/core/checksums-spi/pom.xml b/core/checksums-spi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
 
     <artifactId>checksums-spi</artifactId>

diff --git a/core/checksums/pom.xml b/core/checksums/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
 
     <artifactId>checksums</artifactId>

diff --git a/core/crt-core/pom.xml b/core/crt-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
 
     <artifactId>crt-core</artifactId>

diff --git a/core/endpoints-spi/pom.xml b/core/endpoints-spi/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/http-auth-aws-crt/pom.xml b/core/http-auth-aws-crt/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
 
     <artifactId>http-auth-aws-crt</artifactId>

diff --git a/core/http-auth-aws-eventstream/pom.xml b/core/http-auth-aws-eventstream/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
 
     <artifactId>http-auth-aws-eventstream</artifactId>

diff --git a/core/http-auth-aws/pom.xml b/core/http-auth-aws/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
 
     <artifactId>http-auth-aws</artifactId>

diff --git a/core/http-auth-spi/pom.xml b/core/http-auth-spi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
 
     <artifactId>http-auth-spi</artifactId>

diff --git a/core/http-auth/pom.xml b/core/http-auth/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
 
     <artifactId>http-auth</artifactId>

diff --git a/core/identity-spi/pom.xml b/core/identity-spi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
 
     <artifactId>identity-spi</artifactId>

diff --git a/core/imds/pom.xml b/core/imds/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>imds</artifactId>

diff --git a/core/json-utils/pom.xml b/core/json-utils/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.19-SNAPSHOT</version>
+        <version>2.28.20-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>