Skip to content

Commit 55da9ba

Browse files
zoewanggzoewangg
authored
Change package name for migration tool and update dependencies (#5200)
1 parent 7bdb373 commit 55da9ba

File tree

7 files changed

+81
-40
lines changed

7 files changed

+81
-40
lines changed

‎.brazil.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
"dynamodb": { "packageName": "AwsJavaSdk-DynamoDb" },
4545
"waf": { "packageName": "AwsJavaSdk-Waf" },
46-
"migration-tool": { "packageName": "AwsJavaSdk-MigrationTool"},
46+
"migration-tool": { "packageName": "AwsJavaSdk-Tooling-MigrationTool"},
4747

4848
"third-party-jackson-core": {
4949
"packageName": "AwsJavaSdk-ThirdParty-JacksonCore",
@@ -102,7 +102,8 @@
102102
"test-utils": { "skipImport": true },
103103
"tests-coverage-reporting": { "skipImport": true },
104104
"third-party": { "skipImport": true },
105-
"third-party-slf4j-api": { "skipImport": true }
105+
"third-party-slf4j-api": { "skipImport": true },
106+
"migration-tool-tests": {"skipImport": true}
106107
},
107108

108109
"dependencies": {
@@ -141,6 +142,8 @@
141142
"org.junit.jupiter:junit-jupiter": { "packageName": "JUnit5", "packageVersion": "5.x" },
142143
"org.mockito:mockito-core": { "packageName": "Mockito", "packageVersion": "3.x" },
143144
"io.reactivex.rxjava3:rxjava": { "packageName": "RxJava", "packageVersion": "3.x" },
144-
"org.assertj:assertj-core": { "packageName": "AssertJ", "packageVersion": "3.22.x" }
145+
"org.assertj:assertj-core": { "packageName": "AssertJ", "packageVersion": "3.22.x" },
146+
"org.openrewrite:rewrite-java-8": {"packageName": "Maven-org-openrewrite_rewrite-java-8", "packageVersion": "8.x"},
147+
"org.openrewrite:rewrite-java": {"packageName": "Maven-org-openrewrite_rewrite-java", "packageVersion": "8.x"}
145148
}
146149
}

‎buildspecs/release-javadoc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ phases:
1818
commands:
1919
- python ./scripts/doc_crosslinks/generate_cross_link_data.py --apiDefinitionsBasePath ./services/ --apiDefinitionsRelativeFilePath src/main/resources/codegen-resources/service-2.json --templateFilePath ./scripts/doc_crosslinks/crosslink_redirect.html --outputFilePath ./scripts/crosslink_redirect.html
2020
- mvn install -P quick -T1C
21-
- mvn clean install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:s3-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests,!:tests-coverage-reporting,!:sdk-native-image-test,!:ruleset-testing-core,!:old-client-version-compatibility-test,!:migration-tool'
21+
- mvn clean install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:s3-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests,!:tests-coverage-reporting,!:sdk-native-image-test,!:ruleset-testing-core,!:old-client-version-compatibility-test,!:migration-tool,!:migration-tool-tests'
2222
- RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
2323
-
2424
- aws s3 sync target/site/apidocs/ $DOC_PATH/$RELEASE_VERSION/ --acl="public-read"

‎buildspecs/release-to-maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ phases:
3434
awk 'BEGIN { var=ENVIRON["SDK_SIGNING_GPG_KEYNAME"] } { gsub("\\$SDK_SIGNING_GPG_KEYNAME", var, $0); print }' > \
3535
$SETTINGS_XML
3636
37-
mvn clean deploy -B -s $SETTINGS_XML -Ppublishing -DperformRelease -Dspotbugs.skip -DskipTests -Dcheckstyle.skip -Djapicmp.skip -Ddoclint=none -pl !:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:tests-coverage-reporting,!:stability-tests,!:sdk-native-image-test,!:auth-tests,!:s3-benchmarks,!:region-testing,!:old-client-version-compatibility-test -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true
37+
mvn clean deploy -B -s $SETTINGS_XML -Ppublishing -DperformRelease -Dspotbugs.skip -DskipTests -Dcheckstyle.skip -Djapicmp.skip -Ddoclint=none -pl !:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:tests-coverage-reporting,!:stability-tests,!:sdk-native-image-test,!:auth-tests,!:s3-benchmarks,!:region-testing,!:old-client-version-compatibility-test,!:migration-tool-tests -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true
3838
else
3939
echo "This version was already released."
4040
fi

‎migration-tool/pom.xml

Lines changed: 23 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,32 @@
4646
<dependency>
4747
<groupId>org.openrewrite</groupId>
4848
<artifactId>rewrite-java</artifactId>
49-
<scope>compile</scope>
5049
</dependency>
5150
<dependency>
5251
<groupId>org.openrewrite</groupId>
5352
<artifactId>rewrite-java-8</artifactId>
5453
<scope>runtime</scope>
5554
</dependency>
55+
<dependency>
56+
<groupId>software.amazon.awssdk</groupId>
57+
<artifactId>utils</artifactId>
58+
<version>${project.version}</version>
59+
</dependency>
60+
<dependency>
61+
<groupId>software.amazon.awssdk</groupId>
62+
<artifactId>sdk-core</artifactId>
63+
<version>${project.version}</version>
64+
</dependency>
65+
<dependency>
66+
<groupId>software.amazon.awssdk</groupId>
67+
<artifactId>auth</artifactId>
68+
<version>${project.version}</version>
69+
</dependency>
70+
<dependency>
71+
<groupId>software.amazon.awssdk</groupId>
72+
<artifactId>sts</artifactId>
73+
<version>${project.version}</version>
74+
</dependency>
5675

5776
<dependency>
5877
<groupId>com.amazonaws</groupId>
@@ -81,14 +100,8 @@
81100
<dependency>
82101
<groupId>org.openrewrite</groupId>
83102
<artifactId>rewrite-maven</artifactId>
84-
<scope>compile</scope>
85-
</dependency>
86-
87-
<dependency>
88-
<groupId>org.openrewrite.recipe</groupId>
89-
<artifactId>rewrite-migrate-java</artifactId>
103+
<scope>test</scope>
90104
</dependency>
91-
92105
<dependency>
93106
<groupId>org.openrewrite</groupId>
94107
<artifactId>rewrite-test</artifactId>
@@ -112,26 +125,6 @@
112125
<version>${assertj.version}</version>
113126
<scope>test</scope>
114127
</dependency>
115-
<dependency>
116-
<groupId>software.amazon.awssdk</groupId>
117-
<artifactId>utils</artifactId>
118-
<version>${project.version}</version>
119-
</dependency>
120-
<dependency>
121-
<groupId>software.amazon.awssdk</groupId>
122-
<artifactId>sdk-core</artifactId>
123-
<version>${project.version}</version>
124-
</dependency>
125-
<dependency>
126-
<groupId>software.amazon.awssdk</groupId>
127-
<artifactId>auth</artifactId>
128-
<version>${project.version}</version>
129-
</dependency>
130-
<dependency>
131-
<groupId>software.amazon.awssdk</groupId>
132-
<artifactId>sts</artifactId>
133-
<version>${project.version}</version>
134-
</dependency>
135128
<!-- Used in UpgradeSdkDependenciesTest -->
136129
<dependency>
137130
<groupId>software.amazon.awssdk</groupId>
@@ -145,11 +138,6 @@
145138
</exclusion>
146139
</exclusions>
147140
</dependency>
148-
<dependency>
149-
<groupId>software.amazon.awssdk</groupId>
150-
<artifactId>utils</artifactId>
151-
<version>${awsjavasdk.version}</version>
152-
</dependency>
153141
</dependencies>
154142

155143
<build>
@@ -158,7 +146,8 @@
158146
<groupId>org.apache.maven.plugins</groupId>
159147
<artifactId>maven-dependency-plugin</artifactId>
160148
<configuration>
161-
<skip>true</skip>
149+
<failOnWarning>false</failOnWarning>
150+
<ignoreNonCompile>false</ignoreNonCompile>
162151
</configuration>
163152
</plugin>
164153
<plugin>

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,12 @@ recipeList:
185185
newGroupId: software.amazon.awssdk
186186
newArtifactId: servicecatalog
187187
newVersion: 2.23.16-SNAPSHOT
188+
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
189+
oldGroupId: com.amazonaws
190+
oldArtifactId: aws-java-sdk-timestreaminfluxdb
191+
newGroupId: software.amazon.awssdk
192+
newArtifactId: timestreaminfluxdb
193+
newVersion: 2.23.16-SNAPSHOT
188194
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
189195
oldGroupId: com.amazonaws
190196
oldArtifactId: aws-java-sdk-lakeformation
@@ -587,6 +593,12 @@ recipeList:
587593
newGroupId: software.amazon.awssdk
588594
newArtifactId: paymentcryptography
589595
newVersion: 2.23.16-SNAPSHOT
596+
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
597+
oldGroupId: com.amazonaws
598+
oldArtifactId: aws-java-sdk-chatbot
599+
newGroupId: software.amazon.awssdk
600+
newArtifactId: chatbot
601+
newVersion: 2.23.16-SNAPSHOT
590602
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
591603
oldGroupId: com.amazonaws
592604
oldArtifactId: aws-java-sdk-fms
@@ -725,6 +737,12 @@ recipeList:
725737
newGroupId: software.amazon.awssdk
726738
newArtifactId: iotfleetwise
727739
newVersion: 2.23.16-SNAPSHOT
740+
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
741+
oldGroupId: com.amazonaws
742+
oldArtifactId: aws-java-sdk-route53profiles
743+
newGroupId: software.amazon.awssdk
744+
newArtifactId: route53profiles
745+
newVersion: 2.23.16-SNAPSHOT
728746
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
729747
oldGroupId: com.amazonaws
730748
oldArtifactId: aws-java-sdk-bcmdataexports
@@ -833,6 +851,12 @@ recipeList:
833851
newGroupId: software.amazon.awssdk
834852
newArtifactId: transfer
835853
newVersion: 2.23.16-SNAPSHOT
854+
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
855+
oldGroupId: com.amazonaws
856+
oldArtifactId: aws-java-sdk-deadline
857+
newGroupId: software.amazon.awssdk
858+
newArtifactId: deadline
859+
newVersion: 2.23.16-SNAPSHOT
836860
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
837861
oldGroupId: com.amazonaws
838862
oldArtifactId: aws-java-sdk-braket
@@ -1691,6 +1715,12 @@ recipeList:
16911715
newGroupId: software.amazon.awssdk
16921716
newArtifactId: internetmonitor
16931717
newVersion: 2.23.16-SNAPSHOT
1718+
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
1719+
oldGroupId: com.amazonaws
1720+
oldArtifactId: aws-java-sdk-artifact
1721+
newGroupId: software.amazon.awssdk
1722+
newArtifactId: artifact
1723+
newVersion: 2.23.16-SNAPSHOT
16941724
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
16951725
oldGroupId: com.amazonaws
16961726
oldArtifactId: aws-java-sdk-iotsitewise
@@ -1901,6 +1931,12 @@ recipeList:
19011931
newGroupId: software.amazon.awssdk
19021932
newArtifactId: appconfigdata
19031933
newVersion: 2.23.16-SNAPSHOT
1934+
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
1935+
oldGroupId: com.amazonaws
1936+
oldArtifactId: aws-java-sdk-controlcatalog
1937+
newGroupId: software.amazon.awssdk
1938+
newArtifactId: controlcatalog
1939+
newVersion: 2.23.16-SNAPSHOT
19041940
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
19051941
oldGroupId: com.amazonaws
19061942
oldArtifactId: aws-java-sdk-greengrass
@@ -2153,6 +2189,12 @@ recipeList:
21532189
newGroupId: software.amazon.awssdk
21542190
newArtifactId: ram
21552191
newVersion: 2.23.16-SNAPSHOT
2192+
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
2193+
oldGroupId: com.amazonaws
2194+
oldArtifactId: aws-java-sdk-codeconnections
2195+
newGroupId: software.amazon.awssdk
2196+
newArtifactId: codeconnections
2197+
newVersion: 2.23.16-SNAPSHOT
21562198
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
21572199
oldGroupId: com.amazonaws
21582200
oldArtifactId: aws-java-sdk-efs

‎test/migration-tool-tests/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
<artifactId>aws-java-sdk-s3</artifactId>
5454
<scope>test</scope>
5555
</dependency>
56+
<dependency>
57+
<groupId>software.amazon.awssdk</groupId>
58+
<artifactId>s3</artifactId>
59+
<version>${project.version}</version>
60+
<scope>test</scope>
61+
</dependency>
5662
<dependency>
5763
<groupId>software.amazon.awssdk</groupId>
5864
<artifactId>migration-tool</artifactId>

‎test/migration-tool-tests/src/test/resources/run-test

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ def run_test(version):
3232
is_same = compare_directory(filecmp.dircmp(TARGET_DIR, AFTER_DIR))
3333
if not is_same:
3434
raise Exception("The transformed directory('target/generated-test-sources/project') does not match with the expected one('src/test/resources/after')")
35-
result = subprocess.run(["mvn", "package"], cwd=TARGET_DIR, check=True, stdout = subprocess.DEVNULL)
35+
result = subprocess.run(["mvn", "package"], cwd=TARGET_DIR, capture_output=True, check=True)
36+
print(result)
3637

3738
def compare_directory(dcmp):
3839
if dcmp.diff_files or dcmp.left_only or dcmp.right_only:

0 commit comments

Comments
 (0)