This is an automated email from the ASF dual-hosted git repository.
jiafengzheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new a6ff1bd Flink / Spark connector compilation problem (#7725)
a6ff1bd is described below
commit a6ff1bd79e6222f5da10258fdc33bcfe88a2fcfc
Author: jiafeng.zhang <[email protected]>
AuthorDate: Fri Jan 14 22:14:48 2022 +0800
Flink / Spark connector compilation problem (#7725)
Flink / Spark connector compilation problem
---
extension/flink-doris-connector/build.sh | 8 +-------
extension/flink-doris-connector/pom.xml | 26 ++++++++++----------------
extension/spark-doris-connector/build.sh | 8 +-------
extension/spark-doris-connector/pom.xml | 26 ++++++++++----------------
4 files changed, 22 insertions(+), 46 deletions(-)
diff --git a/extension/flink-doris-connector/build.sh
b/extension/flink-doris-connector/build.sh
index d363dae..83d26d2 100644
--- a/extension/flink-doris-connector/build.sh
+++ b/extension/flink-doris-connector/build.sh
@@ -62,19 +62,13 @@ if [[ -n ${CUSTOM_MVN} ]]; then
MVN_CMD=${CUSTOM_MVN}
fi
-if [ -z "$1" ]; then
- export FLINK_VERSION="$1"
-fi
-if [ -z "$2" ]; then
- export SCALA_VERSION="$2"
-fi
if ! ${MVN_CMD} --version; then
echo "Error: mvn is not found"
exit 1
fi
export MVN_CMD
rm -rf output/
-${MVN_CMD} clean package
+${MVN_CMD} clean package -Dscala.version=$2 -Dflink.version=$1
mkdir -p output/
cp target/doris-flink-*.jar ./output/
diff --git a/extension/flink-doris-connector/pom.xml
b/extension/flink-doris-connector/pom.xml
index 11f2b20..21a5a6f 100644
--- a/extension/flink-doris-connector/pom.xml
+++ b/extension/flink-doris-connector/pom.xml
@@ -67,8 +67,8 @@ under the License.
</mailingList>
</mailingLists>
<properties>
- <scala.version>${env.SCALA_VERSION}</scala.version>
- <flink.version>${env.FLINK_VERSION}</flink.version>
+ <scala.version>${env.scala.version}</scala.version>
+ <flink.version>${env.flink.version}</flink.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>
@@ -115,28 +115,22 @@ under the License.
</pluginRepositories>
</profile>
<profile>
- <id>fink-version</id>
+ <id>flink.version</id>
+ <properties>
+ <env.flink.version>1.11.6</env.flink.version>
+ </properties>
<activation>
<activeByDefault>true</activeByDefault>
- <property>
- <name>!env.FLINK_VERSION</name>
- </property>
</activation>
- <properties>
- <env.FLINK_VERSION>1.11.6</env.FLINK_VERSION>
- </properties>
</profile>
<profile>
- <id>scala-version</id>
+ <id>scala.version</id>
+ <properties>
+ <env.scala.version>2.12</env.scala.version>
+ </properties>
<activation>
<activeByDefault>true</activeByDefault>
- <property>
- <name>!env.SCALA_VERSION</name>
- </property>
</activation>
- <properties>
- <env.SCALA_VERSION>2.12</env.SCALA_VERSION>
- </properties>
</profile>
<!-- for general repository -->
diff --git a/extension/spark-doris-connector/build.sh
b/extension/spark-doris-connector/build.sh
index d747ba3..e6d4783 100755
--- a/extension/spark-doris-connector/build.sh
+++ b/extension/spark-doris-connector/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/extension/spark-doris-connector/pom.xml
b/extension/spark-doris-connector/pom.xml
index ed3d014..9e4ac08 100644
--- a/extension/spark-doris-connector/pom.xml
+++ b/extension/spark-doris-connector/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: [email protected]
For additional commands, e-mail: [email protected]
