From 06bf180abe210238541a9c631438cf73ffb72f4a Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Mon, 24 Feb 2020 10:05:32 +0000
Subject: [PATCH 1/5] Test the -Yrepl-class-based changes

---
 pom.xml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 925fa28a291a4..c864a983b6a75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
     <commons.math3.version>3.4.1</commons.math3.version>
     <!-- managed up from 3.2.1 for SPARK-11652 -->
     <commons.collections.version>3.2.2</commons.collections.version>
-    <scala.version>2.12.10</scala.version>
+    <scala.version>2.12.11-bin-4c726db</scala.version>
     <scala.binary.version>2.12</scala.binary.version>
     <scalafmt.parameters>--test</scalafmt.parameters>
     <!-- for now, not running scalafmt as part of default verify pipeline -->
@@ -3176,6 +3176,25 @@
       </repositories>
     </profile>
 
+    <profile>
+      <id>scala-integration</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <repositories>
+       <repository>
+          <id>scala-integration</id>
+          <url>https://scala-ci.typesafe.com/artifactory/scala-integration</url>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+        </repository>
+      </repositories>
+    </profile>
+
     <!--
       These empty profiles are available in some sub-modules. Declare them here so that
       maven does not complain when they're provided on the command line for a sub-module

From 9d8a475b07e256e322c2022468a6a9eb703a93c9 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Mon, 24 Feb 2020 10:45:23 +0000
Subject: [PATCH 2/5] Use the old Scala distribution

---
 build/mvn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/mvn b/build/mvn
index 3628be9880253..b171e2235fdd2 100755
--- a/build/mvn
+++ b/build/mvn
@@ -126,7 +126,7 @@ install_zinc() {
 install_scala() {
   # determine the Scala version used in Spark
   local scala_binary_version=`grep "scala.binary.version" "${_DIR}/../pom.xml" | head -n1 | awk -F '[<>]' '{print $3}'`
-  local scala_version=`grep "scala.version" "${_DIR}/../pom.xml" | grep ${scala_binary_version} | head -n1 | awk -F '[<>]' '{print $3}'`
+  local scala_version=2.12.10
   local scala_bin="${_DIR}/scala-${scala_version}/bin/scala"
   local TYPESAFE_MIRROR=${TYPESAFE_MIRROR:-https://downloads.lightbend.com}
 

From e0db7934686f63cb1233d657390d4e687aece409 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Mon, 24 Feb 2020 10:51:49 +0000
Subject: [PATCH 3/5] Help the scala-integration be used

---
 pom.xml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index c864a983b6a75..a7ecc1f209d44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -275,6 +275,16 @@
         <enabled>false</enabled>
       </snapshots>
     </repository>
+    <repository>
+       <id>scala-integration</id>
+       <url>https://scala-ci.typesafe.com/artifactory/scala-integration</url>
+       <releases>
+         <enabled>true</enabled>
+       </releases>
+       <snapshots>
+         <enabled>false</enabled>
+       </snapshots>
+     </repository>
   </repositories>
   <pluginRepositories>
     <pluginRepository>
@@ -3178,20 +3188,7 @@
 
     <profile>
       <id>scala-integration</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
       <repositories>
-       <repository>
-          <id>scala-integration</id>
-          <url>https://scala-ci.typesafe.com/artifactory/scala-integration</url>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-        </repository>
       </repositories>
     </profile>
 

From 7eaea976a6cd4b5195885479fe62345028ff84fe Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Mon, 24 Feb 2020 15:07:16 +0000
Subject: [PATCH 4/5] Bump scala version in dev/deps

---
 dev/deps/spark-deps-hadoop-2.7-hive-1.2 | 6 +++---
 dev/deps/spark-deps-hadoop-2.7-hive-2.3 | 6 +++---
 dev/deps/spark-deps-hadoop-3.2-hive-2.3 | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev/deps/spark-deps-hadoop-2.7-hive-1.2 b/dev/deps/spark-deps-hadoop-2.7-hive-1.2
index 534ac39e0c46e..9c4d78245a51f 100644
--- a/dev/deps/spark-deps-hadoop-2.7-hive-1.2
+++ b/dev/deps/spark-deps-hadoop-2.7-hive-1.2
@@ -177,10 +177,10 @@ protobuf-java/2.5.0//protobuf-java-2.5.0.jar
 py4j/0.10.8.1//py4j-0.10.8.1.jar
 pyrolite/4.30//pyrolite-4.30.jar
 scala-collection-compat_2.12/2.1.1//scala-collection-compat_2.12-2.1.1.jar
-scala-compiler/2.12.10//scala-compiler-2.12.10.jar
-scala-library/2.12.10//scala-library-2.12.10.jar
+scala-compiler/2.12.11-bin-4c726db//scala-compiler-2.12.11-bin-4c726db.jar
+scala-library/2.12.11-bin-4c726db//scala-library-2.12.11-bin-4c726db.jar
 scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar
-scala-reflect/2.12.10//scala-reflect-2.12.10.jar
+scala-reflect/2.12.11-bin-4c726db//scala-reflect-2.12.11-bin-4c726db.jar
 scala-xml_2.12/1.2.0//scala-xml_2.12-1.2.0.jar
 shapeless_2.12/2.3.3//shapeless_2.12-2.3.3.jar
 shims/0.7.45//shims-0.7.45.jar
diff --git a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 b/dev/deps/spark-deps-hadoop-2.7-hive-2.3
index c50cf96dc9065..08bc1a45d1b8e 100644
--- a/dev/deps/spark-deps-hadoop-2.7-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-2.7-hive-2.3
@@ -191,10 +191,10 @@ protobuf-java/2.5.0//protobuf-java-2.5.0.jar
 py4j/0.10.8.1//py4j-0.10.8.1.jar
 pyrolite/4.30//pyrolite-4.30.jar
 scala-collection-compat_2.12/2.1.1//scala-collection-compat_2.12-2.1.1.jar
-scala-compiler/2.12.10//scala-compiler-2.12.10.jar
-scala-library/2.12.10//scala-library-2.12.10.jar
+scala-compiler/2.12.11-bin-4c726db//scala-compiler-2.12.11-bin-4c726db.jar
+scala-library/2.12.11-bin-4c726db//scala-library-2.12.11-bin-4c726db.jar
 scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar
-scala-reflect/2.12.10//scala-reflect-2.12.10.jar
+scala-reflect/2.12.11-bin-4c726db//scala-reflect-2.12.11-bin-4c726db.jar
 scala-xml_2.12/1.2.0//scala-xml_2.12-1.2.0.jar
 shapeless_2.12/2.3.3//shapeless_2.12-2.3.3.jar
 shims/0.7.45//shims-0.7.45.jar
diff --git a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 b/dev/deps/spark-deps-hadoop-3.2-hive-2.3
index c37ce7fab36f6..c6a7f76b5a21f 100644
--- a/dev/deps/spark-deps-hadoop-3.2-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3.2-hive-2.3
@@ -207,10 +207,10 @@ py4j/0.10.8.1//py4j-0.10.8.1.jar
 pyrolite/4.30//pyrolite-4.30.jar
 re2j/1.1//re2j-1.1.jar
 scala-collection-compat_2.12/2.1.1//scala-collection-compat_2.12-2.1.1.jar
-scala-compiler/2.12.10//scala-compiler-2.12.10.jar
-scala-library/2.12.10//scala-library-2.12.10.jar
+scala-compiler/2.12.11-bin-4c726db//scala-compiler-2.12.11-bin-4c726db.jar
+scala-library/2.12.11-bin-4c726db//scala-library-2.12.11-bin-4c726db.jar
 scala-parser-combinators_2.12/1.1.2//scala-parser-combinators_2.12-1.1.2.jar
-scala-reflect/2.12.10//scala-reflect-2.12.10.jar
+scala-reflect/2.12.11-bin-4c726db//scala-reflect-2.12.11-bin-4c726db.jar
 scala-xml_2.12/1.2.0//scala-xml_2.12-1.2.0.jar
 shapeless_2.12/2.3.3//shapeless_2.12-2.3.3.jar
 shims/0.7.45//shims-0.7.45.jar

From cfc612dea33a2615de1fadbf848fb0fe9ebdafcc Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Fri, 28 Feb 2020 14:53:33 +0000
Subject: [PATCH 5/5] Add scala-integration to the sbt build too

---
 project/SparkBuild.scala | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 1c5c36ea8eae2..9baebd256ee96 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -228,6 +228,7 @@ object SparkBuild extends PomBuild {
       // See https://storage-download.googleapis.com/maven-central/index.html for more info.
       "gcs-maven-central-mirror" at "https://maven-central.storage-download.googleapis.com/repos/central/data/",
       DefaultMavenRepository,
+      "scala-integration" at "https://scala-ci.typesafe.com/artifactory/scala-integration/",
       Resolver.mavenLocal,
       Resolver.file("local", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns)
     ),