From c901d0aaf1c0ea44bd285a9cf9cca5958da6ed58 Mon Sep 17 00:00:00 2001 From: Zhi Lin Date: Mon, 10 Jul 2023 13:50:35 +0000 Subject: [PATCH] use environment variable in maven Signed-off-by: Zhi Lin --- build.sh | 5 +++++ core/pom.xml | 8 ++------ core/raydp-main/pom.xml | 4 ++-- core/shims/common/pom.xml | 4 ++-- core/shims/spark322/pom.xml | 4 ++-- core/shims/spark330/pom.xml | 4 ++-- core/shims/spark340/pom.xml | 4 ++-- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/build.sh b/build.sh index 9644adf3..e7a39425 100755 --- a/build.sh +++ b/build.sh @@ -37,6 +37,11 @@ then fi # build core part +# set environment variables for spark versio +export SPARK_VERSION=3.2.2 +export SPARK322_VERSION=3.2.2 +export SPARK330_VERSION=3.3.0 +export SPARK340_VERSION=3.4.0 CORE_DIR="${CURRENT_DIR}/core" pushd ${CORE_DIR} if [[ -z $GITHUB_CI ]]; diff --git a/core/pom.xml b/core/pom.xml index 9283a3bd..2e9fc3c7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -13,10 +13,6 @@ https://github.com/oap-project/raydp.git - 3.2.2 - 3.2.2 - 3.3.0 - 3.4.0 1.1.10.1 4.1.94.Final 1.10.0 @@ -44,7 +40,7 @@ org.apache.spark spark-core_${scala.binary.version} - ${spark.version} + ${env.SPARK_VERSION} provided @@ -72,7 +68,7 @@ org.apache.spark spark-sql_${scala.binary.version} - ${spark.version} + ${env.SPARK_VERSION} provided diff --git a/core/raydp-main/pom.xml b/core/raydp-main/pom.xml index 96bd04ee..78df2860 100644 --- a/core/raydp-main/pom.xml +++ b/core/raydp-main/pom.xml @@ -42,7 +42,7 @@ org.apache.spark spark-core_${scala.binary.version} - ${spark.version} + ${env.SPARK_VERSION} provided @@ -70,7 +70,7 @@ org.apache.spark spark-sql_${scala.binary.version} - ${spark.version} + ${env.SPARK_VERSION} provided diff --git a/core/shims/common/pom.xml b/core/shims/common/pom.xml index 9e7e32f5..fde4cff1 100644 --- a/core/shims/common/pom.xml +++ b/core/shims/common/pom.xml @@ -50,7 +50,7 @@ org.apache.spark spark-sql_${scala.binary.version} - ${spark.version} + ${env.SPARK_VERSION} provided @@ -62,7 +62,7 @@ org.apache.spark spark-core_${scala.binary.version} - ${spark.version} + ${env.SPARK_VERSION} provided diff --git a/core/shims/spark322/pom.xml b/core/shims/spark322/pom.xml index 6e0999ac..8061daf4 100644 --- a/core/shims/spark322/pom.xml +++ b/core/shims/spark322/pom.xml @@ -66,7 +66,7 @@ org.apache.spark spark-sql_${scala.binary.version} - ${spark322.version} + ${env.SPARK322_VERSION} provided @@ -78,7 +78,7 @@ org.apache.spark spark-core_${scala.binary.version} - ${spark322.version} + ${env.SPARK322_VERSION} provided diff --git a/core/shims/spark330/pom.xml b/core/shims/spark330/pom.xml index ade81b96..0ceb3075 100644 --- a/core/shims/spark330/pom.xml +++ b/core/shims/spark330/pom.xml @@ -66,7 +66,7 @@ org.apache.spark spark-sql_${scala.binary.version} - ${spark330.version} + ${env.SPARK330_VERSION} provided @@ -78,7 +78,7 @@ org.apache.spark spark-core_${scala.binary.version} - ${spark330.version} + ${env.SPARK330_VERSION} provided diff --git a/core/shims/spark340/pom.xml b/core/shims/spark340/pom.xml index 4cabe7a9..a9cd087a 100644 --- a/core/shims/spark340/pom.xml +++ b/core/shims/spark340/pom.xml @@ -66,13 +66,13 @@ org.apache.spark spark-sql_${scala.binary.version} - ${spark340.version} + ${env.SPARK340_VERSION} provided org.apache.spark spark-core_${scala.binary.version} - ${spark340.version} + ${env.SPARK340_VERSION} provided