From d94c220110bca4f4ad4a40eb8bf735e9777c960d Mon Sep 17 00:00:00 2001
From: Xiduo You <ulyssesyou18@gmail.com>
Date: Wed, 28 Aug 2024 19:11:30 +0800
Subject: [PATCH] [spark] Spark package should exclude zstd-jni (#4085)

---
 paimon-spark/paimon-spark-3.1/pom.xml | 1 +
 paimon-spark/paimon-spark-3.2/pom.xml | 8 ++++++++
 paimon-spark/paimon-spark-3.3/pom.xml | 8 ++++++++
 paimon-spark/paimon-spark-3.4/pom.xml | 8 ++++++++
 paimon-spark/paimon-spark-3.5/pom.xml | 8 ++++++++
 5 files changed, 33 insertions(+)

diff --git a/paimon-spark/paimon-spark-3.1/pom.xml b/paimon-spark/paimon-spark-3.1/pom.xml
index 0fcf1bdeb838..16c7d7c1b0b3 100644
--- a/paimon-spark/paimon-spark-3.1/pom.xml
+++ b/paimon-spark/paimon-spark-3.1/pom.xml
@@ -232,6 +232,7 @@ under the License.
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <!-- Do no exclude zstd-jni since Spark3.1 depends on 1.4.8 which is not compatible with Paimon's -->
                             <artifactSet>
                                 <includes combine.children="append">
                                     <include>org.apache.paimon:paimon-spark-common</include>
diff --git a/paimon-spark/paimon-spark-3.2/pom.xml b/paimon-spark/paimon-spark-3.2/pom.xml
index 865f3a9eefb9..5e7df9d5fba5 100644
--- a/paimon-spark/paimon-spark-3.2/pom.xml
+++ b/paimon-spark/paimon-spark-3.2/pom.xml
@@ -294,6 +294,14 @@ under the License.
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <filters>
+                                <filter>
+                                    <artifact>*</artifact>
+                                    <excludes>
+                                        <exclude>com/github/luben/zstd/**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                             <artifactSet>
                                 <includes combine.children="append">
                                     <include>org.apache.paimon:paimon-spark-common</include>
diff --git a/paimon-spark/paimon-spark-3.3/pom.xml b/paimon-spark/paimon-spark-3.3/pom.xml
index 8345f5b4ad87..929a6bdb53dc 100644
--- a/paimon-spark/paimon-spark-3.3/pom.xml
+++ b/paimon-spark/paimon-spark-3.3/pom.xml
@@ -289,6 +289,14 @@ under the License.
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <filters>
+                                <filter>
+                                    <artifact>*</artifact>
+                                    <excludes>
+                                        <exclude>com/github/luben/zstd/**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                             <artifactSet>
                                 <includes combine.children="append">
                                     <include>org.apache.paimon:paimon-spark-common</include>
diff --git a/paimon-spark/paimon-spark-3.4/pom.xml b/paimon-spark/paimon-spark-3.4/pom.xml
index 47e1952b6778..d5725f431019 100644
--- a/paimon-spark/paimon-spark-3.4/pom.xml
+++ b/paimon-spark/paimon-spark-3.4/pom.xml
@@ -289,6 +289,14 @@ under the License.
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <filters>
+                                <filter>
+                                    <artifact>*</artifact>
+                                    <excludes>
+                                        <exclude>com/github/luben/zstd/**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                             <artifactSet>
                                 <includes combine.children="append">
                                     <include>org.apache.paimon:paimon-spark-common</include>
diff --git a/paimon-spark/paimon-spark-3.5/pom.xml b/paimon-spark/paimon-spark-3.5/pom.xml
index 2e23313f8f45..b464af117fbc 100644
--- a/paimon-spark/paimon-spark-3.5/pom.xml
+++ b/paimon-spark/paimon-spark-3.5/pom.xml
@@ -281,6 +281,14 @@ under the License.
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <filters>
+                                <filter>
+                                    <artifact>*</artifact>
+                                    <excludes>
+                                        <exclude>com/github/luben/zstd/**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                             <artifactSet>
                                 <includes combine.children="append">
                                     <include>org.apache.paimon:paimon-spark-common</include>