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.git
The following commit(s) were added to refs/heads/master by this push:
new b54a12e [Build]Compile and output the jar file, add Spark, Flink
version and Scala version (#7051)
b54a12e is described below
commit b54a12ef11085e75c725c475fdd6055807073396
Author: jiafeng.zhang <zhang...@gmail.com>
AuthorDate: Tue Nov 9 10:02:08 2021 +0800
[Build]Compile and output the jar file, add Spark, Flink version and Scala
version (#7051)
The jar file compiled by Flink and Spark Connector, with the corresponding
Flink, Spark version
and Scala version at compile time, so that users can know whether the
version number matches when using it.
Example of output file nameļ¼doris-spark-1.0.0-spark-3.2.0_2.12.jar
---
extension/flink-doris-connector/build.sh | 6 ++----
extension/flink-doris-connector/pom.xml | 2 +-
extension/spark-doris-connector/build.sh | 5 ++---
extension/spark-doris-connector/pom.xml | 2 +-
extension/spark-doris-connector/pom_3.0.xml | 2 +-
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/extension/flink-doris-connector/build.sh
b/extension/flink-doris-connector/build.sh
index 70f4e96..3be10a0 100644
--- a/extension/flink-doris-connector/build.sh
+++ b/extension/flink-doris-connector/build.sh
@@ -45,14 +45,12 @@ if ! ${MVN_CMD} --version; then
exit 1
fi
export MVN_CMD
-
+rm -rf output/
${MVN_CMD} clean package
mkdir -p output/
-cp target/doris-flink-1.0-SNAPSHOT.jar ./output/
-cp target/doris-flink-1.0-SNAPSHOT-javadoc.jar ./output/
-cp target/doris-flink-1.0-SNAPSHOT-sources.jar ./output/
+cp target/doris-flink-*.jar ./output/
echo "*****************************************"
echo "Successfully build Flink-Doris-Connector"
diff --git a/extension/flink-doris-connector/pom.xml
b/extension/flink-doris-connector/pom.xml
index ffe6784..c5c3905 100644
--- a/extension/flink-doris-connector/pom.xml
+++ b/extension/flink-doris-connector/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.apache</groupId>
<artifactId>doris-flink</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-flink-${flink.version}_${scala.version}</version>
<properties>
<scala.version>2.12</scala.version>
diff --git a/extension/spark-doris-connector/build.sh
b/extension/spark-doris-connector/build.sh
index d6ba435..cc5d138 100755
--- a/extension/spark-doris-connector/build.sh
+++ b/extension/spark-doris-connector/build.sh
@@ -61,6 +61,7 @@ if [ $# == 0 ]; then
usage
fi
+rm -rf output/
if [ "$1"x == "3x" ]
then
@@ -72,9 +73,7 @@ then
fi
mkdir -p output/
-cp target/doris-spark-1.0.0-SNAPSHOT.jar ./output/
-cp target/doris-spark-1.0.0-SNAPSHOT-javadoc.jar ./output/
-cp target/doris-spark-1.0.0-SNAPSHOT-sources.jar ./output/
+cp target/doris-spark-*.jar ./output/
echo "*****************************************"
echo "Successfully build Spark-Doris-Connector"
diff --git a/extension/spark-doris-connector/pom.xml
b/extension/spark-doris-connector/pom.xml
index b76c823..d756bfb 100644
--- a/extension/spark-doris-connector/pom.xml
+++ b/extension/spark-doris-connector/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache</groupId>
<artifactId>doris-spark</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-spark-${spark.version}_${scala.version}</version>
<properties>
<scala.version>2.11</scala.version>
diff --git a/extension/spark-doris-connector/pom_3.0.xml
b/extension/spark-doris-connector/pom_3.0.xml
index d208ad0..d09e81a 100644
--- a/extension/spark-doris-connector/pom_3.0.xml
+++ b/extension/spark-doris-connector/pom_3.0.xml
@@ -26,7 +26,7 @@
<groupId>org.apache</groupId>
<artifactId>doris-spark</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-spark-${spark.version}_${scala.version}</version>
<properties>
<scala.version>2.12</scala.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
