From 25955e39896453fee80cab61d4e4381929bc47b0 Mon Sep 17 00:00:00 2001
From: ismail simsek <6005685+ismailsimsek@users.noreply.github.com>
Date: Fri, 1 Mar 2024 13:19:45 +0100
Subject: [PATCH 01/14] Align package dependencies to iceberg

Align package dependencies to iceberg

- Align Iceberg spark runtime
- Align AWS and GCP dependencies
- And Jackson dependency
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e39426ff..df1dddea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
         <!-- Use same version as iceberg https://github.com/apache/iceberg/blob/main/gradle/libs.versions.toml#L53-->
         <version.jackson>2.14.2</version.jackson>
         <version.iceberg>1.5.0</version.iceberg>
-        <version.spark>3.3.4</version.spark>
+        <version.spark>3.4.2</version.spark>
         <version.hadoop>3.3.6</version.hadoop>
         <version.hive>3.1.3</version.hive>
         <version.awssdk>2.22.9</version.awssdk>

From d196c3ec8861c64eddfa2c2eebfe04969dff5647 Mon Sep 17 00:00:00 2001
From: ismail simsek <6005685+ismailsimsek@users.noreply.github.com>
Date: Fri, 1 Mar 2024 13:23:07 +0100
Subject: [PATCH 02/14] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index df1dddea..5e72103c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,8 @@
         <version.spark>3.4.2</version.spark>
         <version.hadoop>3.3.6</version.hadoop>
         <version.hive>3.1.3</version.hive>
-        <version.awssdk>2.22.9</version.awssdk>
+        <!-- Use same version as iceberg https://github.com/apache/iceberg/blob/main/gradle/libs.versions.toml#L31-->  
+        <version.awssdk>2.24.5</version.awssdk>
         <version.testcontainers>1.19.3</version.testcontainers>
         <!-- Debezium -->
         <version.debezium>2.5.2.Final</version.debezium>

From 71811a1a5a463f32b8bbb4c82d2e23cde7ad0670 Mon Sep 17 00:00:00 2001
From: ismail simsek <6005685+ismailsimsek@users.noreply.github.com>
Date: Fri, 1 Mar 2024 13:27:03 +0100
Subject: [PATCH 03/14] Update pom.xml

---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5e72103c..9a8757d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,9 @@
         <!-- Use same version as iceberg https://github.com/apache/iceberg/blob/main/gradle/libs.versions.toml#L53-->
         <version.jackson>2.14.2</version.jackson>
         <version.iceberg>1.5.0</version.iceberg>
-        <version.spark>3.4.2</version.spark>
+        <version.spark.major>3.4</version.spark.major>
+        <version.spark.scala>2.13</version.spark.scala>
+        <version.spark>${version.spark.major}.2</version.spark>
         <version.hadoop>3.3.6</version.hadoop>
         <version.hive>3.1.3</version.hive>
         <!-- Use same version as iceberg https://github.com/apache/iceberg/blob/main/gradle/libs.versions.toml#L31-->  

From 652cb80af51462c145c8c55c54abe3b1131745b5 Mon Sep 17 00:00:00 2001
From: ismail simsek <6005685+ismailsimsek@users.noreply.github.com>
Date: Fri, 1 Mar 2024 13:27:44 +0100
Subject: [PATCH 04/14] Update pom.xml

---
 debezium-server-iceberg-sink/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debezium-server-iceberg-sink/pom.xml b/debezium-server-iceberg-sink/pom.xml
index 8186d738..e32a4f92 100644
--- a/debezium-server-iceberg-sink/pom.xml
+++ b/debezium-server-iceberg-sink/pom.xml
@@ -50,7 +50,7 @@
         <!-- Iceberg  -->
         <dependency>
             <groupId>org.apache.iceberg</groupId>
-            <artifactId>iceberg-spark-runtime-3.3_2.13</artifactId>
+            <artifactId>iceberg-spark-runtime-${version.spark.major}_${version.spark.scala}</artifactId>
             <version>${version.iceberg}</version>
         </dependency>
         <dependency>

From ef05282c8aa3ca6abb16cc28db2fe5dc914bf706 Mon Sep 17 00:00:00 2001
From: ismail simsek <6005685+ismailsimsek@users.noreply.github.com>
Date: Fri, 1 Mar 2024 13:31:19 +0100
Subject: [PATCH 05/14] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index 9a8757d0..3b6da584 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,8 @@
         <!-- Use same version as iceberg https://github.com/apache/iceberg/blob/main/gradle/libs.versions.toml#L53-->
         <version.jackson>2.14.2</version.jackson>
         <version.iceberg>1.5.0</version.iceberg>
+        <!-- Following two properties defines which version of iceberg-spark-runtime is used -->
+        <!-- Example https://mvnrepository.com/artifact/org.apache.iceberg/iceberg-spark-runtime-3.4_2.13/1.4.3 -->
         <version.spark.major>3.4</version.spark.major>
         <version.spark.scala>2.13</version.spark.scala>
         <version.spark>${version.spark.major}.2</version.spark>

From 57d40f56b99a05330eaca68c30dda5cc4aa64793 Mon Sep 17 00:00:00 2001
From: ismail simsek <6005685+ismailsimsek@users.noreply.github.com>
Date: Fri, 1 Mar 2024 16:24:09 +0100
Subject: [PATCH 06/14] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index 3b6da584..d4e7ff87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
         <version.assembly.plugin>3.6.0</version.assembly.plugin>
         <!-- Use same version as iceberg https://github.com/apache/iceberg/blob/main/gradle/libs.versions.toml#L53-->
         <version.jackson>2.14.2</version.jackson>
-        <version.iceberg>1.5.0</version.iceberg>
+        <version.iceberg>1.4.2</version.iceberg>
         <!-- Following two properties defines which version of iceberg-spark-runtime is used -->
         <!-- Example https://mvnrepository.com/artifact/org.apache.iceberg/iceberg-spark-runtime-3.4_2.13/1.4.3 -->
         <version.spark.major>3.4</version.spark.major>

From 1fbb029a046172553afb27ccfada502a45157301 Mon Sep 17 00:00:00 2001
From: ismail simsek <6005685+ismailsimsek@users.noreply.github.com>
Date: Fri, 1 Mar 2024 16:29:38 +0100
Subject: [PATCH 07/14] Update pom.xml

---
 pom.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d4e7ff87..dbd05520 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,8 @@
         <version.hive>3.1.3</version.hive>
         <!-- Use same version as iceberg https://github.com/apache/iceberg/blob/main/gradle/libs.versions.toml#L31-->  
         <version.awssdk>2.24.5</version.awssdk>
+        <!-- Use same version as iceberg https://github.com/apache/iceberg/blob/main/gradle/libs.versions.toml#L44-->  
+        <version.googlelibraries>26.28.0</version.googlelibraries>
         <version.testcontainers>1.19.3</version.testcontainers>
         <!-- Debezium -->
         <version.debezium>2.5.2.Final</version.debezium>
@@ -86,7 +88,14 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-
+            <!-- gcp -->
+            <dependency>
+                <groupId>com.google.cloud</groupId>
+                <artifactId>libraries-bom</artifactId>
+                <version>${version.googlelibraries}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <!-- MySQL JDBC Driver, Binlog reader, Geometry support -->
             <dependency>
                 <groupId>mysql</groupId>

From 2200d43b11edf4757bd8b306267a5df277548439 Mon Sep 17 00:00:00 2001
From: ismail simsek <6005685+ismailsimsek@users.noreply.github.com>
Date: Fri, 1 Mar 2024 16:57:02 +0100
Subject: [PATCH 08/14] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index dbd05520..21607242 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
         <version.iceberg>1.4.2</version.iceberg>
         <!-- Following two properties defines which version of iceberg-spark-runtime is used -->
         <!-- Example https://mvnrepository.com/artifact/org.apache.iceberg/iceberg-spark-runtime-3.4_2.13/1.4.3 -->
-        <version.spark.major>3.4</version.spark.major>
+        <version.spark.major>3.5</version.spark.major>
         <version.spark.scala>2.13</version.spark.scala>
         <version.spark>${version.spark.major}.2</version.spark>
         <version.hadoop>3.3.6</version.hadoop>

From 306b1c785dab227dc33525e6b978c15a701671e3 Mon Sep 17 00:00:00 2001
From: ismail simsek <6005685+ismailsimsek@users.noreply.github.com>
Date: Fri, 1 Mar 2024 16:58:15 +0100
Subject: [PATCH 09/14] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index 21607242..4a919fb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
         <!-- Example https://mvnrepository.com/artifact/org.apache.iceberg/iceberg-spark-runtime-3.4_2.13/1.4.3 -->
         <version.spark.major>3.5</version.spark.major>
         <version.spark.scala>2.13</version.spark.scala>
-        <version.spark>${version.spark.major}.2</version.spark>
+        <version.spark>${version.spark.major}.1</version.spark>
         <version.hadoop>3.3.6</version.hadoop>
         <version.hive>3.1.3</version.hive>
         <!-- Use same version as iceberg https://github.com/apache/iceberg/blob/main/gradle/libs.versions.toml#L31-->  

From 77234b6a374cc129c3aa133e0d543054479d9248 Mon Sep 17 00:00:00 2001
From: ismail simsek <6005685+ismailsimsek@users.noreply.github.com>
Date: Fri, 1 Mar 2024 17:01:20 +0100
Subject: [PATCH 10/14] Update pom.xml

---
 debezium-server-iceberg-sink/pom.xml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/debezium-server-iceberg-sink/pom.xml b/debezium-server-iceberg-sink/pom.xml
index e32a4f92..ef1d89dd 100644
--- a/debezium-server-iceberg-sink/pom.xml
+++ b/debezium-server-iceberg-sink/pom.xml
@@ -87,22 +87,18 @@
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-storage</artifactId>
-            <version>2.22.1</version>
         </dependency>
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-nio</artifactId>
-            <version>0.127.7</version>
         </dependency>
         <dependency>
             <groupId>com.google.cloud.bigdataoss</groupId>
             <artifactId>gcs-connector</artifactId>
-            <version>hadoop3-2.2.8</version>
         </dependency>
         <dependency>
             <groupId>com.google.cloud.bigdataoss</groupId>
             <artifactId>gcsio</artifactId>
-            <version>2.2.16</version>
         </dependency>
         <!-- AWS  -->
         <dependency>
@@ -146,12 +142,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-bundle</artifactId>
-            <version>1.11.1026</version>
-            <scope>test</scope>
-        </dependency>
         <!-- Hadoop -->
         <dependency>
             <groupId>org.apache.hadoop</groupId>
@@ -203,7 +193,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
-            <artifactId>spark-core_2.13</artifactId>
+            <artifactId>spark-core_${version.spark.scala}</artifactId>
             <version>${version.spark}</version>
             <scope>test</scope>
             <exclusions>
@@ -227,7 +217,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
-            <artifactId>spark-sql_2.13</artifactId>
+            <artifactId>spark-sql_${version.spark.scala}</artifactId>
             <version>${version.spark}</version>
             <scope>test</scope>
         </dependency>

From 5bcb012f1997145a8d7b0545dd664cc381fdacc4 Mon Sep 17 00:00:00 2001
From: ismail simsek <6005685+ismailsimsek@users.noreply.github.com>
Date: Fri, 1 Mar 2024 17:07:32 +0100
Subject: [PATCH 11/14] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index 4a919fb3..2872dc8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
         <version.awssdk>2.24.5</version.awssdk>
         <!-- Use same version as iceberg https://github.com/apache/iceberg/blob/main/gradle/libs.versions.toml#L44-->  
         <version.googlelibraries>26.28.0</version.googlelibraries>
+        <version.googlebigdataoss>2.2.20</version.googlebigdataoss>
         <version.testcontainers>1.19.3</version.testcontainers>
         <!-- Debezium -->
         <version.debezium>2.5.2.Final</version.debezium>

From 2e102bde5da68f741135869591adf5ddc92daef6 Mon Sep 17 00:00:00 2001
From: ismail simsek <6005685+ismailsimsek@users.noreply.github.com>
Date: Fri, 1 Mar 2024 17:07:58 +0100
Subject: [PATCH 12/14] Update pom.xml

---
 debezium-server-iceberg-sink/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debezium-server-iceberg-sink/pom.xml b/debezium-server-iceberg-sink/pom.xml
index ef1d89dd..1262e335 100644
--- a/debezium-server-iceberg-sink/pom.xml
+++ b/debezium-server-iceberg-sink/pom.xml
@@ -95,10 +95,12 @@
         <dependency>
             <groupId>com.google.cloud.bigdataoss</groupId>
             <artifactId>gcs-connector</artifactId>
+            <version>${version.googlebigdataoss}</version>
         </dependency>
         <dependency>
             <groupId>com.google.cloud.bigdataoss</groupId>
             <artifactId>gcsio</artifactId>
+            <version>${version.googlebigdataoss}</version>
         </dependency>
         <!-- AWS  -->
         <dependency>

From 653cd27cf21483a0b88175bf118220368fd8264f Mon Sep 17 00:00:00 2001
From: ismail simsek <6005685+ismailsimsek@users.noreply.github.com>
Date: Fri, 1 Mar 2024 17:09:15 +0100
Subject: [PATCH 13/14] Update pom.xml

---
 debezium-server-iceberg-sink/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debezium-server-iceberg-sink/pom.xml b/debezium-server-iceberg-sink/pom.xml
index 1262e335..70148426 100644
--- a/debezium-server-iceberg-sink/pom.xml
+++ b/debezium-server-iceberg-sink/pom.xml
@@ -95,7 +95,7 @@
         <dependency>
             <groupId>com.google.cloud.bigdataoss</groupId>
             <artifactId>gcs-connector</artifactId>
-            <version>${version.googlebigdataoss}</version>
+            <version>hadoop3-${version.googlebigdataoss}</version>
         </dependency>
         <dependency>
             <groupId>com.google.cloud.bigdataoss</groupId>

From 26e2b5a25bafeb92c79d27ab3bcfe37170aabd3d Mon Sep 17 00:00:00 2001
From: ismail simsek <6005685+ismailsimsek@users.noreply.github.com>
Date: Fri, 1 Mar 2024 17:12:53 +0100
Subject: [PATCH 14/14] Update pom.xml

---
 debezium-server-iceberg-sink/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debezium-server-iceberg-sink/pom.xml b/debezium-server-iceberg-sink/pom.xml
index 70148426..f5cef798 100644
--- a/debezium-server-iceberg-sink/pom.xml
+++ b/debezium-server-iceberg-sink/pom.xml
@@ -144,6 +144,13 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- aws-java-sdk-bundle Test dependency -->
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-bundle</artifactId>
+            <version>1.11.1026</version>
+            <scope>test</scope>
+        </dependency>
         <!-- Hadoop -->
         <dependency>
             <groupId>org.apache.hadoop</groupId>