From a6ab236b33b5c8a86d4c2ed0e9fe8c8c73f81a1f Mon Sep 17 00:00:00 2001
From: ulysses-you <ulyssesyou18@gmail.com>
Date: Tue, 1 Jun 2021 11:04:07 +0800
Subject: [PATCH] [KYUUBI #652] [KYUUBI # 651][FOLLOWUP][BRANCH-1.2] Bump Spark
 3.1.2

<!--
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/NetEase/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.
-->
Manually cherry-pick from [#651](https://github.com/NetEase/kyuubi/pull/651)

### _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 #652 from ulysses-you/KYUUBI-651-FOLLOWUP.

Closes #652

7070aa7c [ulysses-you] Merge branch 'branch-1.2' of https://github.com/NetEase/kyuubi into KYUUBI-651-FOLLOWUP
767727ad [ulysses-you] iniut

Authored-by: ulysses-you <ulyssesyou18@gmail.com>
Signed-off-by: ulysses-you <ulyssesyou18@gmail.com>
---
 .github/workflows/master.yml | 2 +-
 .travis.yml                  | 2 +-
 pom.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 980a0283ade..c7641d40954 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -34,7 +34,7 @@ jobs:
       matrix:
         profiles:
           - ''
-          - '-Pspark-3.0 -Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.1.1 -Dspark.archive.name=spark-3.1.1-bin-hadoop2.7.tgz -Dmaven.plugin.scalatest.exclude.tags=org.apache.kyuubi.tags.ExtendedSQLTest,org.apache.kyuubi.tags.DataLakeTest'
+          - '-Pspark-3.0 -Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.1.2 -Dspark.archive.name=spark-3.1.2-bin-hadoop2.7.tgz -Dmaven.plugin.scalatest.exclude.tags=org.apache.kyuubi.tags.ExtendedSQLTest,org.apache.kyuubi.tags.DataLakeTest'
           - '-Pspark-3.1 -Pkyuubi-extension-spark_3.1'
           - '-Pspark-3.1 -Pkyuubi-extension-spark_3.1 -Pspark-hadoop-3.2'
           - '-Pspark-3.2-snapshot -pl :kyuubi-spark-sql-engine,:kyuubi-common,:kyuubi-ha,:kyuubi-zookeeper -Dmaven.plugin.scalatest.exclude.tags=org.apache.kyuubi.tags.ExtendedSQLTest,org.apache.kyuubi.tags.DataLakeTest'
diff --git a/.travis.yml b/.travis.yml
index ee355b86c7f..306b3396023 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ matrix:
         - EXCLUDE_TAGS="org.apache.kyuubi.tags.ExtendedSQLTest"
     - name: Test Kyuubi w/ -Pspark-3.0 and Spark 3.1 binary
       env:
-        - PROFILE="-Pspark-3.0 -Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.1.1 -Dspark.archive.name=spark-3.1.1-bin-hadoop2.7.tgz"
+        - PROFILE="-Pspark-3.0 -Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.1.2 -Dspark.archive.name=spark-3.1.2-bin-hadoop2.7.tgz"
         - EXCLUDE_TAGS="org.apache.kyuubi.tags.ExtendedSQLTest,org.apache.kyuubi.tags.DataLakeTest"
     - name: Test Kyuubi w/ -Pspark-3.1 -Pkyuubi-extension-spark_3.1
       env:
diff --git a/pom.xml b/pom.xml
index c241d06c351..c2b1e73df79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1562,7 +1562,7 @@
         <profile>
             <id>spark-3.1</id>
             <properties>
-                <spark.version>3.1.1</spark.version>
+                <spark.version>3.1.2</spark.version>
                 <maven.plugin.scalatest.exclude.tags>org.apache.kyuubi.tags.ExtendedSQLTest,org.apache.kyuubi.tags.DataLakeTest</maven.plugin.scalatest.exclude.tags>
             </properties>
         </profile>
@@ -1588,7 +1588,7 @@
         <profile>
             <id>kyuubi-extension-spark_3.1</id>
             <properties>
-                <spark.version>3.1.1</spark.version>
+                <spark.version>3.1.2</spark.version>
             </properties>
             <modules>
                 <module>dev/kyuubi-extension-spark_3.1</module>