From 434585a83d8e5ccd3d4a06306bccfdef5b8f61ac Mon Sep 17 00:00:00 2001
From: Zoe Wang <33073555+zoewangg@users.noreply.github.com>
Date: Tue, 7 May 2024 09:50:20 -0700
Subject: [PATCH 1/2] Fix bundle shading

---
 .../bugfix-AWSSDKforJavav2Bundle-7dd8ce2.json |   6 +
 bundle-sdk/pom.xml                            | 116 +++++++++++++++++-
 2 files changed, 121 insertions(+), 1 deletion(-)
 create mode 100644 .changes/next-release/bugfix-AWSSDKforJavav2Bundle-7dd8ce2.json

diff --git a/.changes/next-release/bugfix-AWSSDKforJavav2Bundle-7dd8ce2.json b/.changes/next-release/bugfix-AWSSDKforJavav2Bundle-7dd8ce2.json
new file mode 100644
index 000000000000..e0f5c7f0e3b7
--- /dev/null
+++ b/.changes/next-release/bugfix-AWSSDKforJavav2Bundle-7dd8ce2.json
@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "AWS SDK for Java v2 Bundle",
+    "contributor": "",
+    "description": "Fix unshaded classes in the AWS SDK for Java v2 bundle. See [#5108](https://github.com/aws/aws-sdk-java-v2/issues/5108)"
+}
diff --git a/bundle-sdk/pom.xml b/bundle-sdk/pom.xml
index 7daebe9f1fe6..df8d5881e1e6 100644
--- a/bundle-sdk/pom.xml
+++ b/bundle-sdk/pom.xml
@@ -60,6 +60,105 @@
             <groupId>software.amazon.s3.accessgrants</groupId>
             <artifactId>aws-s3-accessgrants-java-plugin</artifactId>
             <version>${s3accessgrants.version}</version>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>http-auth-spi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>identity-spi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>s3control</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>s3</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>iam</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>sts</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>cloudwatch-metric-publisher</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.eventstream</groupId>
+                    <artifactId>eventstream</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-codec-http</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-codec-http2</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-codec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-transport</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-common</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-buffer</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-handler</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-transport-classes-epoll</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-resolver</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-resolver-dns</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcomponents-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.reactivestreams</groupId>
+                    <artifactId>reactive-streams</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
@@ -82,8 +181,11 @@
                                 <include>software.amazon.awssdk:*</include>
                                 <include>software.amazon:*</include>
                                 <include>software.amazon.s3.accessgrants:*</include>
-                                <inlcude>com.github.ben-manes.caffeine:*</inlcude>
+                                <inlcude>com.github.ben-manes.caffeine:caffeine</inlcude>
+                                <inlcude>com.google.errorprone:error_prone_annotations</inlcude>
+                                <inlcude>org.checkerframework:checker-qual</inlcude>
                                 <include>commons-logging:*</include>
+                                <include>software.amazon.eventstream:eventstream</include>
                             </includes>
                         </artifactSet>
                         <relocations>
@@ -102,6 +204,18 @@
                                 <pattern>org.slf4j</pattern>
                                 <shadedPattern>software.amazon.awssdk.thirdparty.org.slf4j</shadedPattern>
                             </relocation>
+                            <relocation>
+                                <pattern>com.github.benmanes.caffeine</pattern>
+                                <shadedPattern>software.amazon.awssdk.thirdparty.com.github.benmanes.caffeine</shadedPattern>
+                            </relocation>
+                            <relocation>
+                                <pattern>org.checkerframework</pattern>
+                                <shadedPattern>software.amazon.awssdk.thirdparty.org.checkerframework</shadedPattern>
+                            </relocation>
+                            <relocation>
+                                <pattern>com.google.errorprone</pattern>
+                                <shadedPattern>software.amazon.awssdk.thirdparty.com.google.errorprone</shadedPattern>
+                            </relocation>
                         </relocations>
                         <shadedArtifactAttached>false</shadedArtifactAttached>
                         <createDependencyReducedPom>true</createDependencyReducedPom>

From 000c613c309612a34c690e9b46a3b8afec3b5ab6 Mon Sep 17 00:00:00 2001
From: Zoe Wang <33073555+zoewangg@users.noreply.github.com>
Date: Tue, 7 May 2024 11:10:33 -0700
Subject: [PATCH 2/2] Fix typo

---
 bundle-sdk/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundle-sdk/pom.xml b/bundle-sdk/pom.xml
index df8d5881e1e6..9a10d7eb8e29 100644
--- a/bundle-sdk/pom.xml
+++ b/bundle-sdk/pom.xml
@@ -181,8 +181,8 @@
                                 <include>software.amazon.awssdk:*</include>
                                 <include>software.amazon:*</include>
                                 <include>software.amazon.s3.accessgrants:*</include>
-                                <inlcude>com.github.ben-manes.caffeine:caffeine</inlcude>
-                                <inlcude>com.google.errorprone:error_prone_annotations</inlcude>
+                                <include>com.github.ben-manes.caffeine:caffeine</include>
+                                <include>com.google.errorprone:error_prone_annotations</include>
                                 <inlcude>org.checkerframework:checker-qual</inlcude>
                                 <include>commons-logging:*</include>
                                 <include>software.amazon.eventstream:eventstream</include>