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-spark-connector.git
The following commit(s) were added to refs/heads/master by this push:
new 18203df [chore] Change GAV (#12)
18203df is described below
commit 18203dfddfe7a9be8894c4c0cdade0df4c8fca77
Author: Mingyu Chen <[email protected]>
AuthorDate: Sun Mar 6 11:10:03 2022 +0800
[chore] Change GAV (#12)
1. modify GAV to
"spark-doris-connector-{spark.minor.version}_${scala_version}"
---
.asf.yaml | 3 +++
spark-doris-connector/build.sh | 10 +++++++++-
spark-doris-connector/pom.xml | 11 ++++++-----
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index bb7e17f..647b036 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -35,6 +35,9 @@ github:
required_pull_request_reviews:
dismiss_stale_reviews: true
required_approving_review_count: 1
+ features:
+ issues: true
+ projects: true
notifications:
issues: [email protected]
commits: [email protected]
diff --git a/spark-doris-connector/build.sh b/spark-doris-connector/build.sh
index 14403cb..30d20a0 100755
--- a/spark-doris-connector/build.sh
+++ b/spark-doris-connector/build.sh
@@ -78,12 +78,20 @@ while true; do
esac
done
+# extract minor version:
+# eg: 3.1.2 -> 3
+SPARK_MINOR_VERSION=0
+if [ ${SPARK_VERSION} != 0 ]; then
+ SPARK_MINOR_VERSION=${SPARK_VERSION%.*}
+ echo "SPARK_MINOR_VERSION: ${SPARK_MINOR_VERSION}"
+fi
+
if [[ ${BUILD_FROM_TAG} -eq 1 ]]; then
rm -rf ${ROOT}/output/
${MVN_BIN} clean package
else
rm -rf ${ROOT}/output/
- ${MVN_BIN} clean package -Dspark.version=${SPARK_VERSION}
-Dscala.version=${SCALA_VERSION}
+ ${MVN_BIN} clean package -Dspark.version=${SPARK_VERSION}
-Dscala.version=${SCALA_VERSION} -Dspark.minor.version=${SPARK_MINOR_VERSION}
fi
mkdir ${ROOT}/output/
diff --git a/spark-doris-connector/pom.xml b/spark-doris-connector/pom.xml
index f787920..0f1ea95 100644
--- a/spark-doris-connector/pom.xml
+++ b/spark-doris-connector/pom.xml
@@ -26,9 +26,9 @@
<version>23</version>
</parent>
<groupId>org.apache.doris</groupId>
- <artifactId>doris-spark-connector</artifactId>
- <version>${spark.version}-${scala.version}-1.0.0-SNAPSHOT</version>
- <name>Doris Spark Connector</name>
+
<artifactId>spark-doris-connector-${spark.minor.version}_${scala.version}</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>Spark Doris Connector</name>
<url>https://doris.apache.org/</url>
<licenses>
<license>
@@ -64,6 +64,7 @@
<properties>
<scala.version>${env.scala.version}</scala.version>
<spark.version>${env.spark.version}</spark.version>
+ <spark.minor.version>${env.spark.minor.version}</spark.minor.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>
@@ -98,7 +99,7 @@
<profile>
<id>spark.version</id>
<properties>
- <env.spark.version>2.3.4</env.spark.version>
+ <env.spark.version>3.1.2</env.spark.version>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
@@ -107,7 +108,7 @@
<profile>
<id>scala.version</id>
<properties>
- <env.scala.version>2.11</env.scala.version>
+ <env.scala.version>2.12</env.scala.version>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
