Merge remote-tracking branch 'origin/main' into release

Author: aajtodd

.github/workflows/continuous-integration.yml

@@ -72,7 +72,9 @@ jobs:
         # windows job runs out of memory with the defaults normally used
         shell: bash
         run: |
-          sed -i 's/org\.gradle\.jvmargs=.*$/org.gradle.jvmargs=-Xmx5g/' gradle.properties
+          systeminfo
+          sed -i 's/org\.gradle\.jvmargs=.*$/org.gradle.jvmargs=-Xmx4g/' gradle.properties
+          echo "org.gradle.parallel=false" >> gradle.properties
           cat gradle.properties
       - name: Build and Test ${{ env.PACKAGE_NAME }}
         run: |

aws-runtime/aws-config/build.gradle.kts

@@ -77,7 +77,7 @@ codegen {
         // generate an sts client
         create("sts-credentials-provider") {
             imports = listOf(
-                awsModelFile("sts.2011-06-15.json")
+                awsModelFile("sts.json")
             )
 
             smithyKotlinPlugin {
@@ -111,7 +111,7 @@ codegen {
         // generate an sso client
         create("sso-credentials-provider") {
             imports = listOf(
-                awsModelFile("sso.2019-06-10.json")
+                awsModelFile("sso.json")
             )
 
             val serviceShape = "com.amazonaws.sso#SWBPortalService"