[GLUTEN-3625][FOLLOWUP] Recover to the use of hardcode module name (#…

…3659)
apache · Nov 10, 2023 · 047c993 · 047c993
1 parent 3ecf596
commit 047c993
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 11 deletions.
diff --git a/gluten-ut/pom.xml b/gluten-ut/pom.xml
@@ -26,7 +26,6 @@
 
   <modules>
     <module>common</module>
-    <module>${spark.test.module}</module>
   </modules>
 
   <artifactId>gluten-ut</artifactId>
@@ -180,4 +179,25 @@
       </plugins>
     </pluginManagement>
   </build>
+
+  <profiles>
+    <profile>
+      <id>spark-3.2</id>
+      <modules>
+        <module>spark32</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>spark-3.3</id>
+      <modules>
+        <module>spark33</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>spark-3.4</id>
+      <modules>
+        <module>spark34</module>
+      </modules>
+    </profile>
+  </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -45,10 +45,8 @@
     <scala.version>2.12.15</scala.version>
     <spark.major.version>3</spark.major.version>
     <sparkbundle.version>3.2</sparkbundle.version>
-    <spark.shim.module>spark32</spark.shim.module>
-    <spark.test.module>spark32</spark.test.module>
     <spark.version>3.2.2</spark.version>
-    <sparkshim.artifactId>spark-sql-columnar-shims-${spark.shim.module}</sparkshim.artifactId>
+    <sparkshim.artifactId>spark-sql-columnar-shims-spark32</sparkshim.artifactId>
     <celeborn.version>0.3.0-incubating</celeborn.version>
     <arrow.version>12.0.0</arrow.version>
     <arrow-memory.artifact>arrow-memory-unsafe</arrow-memory.artifact>
@@ -108,8 +106,7 @@
       </activation>
       <properties>
         <sparkbundle.version>3.2</sparkbundle.version>
-        <spark.shim.module>spark32</spark.shim.module>
-        <spark.test.module>spark32</spark.test.module>
+        <sparkshim.artifactId>spark-sql-columnar-shims-spark32</sparkshim.artifactId>
         <spark.version>3.2.2</spark.version>
         <delta.version>2.0.1</delta.version>
         <delta.binary.version>20</delta.binary.version>
@@ -119,8 +116,7 @@
       <id>spark-3.3</id>
       <properties>
         <sparkbundle.version>3.3</sparkbundle.version>
-        <spark.shim.module>spark33</spark.shim.module>
-        <spark.test.module>spark33</spark.test.module>
+        <sparkshim.artifactId>spark-sql-columnar-shims-spark33</sparkshim.artifactId>
         <spark.version>3.3.1</spark.version>
         <delta.version>2.2.0</delta.version>
         <delta.binary.version>22</delta.binary.version>
@@ -130,8 +126,7 @@
       <id>spark-3.4</id>
       <properties>
         <sparkbundle.version>3.4</sparkbundle.version>
-        <spark.shim.module>spark34</spark.shim.module>
-        <spark.test.module>spark34</spark.test.module>
+        <sparkshim.artifactId>spark-sql-columnar-shims-spark34</sparkshim.artifactId>
         <spark.version>3.4.1</spark.version>
         <delta.version>2.2.0</delta.version>
         <delta.binary.version>22</delta.binary.version>

diff --git a/shims/pom.xml b/shims/pom.xml
@@ -30,7 +30,6 @@
 
   <modules>
     <module>common</module>
-    <module>${spark.shim.module}</module>
   </modules>
 
   <dependencies>
@@ -69,4 +68,25 @@
       </plugins>
     </pluginManagement>
   </build>
+
+  <profiles>
+    <profile>
+      <id>spark-3.2</id>
+      <modules>
+        <module>spark32</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>spark-3.3</id>
+      <modules>
+        <module>spark33</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>spark-3.4</id>
+      <modules>
+        <module>spark34</module>
+      </modules>
+    </profile>
+  </profiles>
 </project>