Skip to content

Commit 1408690

Browse files
authored
Merge pull request #3143 from aws/zoewang/revertV2MigrationTool
Revert v2 migration tool
2 parents dd8b7e5 + 5e71a50 commit 1408690

File tree

91 files changed

+3
-11982
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+3
-11982
lines changed

.brazil.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646

4747
"dynamodb": { "packageName": "AwsJavaSdk-DynamoDb" },
4848
"waf": { "packageName": "AwsJavaSdk-Waf" },
49-
"v2-migration": { "packageName": "AwsJavaSdk-Tooling-V2Migration"},
5049

5150
"third-party-jackson-core": {
5251
"packageName": "AwsJavaSdk-ThirdParty-JacksonCore",
@@ -106,7 +105,6 @@
106105
"tests-coverage-reporting": { "skipImport": true },
107106
"third-party": { "skipImport": true },
108107
"third-party-slf4j-api": { "skipImport": true },
109-
"v2-migration-tests": {"skipImport": true},
110108
"crt-unavailable-tests": { "skipImport": true },
111109
"bundle-shading-tests": { "skipImport": true }
112110
},
@@ -147,9 +145,6 @@
147145
"org.junit.jupiter:junit-jupiter": { "packageName": "JUnit5", "packageVersion": "5.x" },
148146
"org.mockito:mockito-core": { "packageName": "Mockito", "packageVersion": "3.x" },
149147
"io.reactivex.rxjava3:rxjava": { "packageName": "RxJava", "packageVersion": "3.x" },
150-
"org.assertj:assertj-core": { "packageName": "AssertJ", "packageVersion": "3.22.x" },
151-
"org.openrewrite:rewrite-java-8": {"packageName": "Maven-org-openrewrite_rewrite-java-8", "packageVersion": "8.x"},
152-
"org.openrewrite:rewrite-java": {"packageName": "Maven-org-openrewrite_rewrite-java", "packageVersion": "8.x"},
153-
"org.openrewrite.recipe:rewrite-java-dependencies": {"packageName": "Maven-org-openrewrite-recipe_rewrite-java-dependencies", "packageVersion": "1.x"}
148+
"org.assertj:assertj-core": { "packageName": "AssertJ", "packageVersion": "3.22.x" }
154149
}
155150
}

.changes/2.27.0.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@
88
"contributor": "",
99
"description": "Introducing AWS Glue Data Quality anomaly detection, a new functionality that uses ML-based solutions to detect data anomalies users have not explicitly defined rules for."
1010
},
11-
{
12-
"type": "feature",
13-
"category": "AWS SDK for Java v2 Migration Tool",
14-
"contributor": "",
15-
"description": "Introduce the preview release of the AWS SDK for Java v2 migration tool that automatically migrates applications from the AWS SDK for Java v1 to the AWS SDK for Java v2."
16-
},
1711
{
1812
"type": "feature",
1913
"category": "Amazon AppIntegrations Service",

CHANGELOG.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
- ### Features
55
- Introducing AWS Glue Data Quality anomaly detection, a new functionality that uses ML-based solutions to detect data anomalies users have not explicitly defined rules for.
66

7-
## __AWS SDK for Java v2 Migration Tool__
8-
- ### Features
9-
- Introduce the preview release of the AWS SDK for Java v2 migration tool that automatically migrates applications from the AWS SDK for Java v1 to the AWS SDK for Java v2.
10-
117
## __Amazon AppIntegrations Service__
128
- ### Features
139
- Updated CreateDataIntegration and CreateDataIntegrationAssociation API to support bulk data export from Amazon Connect Customer Profiles to the customer S3 bucket.

build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -163,15 +163,6 @@
163163
</Not>
164164
</Match>
165165

166-
<!-- Skip the warning since this source is forked from openrewrite -->
167-
<Match>
168-
<Or>
169-
<Class name="software.amazon.awssdk.v2migration.ChangeSdkType"/>
170-
<Class name="software.amazon.awssdk.v2migration.ChangeSdkType$ChangeTypeVisitor"/>
171-
</Or>
172-
<Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
173-
</Match>
174-
175166
<Match>
176167
<Class name="software.amazon.awssdk.core.internal.waiters.ResponseOrException"/>
177168
<Bug pattern="NM_CLASS_NOT_EXCEPTION"/>
@@ -309,10 +300,4 @@
309300
</Or>
310301
<Bug pattern="SA_FIELD_SELF_ASSIGNMENT"/>
311302
</Match>
312-
313-
<!-- False positive -->
314-
<Match>
315-
<Class name="software.amazon.awssdk.v2migration.EnumCasingToV2$Visitor"/>
316-
<Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
317-
</Match>
318303
</FindBugsFilter>

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,!:crt-unavailable-tests,!:bundle-shading-tests,!:v2-migration,!:v2-migration-tests'
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,!:crt-unavailable-tests,!:bundle-shading-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
@@ -37,7 +37,7 @@ phases:
3737
awk 'BEGIN { var=ENVIRON["SDK_SIGNING_GPG_KEYNAME"] } { gsub("\\$SDK_SIGNING_GPG_KEYNAME", var, $0); print }' > \
3838
$SETTINGS_XML
3939
40-
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,!:crt-unavailable-tests,!:bundle-shading-tests,!:v2-migration-tests -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true
40+
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,!:crt-unavailable-tests,!:bundle-shading-tests -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true
4141
else
4242
echo "This version was already released."
4343
fi

pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
<module>codegen-lite-maven-plugin</module>
7272
<module>archetypes</module>
7373
<module>third-party</module>
74-
<module>v2-migration</module>
7574
<module>test/http-client-tests</module>
7675
<module>test/protocol-tests</module>
7776
<module>test/protocol-tests-core</module>
@@ -89,7 +88,6 @@
8988
<module>test/ruleset-testing-core</module>
9089
<module>test/old-client-version-compatibility-test</module>
9190
<module>test/bundle-logging-bridge-binding-test</module>
92-
<module>test/v2-migration-tests</module>
9391
<module>test/bundle-shading-tests</module>
9492
<module>test/crt-unavailable-tests</module>
9593
</modules>

test/v2-migration-tests/README.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

test/v2-migration-tests/pom.xml

Lines changed: 0 additions & 111 deletions
This file was deleted.

test/v2-migration-tests/src/test/resources/gradle/after/build.gradle

Lines changed: 0 additions & 33 deletions
This file was deleted.

test/v2-migration-tests/src/test/resources/gradle/after/src/main/java/gradletest/foo/bar/Library.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

test/v2-migration-tests/src/test/resources/gradle/before/build.gradle

Lines changed: 0 additions & 33 deletions
This file was deleted.

test/v2-migration-tests/src/test/resources/gradle/before/gradle/wrapper/gradle-wrapper.properties

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)