From 2507722ee1cb2269df292d41ba98464d6900989e Mon Sep 17 00:00:00 2001
From: Shiva Kumar Mukkapati <mshvkmr@amazon.com>
Date: Thu, 1 Feb 2024 19:14:06 -0500
Subject: [PATCH 1/7] including S3 Access Grants Plugin as part of Java SDK
 Bundle

---
 aws-sdk-java/pom.xml | 6 ++++++
 bundle-sdk/pom.xml   | 2 ++
 pom.xml              | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/aws-sdk-java/pom.xml b/aws-sdk-java/pom.xml
index ea562dec7d7a..092e292d3ffe 100644
--- a/aws-sdk-java/pom.xml
+++ b/aws-sdk-java/pom.xml
@@ -728,6 +728,11 @@ Amazon AutoScaling, etc).</description>
             <artifactId>s3control</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.s3.accessgrants</groupId>
+            <artifactId>aws-s3-accessgrants-java-plugin</artifactId>
+            <version>${s3accessgrants.version}</version>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>s3-transfer-manager</artifactId>
@@ -1923,6 +1928,7 @@ Amazon AutoScaling, etc).</description>
                 <configuration>
                     <ignoredUnusedDeclaredDependencies>
                         <ignoredUnusedDeclaredDependency>software.amazon.awssdk:*</ignoredUnusedDeclaredDependency>
+                        <ignoredUnusedDeclaredDependency>software.amazon.s3.accessgrants:*</ignoredUnusedDeclaredDependency>
                     </ignoredUnusedDeclaredDependencies>
                 </configuration>
             </plugin>
diff --git a/bundle-sdk/pom.xml b/bundle-sdk/pom.xml
index 6d3cb33f46b5..7eec4ec89441 100644
--- a/bundle-sdk/pom.xml
+++ b/bundle-sdk/pom.xml
@@ -76,6 +76,8 @@
                                 <include>commons-codec:commons-codec</include>
                                 <include>software.amazon.awssdk:*</include>
                                 <include>software.amazon:*</include>
+                                <include>software.amazon.s3.accessgrants:*</include>
+                                <include>com.github.benmanes.caffeine:*</include>
                                 <include>commons-logging:*</include>
                             </includes>
                         </artifactSet>
diff --git a/pom.xml b/pom.xml
index 2bcc54a152df..e496beaafa23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,6 +177,9 @@
         <!-- Reactive Streams version -->
         <reactive-streams.version>1.0.4</reactive-streams.version>
 
+        <!-- S3 Access Grants plugin version -->
+        <s3accessgrants.version>2.0.0</s3accessgrants.version>
+
         <skip.unit.tests>${skipTests}</skip.unit.tests>
         <integTestSourceDirectory>${project.basedir}/src/it/java</integTestSourceDirectory>
         <javadoc.resourcesDir>${session.executionRootDirectory}</javadoc.resourcesDir>

From 005a914f8f6b27e0d6a433ca852a920d8aa5f137 Mon Sep 17 00:00:00 2001
From: Shiva Kumar Mukkapati <mshvkmr@amazon.com>
Date: Thu, 1 Feb 2024 19:28:48 -0500
Subject: [PATCH 2/7] removing changes in bundle-sdk to include access grants
 plugin dependency

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

diff --git a/bundle-sdk/pom.xml b/bundle-sdk/pom.xml
index 7eec4ec89441..6d3cb33f46b5 100644
--- a/bundle-sdk/pom.xml
+++ b/bundle-sdk/pom.xml
@@ -76,8 +76,6 @@
                                 <include>commons-codec:commons-codec</include>
                                 <include>software.amazon.awssdk:*</include>
                                 <include>software.amazon:*</include>
-                                <include>software.amazon.s3.accessgrants:*</include>
-                                <include>com.github.benmanes.caffeine:*</include>
                                 <include>commons-logging:*</include>
                             </includes>
                         </artifactSet>

From c78976eb3c706e3b129c991bf16bd883449b3eaa Mon Sep 17 00:00:00 2001
From: Shiva Kumar Mukkapati <mshvkmr@amazon.com>
Date: Fri, 2 Feb 2024 13:19:50 -0500
Subject: [PATCH 3/7] adding access grants plugin to the include set of
 bundle-sdk

---
 bundle-sdk/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundle-sdk/pom.xml b/bundle-sdk/pom.xml
index 6d3cb33f46b5..2c29703dd583 100644
--- a/bundle-sdk/pom.xml
+++ b/bundle-sdk/pom.xml
@@ -76,6 +76,7 @@
                                 <include>commons-codec:commons-codec</include>
                                 <include>software.amazon.awssdk:*</include>
                                 <include>software.amazon:*</include>
+                                <include>software.amazon.s3.accessgrants:*</include>
                                 <include>commons-logging:*</include>
                             </includes>
                         </artifactSet>

From 18cce4c584e695c2aa869acb1a8e7d7a6ba302a4 Mon Sep 17 00:00:00 2001
From: Shiva Kumar Mukkapati <mshvkmr@amazon.com>
Date: Fri, 2 Feb 2024 17:28:50 -0500
Subject: [PATCH 4/7] refactoring the access grants plugin inclusion + adding
 caffeine to the shaded jar

---
 aws-sdk-java/pom.xml |  6 ------
 bundle-sdk/pom.xml   | 16 ++++++++++++++++
 pom.xml              |  3 +++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/aws-sdk-java/pom.xml b/aws-sdk-java/pom.xml
index 092e292d3ffe..ea562dec7d7a 100644
--- a/aws-sdk-java/pom.xml
+++ b/aws-sdk-java/pom.xml
@@ -728,11 +728,6 @@ Amazon AutoScaling, etc).</description>
             <artifactId>s3control</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
-        <dependency>
-            <groupId>software.amazon.s3.accessgrants</groupId>
-            <artifactId>aws-s3-accessgrants-java-plugin</artifactId>
-            <version>${s3accessgrants.version}</version>
-        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>s3-transfer-manager</artifactId>
@@ -1928,7 +1923,6 @@ Amazon AutoScaling, etc).</description>
                 <configuration>
                     <ignoredUnusedDeclaredDependencies>
                         <ignoredUnusedDeclaredDependency>software.amazon.awssdk:*</ignoredUnusedDeclaredDependency>
-                        <ignoredUnusedDeclaredDependency>software.amazon.s3.accessgrants:*</ignoredUnusedDeclaredDependency>
                     </ignoredUnusedDeclaredDependencies>
                 </configuration>
             </plugin>
diff --git a/bundle-sdk/pom.xml b/bundle-sdk/pom.xml
index 2c29703dd583..7120ddd184b0 100644
--- a/bundle-sdk/pom.xml
+++ b/bundle-sdk/pom.xml
@@ -56,6 +56,11 @@
             <version>${awsjavasdk.version}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.s3.accessgrants</groupId>
+            <artifactId>aws-s3-accessgrants-java-plugin</artifactId>
+            <version>${s3accessgrants.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -77,6 +82,7 @@
                                 <include>software.amazon.awssdk:*</include>
                                 <include>software.amazon:*</include>
                                 <include>software.amazon.s3.accessgrants:*</include>
+                                <inlcude>com.github.ben-manes.caffeine:*</inlcude>
                                 <include>commons-logging:*</include>
                             </includes>
                         </artifactSet>
@@ -114,6 +120,12 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+            </plugin>
+        </plugins>
     </build>
     
     <profiles>
@@ -144,6 +156,10 @@
                             <failOnError>false</failOnError>
                         </configuration>
                     </plugin>
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <groupId>org.apache.maven.plugins</groupId>
+                    </plugin>
                 </plugins>
             </build>
         </profile>
diff --git a/pom.xml b/pom.xml
index e496beaafa23..37813ec8a1a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -537,6 +537,9 @@
                              old interfaces, but that should become a test scoped dependency in modules where needed.
                              And the line below removed. -->
                         <ignoredUnusedDeclaredDependency>software.amazon.awssdk:auth</ignoredUnusedDeclaredDependency>
+
+            <!-- Ignoring any unsued delcared dependency warnings across the bundle -->
+                        <ignoredUnusedDeclaredDependency>software.amazon.s3.accessgrants:*</ignoredUnusedDeclaredDependency>
                     </ignoredUnusedDeclaredDependencies>
                 </configuration>
             </plugin>

From d2134b0968356a30246c01db0f01612dbe855bcf Mon Sep 17 00:00:00 2001
From: Shiva Kumar Mukkapati <mshvkmr@amazon.com>
Date: Fri, 2 Feb 2024 17:50:46 -0500
Subject: [PATCH 5/7] removing unwanted dependency plugin  added in bundle-sdk

---
 bundle-sdk/pom.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/bundle-sdk/pom.xml b/bundle-sdk/pom.xml
index 7120ddd184b0..33764aa6c72d 100644
--- a/bundle-sdk/pom.xml
+++ b/bundle-sdk/pom.xml
@@ -120,12 +120,7 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <groupId>org.apache.maven.plugins</groupId>
-            </plugin>
-        </plugins>
+
     </build>
     
     <profiles>
@@ -156,10 +151,6 @@
                             <failOnError>false</failOnError>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <groupId>org.apache.maven.plugins</groupId>
-                    </plugin>
                 </plugins>
             </build>
         </profile>

From a5591ec7c522a21e187e323557e3587bce1bc237 Mon Sep 17 00:00:00 2001
From: Shiva Kumar Mukkapati <mshvkmr@amazon.com>
Date: Mon, 5 Feb 2024 15:08:45 -0500
Subject: [PATCH 6/7] bumping up S3 access grants plugin version

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

diff --git a/pom.xml b/pom.xml
index 37813ec8a1a8..00b0b5585db4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,7 +178,7 @@
         <reactive-streams.version>1.0.4</reactive-streams.version>
 
         <!-- S3 Access Grants plugin version -->
-        <s3accessgrants.version>2.0.0</s3accessgrants.version>
+        <s3accessgrants.version>2.0.1</s3accessgrants.version>
 
         <skip.unit.tests>${skipTests}</skip.unit.tests>
         <integTestSourceDirectory>${project.basedir}/src/it/java</integTestSourceDirectory>
@@ -538,7 +538,7 @@
                              And the line below removed. -->
                         <ignoredUnusedDeclaredDependency>software.amazon.awssdk:auth</ignoredUnusedDeclaredDependency>
 
-            <!-- Ignoring any unsued delcared dependency warnings across the bundle -->
+            <!-- Ignoring any unused declared dependency warnings for access grants plugin across the bundle -->
                         <ignoredUnusedDeclaredDependency>software.amazon.s3.accessgrants:*</ignoredUnusedDeclaredDependency>
                     </ignoredUnusedDeclaredDependencies>
                 </configuration>

From 5119619713a917c6cc86acfb343ccdf86978bad4 Mon Sep 17 00:00:00 2001
From: Shiva Kumar Mukkapati <mshvkmr@amazon.com>
Date: Mon, 5 Feb 2024 15:20:40 -0500
Subject: [PATCH 7/7] fixing indentation

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 00b0b5585db4..bcd31139636b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -538,7 +538,7 @@
                              And the line below removed. -->
                         <ignoredUnusedDeclaredDependency>software.amazon.awssdk:auth</ignoredUnusedDeclaredDependency>
 
-            <!-- Ignoring any unused declared dependency warnings for access grants plugin across the bundle -->
+                        <!-- Ignoring any unused declared dependency warnings for access grants plugin across the bundle -->
                         <ignoredUnusedDeclaredDependency>software.amazon.s3.accessgrants:*</ignoredUnusedDeclaredDependency>
                     </ignoredUnusedDeclaredDependencies>
                 </configuration>