From cbe5bee6ecbcf68a52ac7fb78a296dd4a28167d0 Mon Sep 17 00:00:00 2001
From: Brian Yue <code.byyue@gmail.com>
Date: Fri, 17 Sep 2021 21:12:56 +0800
Subject: [PATCH] [KYUUBI #1112] Upgrade scala to 2.12.15

<!--
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/apache/incubator-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.
-->
Close #1112.

### _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/develop_tools/testing.html#running-tests) locally before make a pull request

Closes #1120 from byyue/feature-1112.

Closes #1112

9bb10858 [Brian Yue] [FEATURE] [Dependency] Upgrade scala to 2.14.15

Authored-by: Brian Yue <code.byyue@gmail.com>
Signed-off-by: Cheng Pan <chengpan@apache.org>
---
 .travis.yml        | 2 +-
 dev/dependencyList | 2 +-
 pom.xml            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8dbcac062..661cf1eae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ branches:
 dist: bionic
 language: scala
 scala:
-  - 2.12.14
+  - 2.12.15
 jdk:
   - openjdk8
 
diff --git a/dev/dependencyList b/dev/dependencyList
index c2b27a09e..854519710 100644
--- a/dev/dependencyList
+++ b/dev/dependencyList
@@ -72,7 +72,7 @@ metrics-json/4.1.1//metrics-json-4.1.1.jar
 metrics-jvm/4.1.1//metrics-jvm-4.1.1.jar
 osgi-resource-locator/1.0.3//osgi-resource-locator-1.0.3.jar
 paranamer/2.8//paranamer-2.8.jar
-scala-library/2.12.14//scala-library-2.12.14.jar
+scala-library/2.12.15//scala-library-2.12.15.jar
 scopt_2.12/4.0.1//scopt_2.12-4.0.1.jar
 simpleclient/0.10.0//simpleclient-0.10.0.jar
 simpleclient_common/0.10.0//simpleclient_common-0.10.0.jar
diff --git a/pom.xml b/pom.xml
index 5c363ecd1..6c85f98af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
         <maven.version>3.6.3</maven.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <scala.version>2.12.14</scala.version>
+        <scala.version>2.12.15</scala.version>
         <scala.binary.version>2.12</scala.binary.version>
 
         <antlr4.version>4.8</antlr4.version>
@@ -149,7 +149,7 @@
         <maven.plugin.jar.version>3.2.0</maven.plugin.jar.version>
         <maven.plugin.scalastyle.version>1.0.0</maven.plugin.scalastyle.version>
         <maven.plugin.shade.version>3.2.4</maven.plugin.shade.version>
-        <maven.plugin.silencer.version>1.7.5</maven.plugin.silencer.version>
+        <maven.plugin.silencer.version>1.7.6</maven.plugin.silencer.version>
         <maven.plugin.source.version>3.2.1</maven.plugin.source.version>
         <maven.plugin.rat.version>0.13</maven.plugin.rat.version>