Skip to content

Commit 7bdb373

Browse files
authored
Add package mapping for the new module and exclude it from javadoc exe… (#5197)
* Add brazil mapping for the new module and exclude it from javadoc execution * Fix test
1 parent 1b5f27e commit 7bdb373

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

.brazil.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343

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

4748
"third-party-jackson-core": {
4849
"packageName": "AwsJavaSdk-ThirdParty-JacksonCore",

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'
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'
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"

migration-tool/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,18 @@
179179
</execution>
180180
</executions>
181181
</plugin>
182+
<plugin>
183+
<groupId>org.apache.maven.plugins</groupId>
184+
<artifactId>maven-jar-plugin</artifactId>
185+
<configuration>
186+
<archive>
187+
<manifestEntries>
188+
<!-- TODO: is this really needed since we don't expect users to use our recipe classes directly ? -->
189+
<Automatic-Module-Name>software.amazon.awssdk.migration</Automatic-Module-Name>
190+
</manifestEntries>
191+
</archive>
192+
</configuration>
193+
</plugin>
182194
</plugins>
183195
</build>
184196
</project>

test/migration-tool-tests/src/test/resources/after/src/main/java/foo/bar/SdkClientsDependencyFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515

1616
package foo.bar;
1717

18+
import java.time.Duration;
1819
import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
1920
import software.amazon.awssdk.core.retry.RetryMode;
2021
import software.amazon.awssdk.regions.Region;
2122
import software.amazon.awssdk.services.sqs.SqsClient;
2223
import software.amazon.awssdk.services.sqs.SqsAsyncClient;
23-
24-
import java.time.Duration;
2524
import software.amazon.awssdk.services.sqs.SqsClient;
2625

2726
public final class SdkClientsDependencyFactory {

0 commit comments

Comments
 (0)