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 4f0da3212c [spark][test] Fix the conflict of parquet dependency in
spark test (#5826)
4f0da3212c is described below
commit 4f0da3212c7dc54d550626e1b17644d024a783d6
Author: HunterXHunter <[email protected]>
AuthorDate: Tue Jul 1 22:08:44 2025 +0800
[spark][test] Fix the conflict of parquet dependency in spark test (#5826)
---
paimon-spark/paimon-spark-3.5/pom.xml | 34 +++++++++++++++++++++++++++++
paimon-spark/paimon-spark-ut/pom.xml | 40 +++++++++++++++++++++++++++++++++++
2 files changed, 74 insertions(+)
diff --git a/paimon-spark/paimon-spark-3.5/pom.xml
b/paimon-spark/paimon-spark-3.5/pom.xml
index b21d0b3847..4be60e17a8 100644
--- a/paimon-spark/paimon-spark-3.5/pom.xml
+++ b/paimon-spark/paimon-spark-3.5/pom.xml
@@ -81,6 +81,16 @@ under the License.
<version>${spark.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>parquet-hadoop</artifactId>
+ <groupId>org.apache.parquet</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>parquet-column</artifactId>
+ <groupId>org.apache.parquet</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -105,6 +115,30 @@ under the License.
<version>${spark.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-format</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.parquet</groupId>
+ <artifactId>parquet-hadoop</artifactId>
+ <version>${parquet.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>zstd-jni</artifactId>
+ <groupId>com.github.luben</groupId>
+ </exclusion>
+ </exclusions>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/paimon-spark/paimon-spark-ut/pom.xml
b/paimon-spark/paimon-spark-ut/pom.xml
index 56cc3ff83d..3fb7070a81 100644
--- a/paimon-spark/paimon-spark-ut/pom.xml
+++ b/paimon-spark/paimon-spark-ut/pom.xml
@@ -92,6 +92,14 @@ under the License.
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>parquet-column</artifactId>
+ <groupId>org.apache.parquet</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>parquet-hadoop</artifactId>
+ <groupId>org.apache.parquet</groupId>
+ </exclusion>
</exclusions>
</dependency>
@@ -106,6 +114,14 @@ under the License.
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>parquet-column</artifactId>
+ <groupId>org.apache.parquet</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>parquet-hadoop</artifactId>
+ <groupId>org.apache.parquet</groupId>
+ </exclusion>
</exclusions>
</dependency>
@@ -178,6 +194,30 @@ under the License.
<version>${okhttp.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-format</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.parquet</groupId>
+ <artifactId>parquet-hadoop</artifactId>
+ <version>${parquet.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>zstd-jni</artifactId>
+ <groupId>com.github.luben</groupId>
+ </exclusion>
+ </exclusions>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>