update spark common pom

apache · Nov 11, 2024 · a626cae · a626cae
1 parent db51a67
commit a626cae
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/paimon-docs/pom.xml b/paimon-docs/pom.xml
@@ -59,7 +59,7 @@ under the License.
 
         <dependency>
             <groupId>org.apache.paimon</groupId>
-            <artifactId>paimon-spark-common</artifactId>
+            <artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>

diff --git a/paimon-spark/paimon-spark-3.2/pom.xml b/paimon-spark/paimon-spark-3.2/pom.xml
@@ -38,7 +38,7 @@ under the License.
     <dependencies>
         <dependency>
             <groupId>org.apache.paimon</groupId>
-            <artifactId>paimon-spark-common</artifactId>
+            <artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -63,7 +63,7 @@ under the License.
 
         <dependency>
             <groupId>org.apache.paimon</groupId>
-            <artifactId>paimon-spark-common</artifactId>
+            <artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
@@ -126,7 +126,7 @@ under the License.
                             </filters>
                             <artifactSet>
                                 <includes combine.children="append">
-                                    <include>org.apache.paimon:paimon-spark-common</include>
+                                     <include>org.apache.paimon:paimon-spark-common_${scala.binary.version}</include>
                                 </includes>
                             </artifactSet>
                         </configuration>

diff --git a/paimon-spark/paimon-spark-3.3/pom.xml b/paimon-spark/paimon-spark-3.3/pom.xml
@@ -38,7 +38,7 @@ under the License.
     <dependencies>
         <dependency>
             <groupId>org.apache.paimon</groupId>
-            <artifactId>paimon-spark-common</artifactId>
+            <artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -63,7 +63,7 @@ under the License.
 
         <dependency>
             <groupId>org.apache.paimon</groupId>
-            <artifactId>paimon-spark-common</artifactId>
+            <artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
@@ -126,7 +126,7 @@ under the License.
                             </filters>
                             <artifactSet>
                                 <includes combine.children="append">
-                                    <include>org.apache.paimon:paimon-spark-common</include>
+                                     <include>org.apache.paimon:paimon-spark-common_${scala.binary.version}</include>
                                 </includes>
                             </artifactSet>
                         </configuration>

diff --git a/paimon-spark/paimon-spark-3.4/pom.xml b/paimon-spark/paimon-spark-3.4/pom.xml
@@ -38,7 +38,7 @@ under the License.
     <dependencies>
         <dependency>
             <groupId>org.apache.paimon</groupId>
-            <artifactId>paimon-spark-common</artifactId>
+            <artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -63,7 +63,7 @@ under the License.
 
         <dependency>
             <groupId>org.apache.paimon</groupId>
-            <artifactId>paimon-spark-common</artifactId>
+            <artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
@@ -126,7 +126,7 @@ under the License.
                             </filters>
                             <artifactSet>
                                 <includes combine.children="append">
-                                    <include>org.apache.paimon:paimon-spark-common</include>
+                                     <include>org.apache.paimon:paimon-spark-common_${scala.binary.version}</include>
                                 </includes>
                             </artifactSet>
                         </configuration>

diff --git a/paimon-spark/paimon-spark-3.5/pom.xml b/paimon-spark/paimon-spark-3.5/pom.xml
@@ -38,7 +38,7 @@ under the License.
     <dependencies>
         <dependency>
             <groupId>org.apache.paimon</groupId>
-            <artifactId>paimon-spark-common</artifactId>
+            <artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -63,7 +63,7 @@ under the License.
 
         <dependency>
             <groupId>org.apache.paimon</groupId>
-            <artifactId>paimon-spark-common</artifactId>
+            <artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
@@ -126,7 +126,7 @@ under the License.
                             </filters>
                             <artifactSet>
                                 <includes combine.children="append">
-                                    <include>org.apache.paimon:paimon-spark-common</include>
+                                     <include>org.apache.paimon:paimon-spark-common_${scala.binary.version}</include>
                                 </includes>
                             </artifactSet>
                         </configuration>

diff --git a/paimon-spark/paimon-spark-4.0/pom.xml b/paimon-spark/paimon-spark-4.0/pom.xml
@@ -38,7 +38,7 @@ under the License.
     <dependencies>
         <dependency>
             <groupId>org.apache.paimon</groupId>
-            <artifactId>paimon-spark-common</artifactId>
+            <artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -63,7 +63,7 @@ under the License.
 
         <dependency>
             <groupId>org.apache.paimon</groupId>
-            <artifactId>paimon-spark-common</artifactId>
+            <artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
             <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
@@ -126,7 +126,7 @@ under the License.
                             </filters>
                             <artifactSet>
                                 <includes combine.children="append">
-                                    <include>org.apache.paimon:paimon-spark-common</include>
+                                     <include>org.apache.paimon:paimon-spark-common_${scala.binary.version}</include>
                                 </includes>
                             </artifactSet>
                         </configuration>

diff --git a/paimon-spark/paimon-spark-common/pom.xml b/paimon-spark/paimon-spark-common/pom.xml
@@ -30,8 +30,8 @@ under the License.
 
     <packaging>jar</packaging>
 
-    <artifactId>paimon-spark-common</artifactId>
-    <name>Paimon : Spark : Common</name>
+    <artifactId>paimon-spark-common_${scala.binary.version}</artifactId>
+    <name>Paimon : Spark : Common : ${scala.binary.version}</name>
 
     <properties>
         <spark.version>${paimon-spark-common.spark.version}</spark.version>

diff --git a/...k/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkCatalogWithHiveTest.java b/...k/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkCatalogWithHiveTest.java
@@ -96,8 +96,8 @@ public void testCreateFormatTable(@TempDir java.nio.file.Path tempDir) {
                 .isGreaterThan(0);
 
         // todo: There are some bugs with Spark CSV table's options. In Spark 3.x, both reading and
-        // writing using the default delimiter value ',' even if we set specific it. In Spark 4.x,
-        // reading is correct, but writing is still incorrect, just skip it for now.
+        // writing using the default delimiter value ',' even if we specific it. In Spark 4.x,
+        // reading is correct, but writing is still incorrect, just skip setting it for now.
         // test csv table
 
         spark.sql(