This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-doris-spark-connector.git
commit 19542efce301e8c0584fc8ddd5ba97fa54c63396
Author: jiafeng.zhang <zhang...@gmail.com>
AuthorDate: Fri Jan 14 22:14:48 2022 +0800
Flink / Spark connector compilation problem (#7725)
Flink / Spark connector compilation problem
---
build.sh | 8 +-------
pom.xml | 26 ++++++++++----------------
2 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/build.sh b/build.sh
index d747ba3..e6d4783 100755
--- a/build.sh
+++ b/build.sh
@@ -67,13 +67,7 @@ export MVN_CMD
rm -rf output/
-if [ -z "$1" ]; then
- export SPARK_VERSION="$1"
-fi
-if [ -z "$2" ]; then
- export SCALA_VERSION="$2"
-fi
-${MVN_CMD} clean package
+${MVN_CMD} clean package -Dscala.version=$2 -Dspark.version=$1
mkdir -p output/
cp target/doris-spark-*.jar ./output/
diff --git a/pom.xml b/pom.xml
index ed3d014..9e4ac08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,8 +68,8 @@
</mailingLists>
<properties>
- <scala.version>${env.SCALA_VERSION}</scala.version>
- <spark.version>${env.SPARK_VERSION}</spark.version>
+ <scala.version>${env.scala.version}</scala.version>
+ <spark.version>${env.spark.version}</spark.version>
<libthrift.version>0.13.0</libthrift.version>
<arrow.version>5.0.0</arrow.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
@@ -105,28 +105,22 @@
</pluginRepositories>
</profile>
<profile>
- <id>spark-version</id>
+ <id>spark.version</id>
+ <properties>
+ <env.spark.version>2.3.4</env.spark.version>
+ </properties>
<activation>
<activeByDefault>true</activeByDefault>
- <property>
- <name>!env.SPARK_VERSION</name>
- </property>
</activation>
- <properties>
- <env.SPARK_VERSION>2.3.4</env.SPARK_VERSION>
- </properties>
</profile>
<profile>
- <id>scala-version</id>
+ <id>scala.version</id>
+ <properties>
+ <env.scala.version>2.11</env.scala.version>
+ </properties>
<activation>
<activeByDefault>true</activeByDefault>
- <property>
- <name>!env.SCALA_VERSION</name>
- </property>
</activation>
- <properties>
- <env.SCALA_VERSION>2.11</env.SCALA_VERSION>
- </properties>
</profile>
<!-- for general repository -->
<profile>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
