Skip to content

Commit 9a3fb24

Browse files
authored
Align package dependencies to iceberg and revert iceberg back to 1.4.3 (#276)
Align package dependencies to iceberg - Align Iceberg spark runtime - Align AWS and GCP dependencies - And Jackson dependency
1 parent 71fc531 commit 9a3fb24

File tree

2 files changed

+25
-11
lines changed

2 files changed

+25
-11
lines changed

debezium-server-iceberg-sink/pom.xml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<!-- Iceberg -->
5151
<dependency>
5252
<groupId>org.apache.iceberg</groupId>
53-
<artifactId>iceberg-spark-runtime-3.3_2.13</artifactId>
53+
<artifactId>iceberg-spark-runtime-${version.spark.major}_${version.spark.scala}</artifactId>
5454
<version>${version.iceberg}</version>
5555
</dependency>
5656
<dependency>
@@ -87,22 +87,20 @@
8787
<dependency>
8888
<groupId>com.google.cloud</groupId>
8989
<artifactId>google-cloud-storage</artifactId>
90-
<version>2.22.1</version>
9190
</dependency>
9291
<dependency>
9392
<groupId>com.google.cloud</groupId>
9493
<artifactId>google-cloud-nio</artifactId>
95-
<version>0.127.7</version>
9694
</dependency>
9795
<dependency>
9896
<groupId>com.google.cloud.bigdataoss</groupId>
9997
<artifactId>gcs-connector</artifactId>
100-
<version>hadoop3-2.2.8</version>
98+
<version>hadoop3-${version.googlebigdataoss}</version>
10199
</dependency>
102100
<dependency>
103101
<groupId>com.google.cloud.bigdataoss</groupId>
104102
<artifactId>gcsio</artifactId>
105-
<version>2.2.16</version>
103+
<version>${version.googlebigdataoss}</version>
106104
</dependency>
107105
<!-- AWS -->
108106
<dependency>
@@ -146,6 +144,7 @@
146144
</exclusion>
147145
</exclusions>
148146
</dependency>
147+
<!-- aws-java-sdk-bundle Test dependency -->
149148
<dependency>
150149
<groupId>com.amazonaws</groupId>
151150
<artifactId>aws-java-sdk-bundle</artifactId>
@@ -203,7 +202,7 @@
203202
</dependency>
204203
<dependency>
205204
<groupId>org.apache.spark</groupId>
206-
<artifactId>spark-core_2.13</artifactId>
205+
<artifactId>spark-core_${version.spark.scala}</artifactId>
207206
<version>${version.spark}</version>
208207
<scope>test</scope>
209208
<exclusions>
@@ -227,7 +226,7 @@
227226
</dependency>
228227
<dependency>
229228
<groupId>org.apache.spark</groupId>
230-
<artifactId>spark-sql_2.13</artifactId>
229+
<artifactId>spark-sql_${version.spark.scala}</artifactId>
231230
<version>${version.spark}</version>
232231
<scope>test</scope>
233232
</dependency>

pom.xml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,19 @@
3131
<version.assembly.plugin>3.6.0</version.assembly.plugin>
3232
<!-- Use same version as iceberg https://github.com/apache/iceberg/blob/main/gradle/libs.versions.toml#L53-->
3333
<version.jackson>2.14.2</version.jackson>
34-
<version.iceberg>1.5.0</version.iceberg>
35-
<version.spark>3.3.4</version.spark>
34+
<version.iceberg>1.4.2</version.iceberg>
35+
<!-- Following two properties defines which version of iceberg-spark-runtime is used -->
36+
<!-- Example https://mvnrepository.com/artifact/org.apache.iceberg/iceberg-spark-runtime-3.4_2.13/1.4.3 -->
37+
<version.spark.major>3.5</version.spark.major>
38+
<version.spark.scala>2.13</version.spark.scala>
39+
<version.spark>${version.spark.major}.1</version.spark>
3640
<version.hadoop>3.3.6</version.hadoop>
3741
<version.hive>3.1.3</version.hive>
38-
<version.awssdk>2.22.9</version.awssdk>
42+
<!-- Use same version as iceberg https://github.com/apache/iceberg/blob/main/gradle/libs.versions.toml#L31-->
43+
<version.awssdk>2.24.5</version.awssdk>
44+
<!-- Use same version as iceberg https://github.com/apache/iceberg/blob/main/gradle/libs.versions.toml#L44-->
45+
<version.googlelibraries>26.28.0</version.googlelibraries>
46+
<version.googlebigdataoss>2.2.20</version.googlebigdataoss>
3947
<version.testcontainers>1.19.3</version.testcontainers>
4048
<!-- Debezium -->
4149
<version.debezium>2.5.2.Final</version.debezium>
@@ -81,7 +89,14 @@
8189
<type>pom</type>
8290
<scope>import</scope>
8391
</dependency>
84-
92+
<!-- gcp -->
93+
<dependency>
94+
<groupId>com.google.cloud</groupId>
95+
<artifactId>libraries-bom</artifactId>
96+
<version>${version.googlelibraries}</version>
97+
<type>pom</type>
98+
<scope>import</scope>
99+
</dependency>
85100
<!-- MySQL JDBC Driver, Binlog reader, Geometry support -->
86101
<dependency>
87102
<groupId>mysql</groupId>

0 commit comments

Comments
 (0)