Skip to content

Commit 0547c4e

Browse files
authored
Replace aws-java-sdk-core dependency (#5347)
* Replace core dependency * Fix build
1 parent 8329c9b commit 0547c4e

File tree

3 files changed

+51
-22
lines changed

3 files changed

+51
-22
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ recipeList:
2525
groupId: software.amazon.awssdk
2626
artifactId: netty-nio-client
2727
version: 2.23.16-SNAPSHOT
28+
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
29+
oldGroupId: com.amazonaws
30+
oldArtifactId: aws-java-sdk-core
31+
newGroupId: software.amazon.awssdk
32+
newArtifactId: aws-core
33+
newVersion: 2.23.16-SNAPSHOT
34+
2835
- org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId:
2936
oldGroupId: com.amazonaws
3037
oldArtifactId: aws-java-sdk-bom

migration-tool/src/main/resources/scripts/generate_upgrade_sdk_dependencies_recipe.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,17 @@ def add_dependencies(f, version):
7171
version: {0}'''
7272
f.write(add_dependencies_str.format(version))
7373

74+
def replace_core_dependencies(f, version):
75+
add_dependencies_str = '''
76+
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
77+
oldGroupId: com.amazonaws
78+
oldArtifactId: aws-java-sdk-core
79+
newGroupId: software.amazon.awssdk
80+
newArtifactId: aws-core
81+
newVersion: {0}
82+
'''
83+
f.write(add_dependencies_str.format(version))
84+
7485
def write_cloudwatch_recipe(f, version):
7586
change_bom = '''
7687
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
@@ -88,6 +99,7 @@ def write_recipe_yml_file(service_mapping):
8899
write_copy_right_header(f)
89100
write_recipe_metadata(f, version)
90101
add_dependencies(f, version)
102+
replace_core_dependencies(f, version)
91103
write_bom_recipe(f, version)
92104
for s in service_mapping:
93105
# edge case : v1 contains modules: cloudwatch AND cloudwatchmetrics, which both map to cloudwatch in v2

migration-tool/src/test/java/software/amazon/awssdk/migration/recipe/UpgradeSdkDependenciesTest.java

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -75,33 +75,43 @@ void standardClient_shouldChangeDependencyGroupIdAndArtifactId() throws IOExcept
7575
+ " <dependencies>\n"
7676
+ " <dependency>\n"
7777
+ " <groupId>com.amazonaws</groupId>\n"
78+
+ " <artifactId>aws-java-sdk-core</artifactId>\n"
79+
+ " <version>1.12.100</version>\n"
80+
+ " </dependency>\n"
81+
+ " <dependency>\n"
82+
+ " <groupId>com.amazonaws</groupId>\n"
7883
+ " <artifactId>aws-java-sdk-sqs</artifactId>\n"
7984
+ " <version>1.12.100</version>\n"
8085
+ " </dependency>\n"
8186
+ " </dependencies>\n"
8287
+ " </project>",
83-
String.format(" <project>\n"
84-
+ " <groupId>com.test.app</groupId>\n"
85-
+ " <artifactId>my-app</artifactId>\n"
86-
+ " <version>1</version>\n"
87-
+ " <dependencies>\n"
88-
+ " <dependency>\n"
89-
+ " <groupId>software.amazon.awssdk</groupId>\n"
90-
+ " <artifactId>sqs</artifactId>\n"
91-
+ " <version>%1$s</version>\n"
92-
+ " </dependency>\n"
93-
+ " <dependency>\n"
94-
+ " <groupId>software.amazon.awssdk</groupId>\n"
95-
+ " <artifactId>apache-client</artifactId>\n"
96-
+ " <version>%1$s</version>\n"
97-
+ " </dependency>\n"
98-
+ " <dependency>\n"
99-
+ " <groupId>software.amazon.awssdk</groupId>\n"
100-
+ " <artifactId>netty-nio-client</artifactId>\n"
101-
+ " <version>%1$s</version>\n"
102-
+ " </dependency>\n"
103-
+ " </dependencies>\n"
104-
+ " </project>", currentVersion)
88+
String.format("<project>\n"
89+
+ " <groupId>com.test.app</groupId>\n"
90+
+ " <artifactId>my-app</artifactId>\n"
91+
+ " <version>1</version>\n"
92+
+ " <dependencies>\n"
93+
+ " <dependency>\n"
94+
+ " <groupId>software.amazon.awssdk</groupId>\n"
95+
+ " <artifactId>aws-core</artifactId>\n"
96+
+ " <version>2.23.16-SNAPSHOT</version>\n"
97+
+ " </dependency>\n"
98+
+ " <dependency>\n"
99+
+ " <groupId>software.amazon.awssdk</groupId>\n"
100+
+ " <artifactId>sqs</artifactId>\n"
101+
+ " <version>2.23.16-SNAPSHOT</version>\n"
102+
+ " </dependency>\n"
103+
+ " <dependency>\n"
104+
+ " <groupId>software.amazon.awssdk</groupId>\n"
105+
+ " <artifactId>apache-client</artifactId>\n"
106+
+ " <version>2.23.16-SNAPSHOT</version>\n"
107+
+ " </dependency>\n"
108+
+ " <dependency>\n"
109+
+ " <groupId>software.amazon.awssdk</groupId>\n"
110+
+ " <artifactId>netty-nio-client</artifactId>\n"
111+
+ " <version>2.23.16-SNAPSHOT</version>\n"
112+
+ " </dependency>\n"
113+
+ " </dependencies>\n"
114+
+ "</project>", currentVersion)
105115

106116
)
107117
);

0 commit comments

Comments
 (0)