Fix conflict

Author: zoewangg

migration-tool/src/main/resources/META-INF/rewrite/upgrade-sdk-dependencies.yml

@@ -193,12 +193,6 @@ recipeList:
       newGroupId: software.amazon.awssdk
       newArtifactId: servicecatalog
       newVersion: 2.23.16-SNAPSHOT
-  - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
-      oldGroupId: com.amazonaws
-      oldArtifactId: aws-java-sdk-timestreaminfluxdb
-      newGroupId: software.amazon.awssdk
-      newArtifactId: timestreaminfluxdb
-      newVersion: 2.23.16-SNAPSHOT
   - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
       oldGroupId: com.amazonaws
       oldArtifactId: aws-java-sdk-lakeformation
@@ -601,12 +595,6 @@ recipeList:
       newGroupId: software.amazon.awssdk
       newArtifactId: paymentcryptography
       newVersion: 2.23.16-SNAPSHOT
-  - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
-      oldGroupId: com.amazonaws
-      oldArtifactId: aws-java-sdk-chatbot
-      newGroupId: software.amazon.awssdk
-      newArtifactId: chatbot
-      newVersion: 2.23.16-SNAPSHOT
   - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
       oldGroupId: com.amazonaws
       oldArtifactId: aws-java-sdk-fms
@@ -745,12 +733,6 @@ recipeList:
       newGroupId: software.amazon.awssdk
       newArtifactId: iotfleetwise
       newVersion: 2.23.16-SNAPSHOT
-  - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
-      oldGroupId: com.amazonaws
-      oldArtifactId: aws-java-sdk-route53profiles
-      newGroupId: software.amazon.awssdk
-      newArtifactId: route53profiles
-      newVersion: 2.23.16-SNAPSHOT
   - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
       oldGroupId: com.amazonaws
       oldArtifactId: aws-java-sdk-bcmdataexports
@@ -859,12 +841,6 @@ recipeList:
       newGroupId: software.amazon.awssdk
       newArtifactId: transfer
       newVersion: 2.23.16-SNAPSHOT
-  - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
-      oldGroupId: com.amazonaws
-      oldArtifactId: aws-java-sdk-deadline
-      newGroupId: software.amazon.awssdk
-      newArtifactId: deadline
-      newVersion: 2.23.16-SNAPSHOT
   - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
       oldGroupId: com.amazonaws
       oldArtifactId: aws-java-sdk-braket
@@ -1723,12 +1699,6 @@ recipeList:
       newGroupId: software.amazon.awssdk
       newArtifactId: internetmonitor
       newVersion: 2.23.16-SNAPSHOT
-  - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
-      oldGroupId: com.amazonaws
-      oldArtifactId: aws-java-sdk-artifact
-      newGroupId: software.amazon.awssdk
-      newArtifactId: artifact
-      newVersion: 2.23.16-SNAPSHOT
   - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
       oldGroupId: com.amazonaws
       oldArtifactId: aws-java-sdk-iotsitewise
@@ -1939,12 +1909,6 @@ recipeList:
       newGroupId: software.amazon.awssdk
       newArtifactId: appconfigdata
       newVersion: 2.23.16-SNAPSHOT
-  - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
-      oldGroupId: com.amazonaws
-      oldArtifactId: aws-java-sdk-controlcatalog
-      newGroupId: software.amazon.awssdk
-      newArtifactId: controlcatalog
-      newVersion: 2.23.16-SNAPSHOT
   - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
       oldGroupId: com.amazonaws
       oldArtifactId: aws-java-sdk-greengrass
@@ -2197,12 +2161,6 @@ recipeList:
       newGroupId: software.amazon.awssdk
       newArtifactId: ram
       newVersion: 2.23.16-SNAPSHOT
-  - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
-      oldGroupId: com.amazonaws
-      oldArtifactId: aws-java-sdk-codeconnections
-      newGroupId: software.amazon.awssdk
-      newArtifactId: codeconnections
-      newVersion: 2.23.16-SNAPSHOT
   - org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
       oldGroupId: com.amazonaws
       oldArtifactId: aws-java-sdk-efs