You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@paimon.apache.org by lz...@apache.org on 2024/08/28 11:11:36 UTC

(paimon) branch master updated: [spark] Spark package should exclude zstd-jni (#4085)

This is an automated email from the ASF dual-hosted git repository.

lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git


The following commit(s) were added to refs/heads/master by this push:
     new d94c22011 [spark] Spark package should exclude zstd-jni (#4085)
d94c22011 is described below

commit d94c220110bca4f4ad4a40eb8bf735e9777c960d
Author: Xiduo You <ul...@gmail.com>
AuthorDate: Wed Aug 28 19:11:30 2024 +0800

    [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 0fcf1bdeb..16c7d7c1b 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 865f3a9ee..5e7df9d5f 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 8345f5b4a..929a6bdb5 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 47e1952b6..d5725f431 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 2e23313f8..b464af117 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>