This is an automated email from the ASF dual-hosted git repository.
philo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 0e628fafce [GLUTEN-5525] Fix `mvn versions:set` does not work for shim
submodules (#7593)
0e628fafce is described below
commit 0e628fafce0eda28c92dfb7a45b2457028b6c3eb
Author: Helin Jin <[email protected]>
AuthorDate: Wed Oct 23 09:56:20 2024 +0800
[GLUTEN-5525] Fix `mvn versions:set` does not work for shim submodules
(#7593)
---
pom.xml | 5 -----
shims/pom.xml | 37 ++++++++++++++++++++++++++++++++++++-
2 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index ea8a9f9808..69a0a17872 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,6 @@
<spark.major.version>3</spark.major.version>
<sparkbundle.version>3.4</sparkbundle.version>
<spark.version>3.4.3</spark.version>
- <sparkshim.module.name>spark34</sparkshim.module.name>
<sparkshim.artifactId>spark-sql-columnar-shims-spark34</sparkshim.artifactId>
<iceberg.version>1.5.0</iceberg.version>
<delta.package.name>delta-core</delta.package.name>
@@ -293,7 +292,6 @@
<id>spark-3.2</id>
<properties>
<sparkbundle.version>3.2</sparkbundle.version>
- <sparkshim.module.name>spark32</sparkshim.module.name>
<sparkshim.artifactId>spark-sql-columnar-shims-spark32</sparkshim.artifactId>
<spark.version>3.2.2</spark.version>
<iceberg.version>1.3.1</iceberg.version>
@@ -308,7 +306,6 @@
<id>spark-3.3</id>
<properties>
<sparkbundle.version>3.3</sparkbundle.version>
- <sparkshim.module.name>spark33</sparkshim.module.name>
<sparkshim.artifactId>spark-sql-columnar-shims-spark33</sparkshim.artifactId>
<spark.version>3.3.1</spark.version>
<!-- keep using iceberg v1.3.1 for parquet compatibilty. -->
@@ -324,7 +321,6 @@
<id>spark-3.4</id>
<properties>
<sparkbundle.version>3.4</sparkbundle.version>
- <sparkshim.module.name>spark34</sparkshim.module.name>
<sparkshim.artifactId>spark-sql-columnar-shims-spark34</sparkshim.artifactId>
<spark.version>3.4.3</spark.version>
<iceberg.version>1.5.0</iceberg.version>
@@ -339,7 +335,6 @@
<id>spark-3.5</id>
<properties>
<sparkbundle.version>3.5</sparkbundle.version>
- <sparkshim.module.name>spark35</sparkshim.module.name>
<sparkshim.artifactId>spark-sql-columnar-shims-spark35</sparkshim.artifactId>
<spark.version>3.5.3</spark.version>
<iceberg.version>1.5.0</iceberg.version>
diff --git a/shims/pom.xml b/shims/pom.xml
index adc2ca1dad..4727cf474d 100644
--- a/shims/pom.xml
+++ b/shims/pom.xml
@@ -30,7 +30,6 @@
<modules>
<module>common</module>
- <module>${sparkshim.module.name}</module>
</modules>
<dependencies>
@@ -54,6 +53,42 @@
</dependency>
</dependencies>
+ <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>
+ <profile>
+ <id>spark-3.5</id>
+ <modules>
+ <module>spark35</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>spark34</module>
+ </modules>
+ </profile>
+ </profiles>
+
<build>
<pluginManagement>
<plugins>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
