From 7bdb3733bec0315c3850c7ca1d99b02ef6a99718 Mon Sep 17 00:00:00 2001
From: Zoe Wang <33073555+zoewangg@users.noreply.github.com>
Date: Tue, 7 May 2024 15:40:22 -0700
Subject: [PATCH] =?UTF-8?q?Add=20package=20mapping=20for=20the=20new=20mod?=
 =?UTF-8?q?ule=20and=20exclude=20it=20from=20javadoc=20exe=E2=80=A6=20(#51?=
 =?UTF-8?q?97)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add brazil mapping for the new module and exclude it from javadoc execution

* Fix test
---
 .brazil.json                                         |  1 +
 buildspecs/release-javadoc.yml                       |  2 +-
 migration-tool/pom.xml                               | 12 ++++++++++++
 .../java/foo/bar/SdkClientsDependencyFactory.java    |  3 +--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.brazil.json b/.brazil.json
index 9d9a3f897c06..312866640713 100644
--- a/.brazil.json
+++ b/.brazil.json
@@ -43,6 +43,7 @@
 
         "dynamodb": { "packageName": "AwsJavaSdk-DynamoDb" },
         "waf": { "packageName": "AwsJavaSdk-Waf" },
+        "migration-tool": { "packageName":  "AwsJavaSdk-MigrationTool"},
 
         "third-party-jackson-core": {
             "packageName": "AwsJavaSdk-ThirdParty-JacksonCore",
diff --git a/buildspecs/release-javadoc.yml b/buildspecs/release-javadoc.yml
index a5dc4b3157d4..ae3f82d3f8c4 100644
--- a/buildspecs/release-javadoc.yml
+++ b/buildspecs/release-javadoc.yml
@@ -18,7 +18,7 @@ phases:
     commands:
     - 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
     - mvn install -P quick -T1C
-    - 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'
+    - 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'
     - RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
     -
     - aws s3 sync target/site/apidocs/ $DOC_PATH/$RELEASE_VERSION/ --acl="public-read"
diff --git a/migration-tool/pom.xml b/migration-tool/pom.xml
index 454727701bf6..2e738f3469fd 100644
--- a/migration-tool/pom.xml
+++ b/migration-tool/pom.xml
@@ -179,6 +179,18 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+<!--                            TODO: is this really needed since we don't expect users to use our recipe classes directly ? -->
+                            <Automatic-Module-Name>software.amazon.awssdk.migration</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/test/migration-tool-tests/src/test/resources/after/src/main/java/foo/bar/SdkClientsDependencyFactory.java b/test/migration-tool-tests/src/test/resources/after/src/main/java/foo/bar/SdkClientsDependencyFactory.java
index a2ee34a898f5..0f5f44b6d158 100644
--- a/test/migration-tool-tests/src/test/resources/after/src/main/java/foo/bar/SdkClientsDependencyFactory.java
+++ b/test/migration-tool-tests/src/test/resources/after/src/main/java/foo/bar/SdkClientsDependencyFactory.java
@@ -15,13 +15,12 @@
 
 package foo.bar;
 
+import java.time.Duration;
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
 import software.amazon.awssdk.core.retry.RetryMode;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.sqs.SqsClient;
 import software.amazon.awssdk.services.sqs.SqsAsyncClient;
-
-import java.time.Duration;
 import software.amazon.awssdk.services.sqs.SqsClient;
 
 public final class SdkClientsDependencyFactory {