Skip to content

Commit 4f0da32

Browse files
authored
[spark][test] Fix the conflict of parquet dependency in spark test (#5826)
1 parent ef9e214 commit 4f0da32

File tree

2 files changed

+74
-0
lines changed

2 files changed

+74
-0
lines changed

paimon-spark/paimon-spark-3.5/pom.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,16 @@ under the License.
8181
<version>${spark.version}</version>
8282
<classifier>tests</classifier>
8383
<scope>test</scope>
84+
<exclusions>
85+
<exclusion>
86+
<artifactId>parquet-hadoop</artifactId>
87+
<groupId>org.apache.parquet</groupId>
88+
</exclusion>
89+
<exclusion>
90+
<artifactId>parquet-column</artifactId>
91+
<groupId>org.apache.parquet</groupId>
92+
</exclusion>
93+
</exclusions>
8494
</dependency>
8595

8696
<dependency>
@@ -105,6 +115,30 @@ under the License.
105115
<version>${spark.version}</version>
106116
<scope>test</scope>
107117
</dependency>
118+
119+
<dependency>
120+
<groupId>org.apache.paimon</groupId>
121+
<artifactId>paimon-format</artifactId>
122+
<version>${project.version}</version>
123+
<scope>test</scope>
124+
</dependency>
125+
126+
<dependency>
127+
<groupId>org.apache.parquet</groupId>
128+
<artifactId>parquet-hadoop</artifactId>
129+
<version>${parquet.version}</version>
130+
<exclusions>
131+
<exclusion>
132+
<groupId>org.xerial.snappy</groupId>
133+
<artifactId>snappy-java</artifactId>
134+
</exclusion>
135+
<exclusion>
136+
<artifactId>zstd-jni</artifactId>
137+
<groupId>com.github.luben</groupId>
138+
</exclusion>
139+
</exclusions>
140+
<scope>test</scope>
141+
</dependency>
108142
</dependencies>
109143

110144
<build>

paimon-spark/paimon-spark-ut/pom.xml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,14 @@ under the License.
9292
<groupId>com.fasterxml.jackson.core</groupId>
9393
<artifactId>*</artifactId>
9494
</exclusion>
95+
<exclusion>
96+
<artifactId>parquet-column</artifactId>
97+
<groupId>org.apache.parquet</groupId>
98+
</exclusion>
99+
<exclusion>
100+
<artifactId>parquet-hadoop</artifactId>
101+
<groupId>org.apache.parquet</groupId>
102+
</exclusion>
95103
</exclusions>
96104
</dependency>
97105

@@ -106,6 +114,14 @@ under the License.
106114
<groupId>com.fasterxml.jackson.core</groupId>
107115
<artifactId>*</artifactId>
108116
</exclusion>
117+
<exclusion>
118+
<artifactId>parquet-column</artifactId>
119+
<groupId>org.apache.parquet</groupId>
120+
</exclusion>
121+
<exclusion>
122+
<artifactId>parquet-hadoop</artifactId>
123+
<groupId>org.apache.parquet</groupId>
124+
</exclusion>
109125
</exclusions>
110126
</dependency>
111127

@@ -178,6 +194,30 @@ under the License.
178194
<version>${okhttp.version}</version>
179195
<scope>test</scope>
180196
</dependency>
197+
198+
<dependency>
199+
<groupId>org.apache.paimon</groupId>
200+
<artifactId>paimon-format</artifactId>
201+
<version>${project.version}</version>
202+
<scope>test</scope>
203+
</dependency>
204+
205+
<dependency>
206+
<groupId>org.apache.parquet</groupId>
207+
<artifactId>parquet-hadoop</artifactId>
208+
<version>${parquet.version}</version>
209+
<exclusions>
210+
<exclusion>
211+
<groupId>org.xerial.snappy</groupId>
212+
<artifactId>snappy-java</artifactId>
213+
</exclusion>
214+
<exclusion>
215+
<artifactId>zstd-jni</artifactId>
216+
<groupId>com.github.luben</groupId>
217+
</exclusion>
218+
</exclusions>
219+
<scope>test</scope>
220+
</dependency>
181221
</dependencies>
182222

183223
<build>

0 commit comments

Comments
 (0)