From dd97f009a5fea5deba323a5fbc1f3286f09e266a Mon Sep 17 00:00:00 2001
From: Dylan <chenzl25@mail2.sysu.edu.cn>
Date: Thu, 11 Jul 2024 15:30:25 +0800
Subject: [PATCH 1/2] fix(iceberg): add hive-exec jar (#17642)

---
 java/connector-node/risingwave-connector-test/pom.xml | 5 -----
 java/connector-node/risingwave-sink-iceberg/pom.xml   | 4 ++++
 java/pom.xml                                          | 5 +++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/java/connector-node/risingwave-connector-test/pom.xml b/java/connector-node/risingwave-connector-test/pom.xml
index d3d47b0bc457..432a16ec1f34 100644
--- a/java/connector-node/risingwave-connector-test/pom.xml
+++ b/java/connector-node/risingwave-connector-test/pom.xml
@@ -28,11 +28,6 @@
             <artifactId>risingwave-sink-deltalake</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.risingwave</groupId>
-            <artifactId>risingwave-sink-iceberg</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.risingwave</groupId>
             <artifactId>s3-common</artifactId>
diff --git a/java/connector-node/risingwave-sink-iceberg/pom.xml b/java/connector-node/risingwave-sink-iceberg/pom.xml
index d8ef3d6db384..404a895e7506 100644
--- a/java/connector-node/risingwave-sink-iceberg/pom.xml
+++ b/java/connector-node/risingwave-sink-iceberg/pom.xml
@@ -74,6 +74,10 @@
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-metastore</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.hive</groupId>
+            <artifactId>hive-exec</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.parquet</groupId>
             <artifactId>parquet-avro</artifactId>
diff --git a/java/pom.xml b/java/pom.xml
index 644588c9d6b4..2afd5606a39f 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -387,6 +387,11 @@
                 <artifactId>hive-metastore</artifactId>
                 <version>${hive.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.hive</groupId>
+                <artifactId>hive-exec</artifactId>
+                <version>${hive.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-mapreduce-client-core</artifactId>

From 064fefe26e5c36edbdaa07d8622753887ed725f0 Mon Sep 17 00:00:00 2001
From: Dylan Chen <zilin@singularity-data.com>
Date: Wed, 17 Jul 2024 14:16:31 +0800
Subject: [PATCH 2/2] only include hive-exec-3.1.3-core.jar

---
 java/connector-node/risingwave-connector-test/pom.xml | 5 +++++
 java/connector-node/risingwave-sink-iceberg/pom.xml   | 1 +
 java/pom.xml                                          | 1 +
 3 files changed, 7 insertions(+)

diff --git a/java/connector-node/risingwave-connector-test/pom.xml b/java/connector-node/risingwave-connector-test/pom.xml
index 432a16ec1f34..d3d47b0bc457 100644
--- a/java/connector-node/risingwave-connector-test/pom.xml
+++ b/java/connector-node/risingwave-connector-test/pom.xml
@@ -28,6 +28,11 @@
             <artifactId>risingwave-sink-deltalake</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.risingwave</groupId>
+            <artifactId>risingwave-sink-iceberg</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.risingwave</groupId>
             <artifactId>s3-common</artifactId>
diff --git a/java/connector-node/risingwave-sink-iceberg/pom.xml b/java/connector-node/risingwave-sink-iceberg/pom.xml
index 404a895e7506..251000508fff 100644
--- a/java/connector-node/risingwave-sink-iceberg/pom.xml
+++ b/java/connector-node/risingwave-sink-iceberg/pom.xml
@@ -77,6 +77,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-exec</artifactId>
+            <classifier>core</classifier>
         </dependency>
         <dependency>
             <groupId>org.apache.parquet</groupId>
diff --git a/java/pom.xml b/java/pom.xml
index 2afd5606a39f..af2e70d219dd 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -391,6 +391,7 @@
                 <groupId>org.apache.hive</groupId>
                 <artifactId>hive-exec</artifactId>
                 <version>${hive.version}</version>
+                <classifier>core</classifier>
             </dependency>
             <dependency>
                 <groupId>org.apache.hadoop</groupId>