Merge pull request #2998 from aws/staging/4bd7b673-ee98-422b-9e79-4e8cf939ada6

Pull request: release <- staging/4bd7b673-ee98-422b-9e79-4e8cf939ada6

Author: aws-sdk-java-automation

.changes/2.25.40.json

@@ -0,0 +1,54 @@
+{
+    "version": "2.25.40",
+    "date": "2024-04-26",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS CodePipeline",
+            "contributor": "",
+            "description": "Add ability to manually and automatically roll back a pipeline stage to a previously successful execution."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Marketplace Entitlement Service",
+            "contributor": "",
+            "description": "Releasing minor endpoint updates."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Support",
+            "contributor": "",
+            "description": "Releasing minor endpoint updates."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Cognito Identity Provider",
+            "contributor": "",
+            "description": "Add LimitExceededException to SignUp errors"
+        },
+        {
+            "type": "feature",
+            "category": "AmazonConnectCampaignService",
+            "contributor": "",
+            "description": "This release adds support for specifying if Answering Machine should wait for prompt sound."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Relational Database Service",
+            "contributor": "",
+            "description": "SupportsLimitlessDatabase field added to describe-db-engine-versions to indicate whether the DB engine version supports Aurora Limitless Database."
+        },
+        {
+            "type": "feature",
+            "category": "CloudWatch Observability Access Manager",
+            "contributor": "",
+            "description": "This release introduces support for Source Accounts to define which Metrics and Logs to share with the Monitoring Account"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}

.github/dependabot.yml

@@ -14,6 +14,12 @@ updates:
         patterns:
           - "com.fasterxml.jackson*"
     ignore:
+      # We don't want to update from 1.x.x unless necessary because it will
+      # require extra verification to ensure customers aren't broken by the
+      # update.
+      - dependency-name: "org.slf4j:*"
+        update-types: ["version-update:semver-major"]
+
       # Ignore test dependencies to reduce PR noisiness. We don't need to stay
       # on top of them as much as compile/runtime dependencies
       - dependency-name: "com.amazonaws:aws-java-sdk*"
@@ -46,3 +52,5 @@ updates:
       - dependency-name: "org.codehaus.mojo:exec-maven-plugin"
       - dependency-name: "org.apache.maven.plugin-tools:maven-plugin-annotations"
       - dependency-name: "org.graalvm.buildtools:*"
+      - dependency-name: "org.jacoco:jacoco-maven-plugin"
+      - dependency-name: "org.apache.commons:commons-lang3"

CHANGELOG.md

@@ -1,4 +1,37 @@
  #### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
+# __2.25.40__ __2024-04-26__
+## __AWS CodePipeline__
+  - ### Features
+    - Add ability to manually and automatically roll back a pipeline stage to a previously successful execution.
+
+## __AWS Marketplace Entitlement Service__
+  - ### Features
+    - Releasing minor endpoint updates.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated endpoint and partition metadata.
+
+## __AWS Support__
+  - ### Features
+    - Releasing minor endpoint updates.
+
+## __Amazon Cognito Identity Provider__
+  - ### Features
+    - Add LimitExceededException to SignUp errors
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - SupportsLimitlessDatabase field added to describe-db-engine-versions to indicate whether the DB engine version supports Aurora Limitless Database.
+
+## __AmazonConnectCampaignService__
+  - ### Features
+    - This release adds support for specifying if Answering Machine should wait for prompt sound.
+
+## __CloudWatch Observability Access Manager__
+  - ### Features
+    - This release introduces support for Source Accounts to define which Metrics and Logs to share with the Monitoring Account
+
 # __2.25.39__ __2024-04-25__
 ## __AWS AppSync__
   - ### Features

README.md

@@ -52,7 +52,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.25.39</version>
+      <version>2.25.40</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -86,12 +86,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.25.39</version>
+  <version>2.25.40</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.25.39</version>
+  <version>2.25.40</version>
 </dependency>
 ```
 
@@ -103,7 +103,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.25.39</version>
+  <version>2.25.40</version>
 </dependency>
 ```
 

archetypes/archetype-app-quickstart/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.25.39</version>
+        <version>2.25.40</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

archetypes/archetype-lambda/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.25.39</version>
+        <version>2.25.40</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetype-lambda</artifactId>

archetypes/archetype-tools/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.25.39</version>
+        <version>2.25.40</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

archetypes/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.25.39</version>
+        <version>2.25.40</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetypes</artifactId>

aws-sdk-java/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.39</version>
+        <version>2.25.40</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

bom-internal/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.25.39</version>
+        <version>2.25.40</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bom/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.39</version>
+        <version>2.25.40</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>

bundle-logging-bridge/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.39</version>
+        <version>2.25.40</version>
     </parent>
     <artifactId>bundle-logging-bridge</artifactId>
     <packaging>jar</packaging>

bundle-sdk/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.39</version>
+        <version>2.25.40</version>
     </parent>
     <artifactId>bundle-sdk</artifactId>
     <packaging>jar</packaging>

bundle/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.39</version>
+        <version>2.25.40</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

codegen-lite-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.39</version>
+        <version>2.25.40</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>

codegen-lite/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.39</version>
+        <version>2.25.40</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>

codegen-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.39</version>
+        <version>2.25.40</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>

codegen/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.25.39</version>
+        <version>2.25.40</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/PaginatorsClassSpec.java

@@ -169,7 +169,7 @@ protected MemberModel memberModelForResponseMember(String input) {
     protected CodeBlock hasNextPageMethodBody() {
         if (paginatorDefinition.getMoreResults() != null) {
             return CodeBlock.builder()
-                    .add("return $N.$L.booleanValue()",
+                    .add("return $1N.$2L != null && $1N.$2L.booleanValue()",
                                  PREVIOUS_PAGE_METHOD_ARGUMENT,
                                  fluentGetterMethodForResponseMember(paginatorDefinition.getMoreResults()))
                     .build();

codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/customizations/SameTokenAsyncResponseClassSpec.java

@@ -76,7 +76,7 @@ protected TypeSpec.Builder nextPageFetcherClass() {
     protected CodeBlock hasNextPageMethodBody() {
         if (paginatorDefinition.getMoreResults() != null) {
             return CodeBlock.builder()
-                            .add("return $N.$L.booleanValue()",
+                            .add("return $1N.$2L != null && $1N.$2L.booleanValue()",
                                  PREVIOUS_PAGE_METHOD_ARGUMENT,
                                  fluentGetterMethodForResponseMember(paginatorDefinition.getMoreResults()))
                             .build();

codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/customizations/SameTokenSyncResponseClassSpec.java

@@ -74,7 +74,7 @@ protected TypeSpec.Builder nextPageFetcherClass() {
     protected CodeBlock hasNextPageMethodBody() {
         if (paginatorDefinition.getMoreResults() != null) {
             return CodeBlock.builder()
-                            .add("return $N.$L.booleanValue()",
+                            .add("return $1N.$2L != null && $1N.$2L.booleanValue()",
                                  PREVIOUS_PAGE_METHOD_ARGUMENT,
                                  fluentGetterMethodForResponseMember(paginatorDefinition.getMoreResults()))
                             .build();