Merging main into release

Author: aws-sdk-kotlin-ci

.changes/5a190de6-e9e5-4908-9bf9-62c34cf254f9.json

@@ -0,0 +1,8 @@
+{
+    "id": "5a190de6-e9e5-4908-9bf9-62c34cf254f9",
+    "type": "bugfix",
+    "description": "Bump the **smithy-kotlin** version to pick up a [bugfix for Endpoint Discovery](https://github.com/smithy-lang/smithy-kotlin/pull/1240)",
+    "issues": [
+        "awslabs/aws-sdk-kotlin#1413"
+    ]
+}

.changes/5fa3154d-1f42-4b98-9ad1-ef8ef1ad5fbc.json

@@ -0,0 +1,8 @@
+{
+    "id": "5fa3154d-1f42-4b98-9ad1-ef8ef1ad5fbc",
+    "type": "feature",
+    "description": "Improve the coding style of DynamoDB Mapper auto-generated schemas",
+    "issues": [
+        "https://github.com/awslabs/aws-sdk-kotlin/issues/1521"
+    ]
+}

.github/workflows/update-release-branch.yml

@@ -91,6 +91,10 @@ jobs:
         shell: bash
         run: |
           echo "merging main @ $main_sha into release @ $release_sha";
+          
+          # Getting rid of the Gradle URL config changes caused by "Configure Gradle"
+          git stash -- gradle/wrapper/gradle-wrapper.properties
+          
           git switch release;
           input_message=${{ inputs.commit_message }}
           message=${input_message:-"Merging main into release"}