From 57c408498773a83148a450a978c323bef48672b1 Mon Sep 17 00:00:00 2001
From: Yuming Wang <yumwang@ebay.com>
Date: Thu, 19 Sep 2019 08:44:30 +0800
Subject: [PATCH] Upgrade scala to 2.12.10

---
 docs/_config.yml                                                | 2 +-
 pom.xml                                                         | 2 +-
 project/SparkBuild.scala                                        | 2 +-
 .../scala/org/apache/spark/sql/catalyst/ScalaReflection.scala   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/_config.yml b/docs/_config.yml
index ccc83d7c65a4..6818c50d4bb9 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -17,7 +17,7 @@ include:
 SPARK_VERSION: 2.4.5-SNAPSHOT
 SPARK_VERSION_SHORT: 2.4.5
 SCALA_BINARY_VERSION: "2.12"
-SCALA_VERSION: "2.12.8"
+SCALA_VERSION: "2.12.10"
 MESOS_VERSION: 1.0.0
 SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK
 SPARK_GITHUB_URL: https://github.com/apache/spark
diff --git a/pom.xml b/pom.xml
index 83342c8a3eba..765d701d83a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2796,7 +2796,7 @@
     <profile>
       <id>scala-2.12</id>
       <properties>
-        <scala.version>2.12.8</scala.version>
+        <scala.version>2.12.10</scala.version>
         <scala.binary.version>2.12</scala.binary.version>
       </properties>
       <build>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 341f0466b45c..56b27fab765a 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -218,7 +218,7 @@ object SparkBuild extends PomBuild {
       .map(file),
     incOptions := incOptions.value.withNameHashing(true),
     publishMavenStyle := true,
-    unidocGenjavadocVersion := "0.11",
+    unidocGenjavadocVersion := "0.14",
 
     // Override SBT's default resolvers:
     resolvers := Seq(
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala
index 1b186bf0accd..858c33ac725b 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala
@@ -74,7 +74,7 @@ object ScalaReflection extends ScalaReflection {
   /**
    * Synchronize to prevent concurrent usage of `<:<` operator.
    * This operator is not thread safe in any current version of scala; i.e.
-   * (2.11.12, 2.12.8, 2.13.0-M5).
+   * (2.11.12, 2.12.10, 2.13.0-M5).
    *
    * See https://github.com/scala/bug/issues/10766
    */