Skip to content

Commit 7378dfd

Browse files
committed
Spark: Refine paimon_sparkx_common dependency
1 parent 2e85151 commit 7378dfd

File tree

2 files changed

+34
-9
lines changed

2 files changed

+34
-9
lines changed

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

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ under the License.
4343
<artifactId>paimon-format</artifactId>
4444
</dependency>
4545

46-
<dependency>
47-
<groupId>org.apache.paimon</groupId>
48-
<artifactId>${paimon-sparkx-common}</artifactId>
49-
<version>${project.version}</version>
50-
</dependency>
51-
5246
<!-- Below are test dependencies which need to be distinguished for different Spark versions. -->
5347

5448
<dependency>
@@ -90,6 +84,40 @@ under the License.
9084
</dependency>
9185
</dependencies>
9286

87+
<profiles>
88+
<profile>
89+
<id>spark3</id>
90+
<dependencies>
91+
<dependency>
92+
<groupId>org.apache.paimon</groupId>
93+
<artifactId>paimon-spark3-common_${scala.binary.version}</artifactId>
94+
<version>${project.version}</version>
95+
</dependency>
96+
</dependencies>
97+
<activation>
98+
<activeByDefault>true</activeByDefault>
99+
<property>
100+
<name>spark3</name>
101+
</property>
102+
</activation>
103+
</profile>
104+
<profile>
105+
<id>spark4</id>
106+
<dependencies>
107+
<dependency>
108+
<groupId>org.apache.paimon</groupId>
109+
<artifactId>paimon-spark4-common_${scala.binary.version}</artifactId>
110+
<version>${project.version}</version>
111+
</dependency>
112+
</dependencies>
113+
<activation>
114+
<property>
115+
<name>spark4</name>
116+
</property>
117+
</activation>
118+
</profile>
119+
</profiles>
120+
93121
<build>
94122
<plugins>
95123
<plugin>

pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ under the License.
126126
<test.mysql.connector.java.version>8.0.27</test.mysql.connector.java.version>
127127

128128
<!-- spark profile properties-->
129-
<paimon-sparkx-common>paimon-spark3-common_${scala.binary.version}</paimon-sparkx-common>
130129
<paimon-spark-common.spark.version>3.5.7</paimon-spark-common.spark.version>
131130
<test.spark.main.version>3.3</test.spark.main.version>
132131
<test.spark.version>3.3.0</test.spark.version>
@@ -402,7 +401,6 @@ under the License.
402401
<scala.binary.version>2.12</scala.binary.version>
403402
<scala.version>${scala212.version}</scala.version>
404403
<paimon-spark-common.spark.version>3.5.7</paimon-spark-common.spark.version>
405-
<paimon-sparkx-common>paimon-spark3-common_${scala.binary.version}</paimon-sparkx-common>
406404
<!-- todo: support the latest spark in paimon e2e test2 -->
407405
<test.spark.main.version>3.3</test.spark.main.version>
408406
<test.spark.version>3.3.0</test.spark.version>
@@ -427,7 +425,6 @@ under the License.
427425
<scala.binary.version>2.13</scala.binary.version>
428426
<scala.version>${scala213.version}</scala.version>
429427
<paimon-spark-common.spark.version>4.0.1</paimon-spark-common.spark.version>
430-
<paimon-sparkx-common>paimon-spark4-common_2.13</paimon-sparkx-common>
431428
<arrow.version>18.1.0</arrow.version>
432429
<test.spark.main.version>4.0</test.spark.main.version>
433430
<test.spark.version>4.0.1</test.spark.version>

0 commit comments

Comments
 (0)