From 4a56cd9682f4c23b1a5c37414ee0649551b43c05 Mon Sep 17 00:00:00 2001
From: Ismail Simsek <ismail.simsek@ppro.com>
Date: Wed, 30 Jun 2021 22:20:19 +0200
Subject: [PATCH 1/3] remove hadoop-aws from distribution

---
 .run/package.run.xml                 | 63 +++++++++++++---------------
 debezium-server-iceberg-sink/pom.xml |  1 +
 2 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/.run/package.run.xml b/.run/package.run.xml
index 18cd36ab..1076393e 100644
--- a/.run/package.run.xml
+++ b/.run/package.run.xml
@@ -1,37 +1,30 @@
-<!--
-  ~ /*
-  ~  * Copyright memiiso Authors.
-  ~  *
-  ~  * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
-  ~  */
-  -->
-
 <component name="ProjectRunConfigurationManager">
-    <configuration default="false" name="package" type="MavenRunConfiguration" factoryName="Maven" singleton="false">
-        <MavenSettings>
-            <option name="myGeneralSettings"/>
-            <option name="myRunnerSettings"/>
-            <option name="myRunnerParameters">
-                <MavenRunnerParameters>
-                    <option name="profiles">
-                        <set/>
-                    </option>
-                    <option name="goals">
-                        <list>
-                            <option value="package"/>
-                            <option value="-Passembly"/>
-                            <option value="-Dmaven.test.skip=true"/>
-                        </list>
-                    </option>
-                    <option name="pomFileName"/>
-                    <option name="profilesMap">
-                        <map/>
-                    </option>
-                    <option name="resolveToWorkspace" value="false"/>
-                    <option name="workingDirPath" value="$PROJECT_DIR$"/>
-                </MavenRunnerParameters>
-            </option>
-        </MavenSettings>
-        <method v="2"/>
-    </configuration>
+  <configuration default="false" name="package" type="MavenRunConfiguration" factoryName="Maven" singleton="false">
+    <MavenSettings>
+      <option name="myGeneralSettings" />
+      <option name="myRunnerSettings" />
+      <option name="myRunnerParameters">
+        <MavenRunnerParameters>
+          <option name="profiles">
+            <set />
+          </option>
+          <option name="goals">
+            <list>
+              <option value="clean" />
+              <option value="package" />
+              <option value="-Passembly" />
+              <option value="-Dmaven.test.skip=true" />
+            </list>
+          </option>
+          <option name="pomFileName" />
+          <option name="profilesMap">
+            <map />
+          </option>
+          <option name="resolveToWorkspace" value="false" />
+          <option name="workingDirPath" value="$PROJECT_DIR$" />
+        </MavenRunnerParameters>
+      </option>
+    </MavenSettings>
+    <method v="2" />
+  </configuration>
 </component>
\ No newline at end of file
diff --git a/debezium-server-iceberg-sink/pom.xml b/debezium-server-iceberg-sink/pom.xml
index 2fa5e0ae..6f6cc941 100644
--- a/debezium-server-iceberg-sink/pom.xml
+++ b/debezium-server-iceberg-sink/pom.xml
@@ -112,6 +112,7 @@
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-aws</artifactId>
             <version>${version.hadoop}</version>
+            <scope>test</scope>
         </dependency>
 
         <!-- Testing -->

From 109519007730c9b58f2f4cffd4023e82e136b121 Mon Sep 17 00:00:00 2001
From: Ismail Simsek <ismail.simsek@ppro.com>
Date: Wed, 30 Jun 2021 22:35:00 +0200
Subject: [PATCH 2/3] replace awssdk bundle with individual sdk dependencies

---
 debezium-server-iceberg-sink/pom.xml | 23 ++++++++++++++++++++++-
 pom.xml                              |  2 +-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/debezium-server-iceberg-sink/pom.xml b/debezium-server-iceberg-sink/pom.xml
index 6f6cc941..b4225dce 100644
--- a/debezium-server-iceberg-sink/pom.xml
+++ b/debezium-server-iceberg-sink/pom.xml
@@ -71,9 +71,30 @@
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
-            <artifactId>bundle</artifactId>
+            <artifactId>glue</artifactId>
             <version>${version.awssdk}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3</artifactId>
+            <version>${version.awssdk}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>dynamodb</artifactId>
+            <version>${version.awssdk}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>kms</artifactId>
+            <version>${version.awssdk}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>sts</artifactId>
+            <version>${version.awssdk}</version>
+        </dependency>
+
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>url-connection-client</artifactId>
diff --git a/pom.xml b/pom.xml
index 44f5e44c..d4cf39c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
         <version.iceberg>0.11.1</version.iceberg>
         <version.spark>3.0.2</version.spark>
         <version.hadoop>3.3.0</version.hadoop>
-        <version.awssdk>2.16.34</version.awssdk>
+        <version.awssdk>2.16.88</version.awssdk>
         <version.parquet>1.11.1</version.parquet>
         <!-- Debezium -->
         <version.debezium>1.6.0.Final</version.debezium>

From fd13eaf2321f0a7591fd349a49726ea2c19e85ca Mon Sep 17 00:00:00 2001
From: Ismail Simsek <ismail.simsek@ppro.com>
Date: Wed, 30 Jun 2021 22:36:50 +0200
Subject: [PATCH 3/3] replace awssdk bundle with individual sdk dependencies

---
 debezium-server-iceberg-sink/pom.xml | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/debezium-server-iceberg-sink/pom.xml b/debezium-server-iceberg-sink/pom.xml
index b4225dce..d84881c8 100644
--- a/debezium-server-iceberg-sink/pom.xml
+++ b/debezium-server-iceberg-sink/pom.xml
@@ -44,26 +44,6 @@
         </dependency>
 
         <!-- Iceberg  -->
-        <!--        <dependency>-->
-        <!--            <groupId>org.apache.iceberg</groupId>-->
-        <!--            <artifactId>iceberg-api</artifactId>-->
-        <!--            <version>${version.iceberg}</version>-->
-        <!--        </dependency>-->
-        <!--        <dependency>-->
-        <!--            <groupId>org.apache.iceberg</groupId>-->
-        <!--            <artifactId>iceberg-core</artifactId>-->
-        <!--            <version>${version.iceberg}</version>-->
-        <!--        </dependency>-->
-        <!--        <dependency>-->
-        <!--            <groupId>org.apache.iceberg</groupId>-->
-        <!--            <artifactId>iceberg-parquet</artifactId>-->
-        <!--            <version>${version.iceberg}</version>-->
-        <!--        </dependency>-->
-        <!--        <dependency>-->
-        <!--            <groupId>org.apache.iceberg</groupId>-->
-        <!--            <artifactId>iceberg-aws</artifactId>-->
-        <!--            <version>${version.iceberg}</version>-->
-        <!--        </dependency>-->
         <dependency>
             <groupId>org.apache.iceberg</groupId>
             <artifactId>iceberg-spark3-runtime</artifactId>
@@ -165,12 +145,6 @@
             <version>${version.spark}</version>
             <scope>test</scope>
         </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>org.apache.iceberg</groupId>-->
-        <!--            <artifactId>iceberg-spark3-runtime</artifactId>-->
-        <!--            <version>0.11.0</version>-->
-        <!--            <scope>test</scope>-->
-        <!--        </dependency>-->
 
         <dependency>
             <groupId>io.quarkus</groupId>