From 3268a7e5885e1a51a350b8ee8b59f7d08b70c693 Mon Sep 17 00:00:00 2001
From: ulysses-you <ulyssesyou18@gmail.com>
Date: Tue, 23 Feb 2021 21:00:20 +0800
Subject: [PATCH] [KYUUBI #357] [Kyuubi-1.0] Update built-in Spark version to
 3.0.2

![ulysses-you](https://badgen.net/badge/Hello/ulysses-you/green) [![Closes #357](https://badgen.net/badge/Preview/Closes%20%23357/blue)](https://github.com/yaooqinn/kyuubi/pull/357) ![12](https://badgen.net/badge/%2B/12/red) ![3](https://badgen.net/badge/-/3/green) ![2](https://badgen.net/badge/commits/2/yellow) ![Target Issue](https://badgen.net/badge/Missing/Target%20Issue/ff0000) ![Test Plan](https://badgen.net/badge/Missing/Test%20Plan/ff0000) [&#10088;?&#10089;](https://pullrequestbadge.com/?utm_medium=github&utm_source=yaooqinn&utm_campaign=badge_info)<!-- PR-BADGE: PLEASE DO NOT REMOVE THIS COMMENT -->

backport [#356](https://github.com/yaooqinn/kyuubi/pull/356) for branch-1.0.
<!--
Thanks for sending a pull request!

Here are some tips for you:
  1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html
  2. If the PR is related to an issue in https://github.com/yaooqinn/kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'.
  3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'.
-->

### _Why are the changes needed?_
<!--
Please clarify why the changes are needed. For instance,
  1. If you add a feature, you can talk about the use case of it.
  2. If you fix a bug, you can clarify why it is a bug.
-->
Spark 3.0.2 has been released now.

### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible

- [ ] Add screenshots for manual tests if appropriate

- [ ] [Run test](https://kyuubi.readthedocs.io/en/latest/tools/testing.html#running-tests) locally before make a pull request

Closes #357 from ulysses-you/branch-1.0-spark-3.0.2.

b5d4442 [ulysses-you] sync
2c5ee8e [ulysses-you] 3.0.2

Authored-by: ulysses-you <ulyssesyou18@gmail.com>
Signed-off-by: Kent Yao <yao@apache.org>
---
 bin/load-kyuubi-env.sh     | 11 ++++++++++-
 docs/tools/distribution.md |  2 +-
 pom.xml                    |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bin/load-kyuubi-env.sh b/bin/load-kyuubi-env.sh
index 9f45bad3f..5fff804ae 100755
--- a/bin/load-kyuubi-env.sh
+++ b/bin/load-kyuubi-env.sh
@@ -66,7 +66,16 @@ fi
 SPARK_BUILTIN="${KYUUBI_HOME}/externals/spark-$SPARK_VERSION_BUILD-bin-hadoop${HADOOP_VERSION_BUILD:0:3}$HIVE_VERSION_SUFFIX"
 
 if [[ ! -d ${SPARK_BUILTIN} ]]; then
-  SPARK_BUILTIN="${KYUUBI_HOME}/externals/kyuubi-download/target/spark-3.0.1-bin-hadoop2.7"
+  MVN="${MVN:-"${KYUUBI_HOME}/build/mvn"}"
+  SPARK_VERSION_BUILD=$("$MVN" help:evaluate -Dexpression=spark.version 2>/dev/null\
+    | grep -v "INFO"\
+    | grep -v "WARNING"\
+    | tail -n 1)
+  HADOOP_VERSION_BUILD=$("$MVN" help:evaluate -Dexpression=hadoop.version 2>/dev/null\
+    | grep -v "INFO"\
+    | grep -v "WARNING"\
+    | tail -n 1)
+  SPARK_BUILTIN="${KYUUBI_HOME}/externals/kyuubi-download/target/spark-$SPARK_VERSION_BUILD-bin-hadoop${HADOOP_VERSION_BUILD:0:3}"
 fi
 
 export SPARK_HOME="${SPARK_HOME:-"${SPARK_BUILTIN}"}"
diff --git a/docs/tools/distribution.md b/docs/tools/distribution.md
index a770a522c..644284115 100644
--- a/docs/tools/distribution.md
+++ b/docs/tools/distribution.md
@@ -28,4 +28,4 @@ For instance,
 ./build/dist --name custom-name --tgz
 ```
 
-This results a Kyuubi distribution named `kyuubi-{version}-bin-custom-name-spark-3.0.1.tar.gz` for you. 
+This results a Kyuubi distribution named `kyuubi-{version}-bin-custom-name.tar.gz` for you.
diff --git a/pom.xml b/pom.xml
index 6813b112c..8950f4390 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
         <scalatest.version>3.0.3</scalatest.version>
         <scala.binary.version>2.12</scala.binary.version>
         <maven.version>3.6.3</maven.version>
-        <spark.version>3.0.1</spark.version>
+        <spark.version>3.0.2</spark.version>
         <log4j.version>1.7.30</log4j.version>
     </properties>