From a2ccbf221a8ef65f3db85c106cfcc488995d9768 Mon Sep 17 00:00:00 2001
From: Sean Owen <sowen@cloudera.com>
Date: Mon, 30 Oct 2017 19:38:54 +0000
Subject: [PATCH 1/2] Spark REPL changes for Scala 2.12.4: use command(), not
 processLine() in ILoop; remove direct dependence on older jline

---
 pom.xml                                             |  5 -----
 repl/pom.xml                                        |  4 ----
 .../scala/org/apache/spark/repl/SparkILoop.scala    | 13 +++++--------
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2d59f06811a8..3f0b1724fcc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1920,11 +1920,6 @@
         <artifactId>antlr4-runtime</artifactId>
         <version>${antlr4.version}</version>
       </dependency>
-      <dependency>
-        <groupId>jline</groupId>
-        <artifactId>jline</artifactId>
-        <version>2.12.1</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-crypto</artifactId>
diff --git a/repl/pom.xml b/repl/pom.xml
index bd2cfc465aaf..1cb0098d0eca 100644
--- a/repl/pom.xml
+++ b/repl/pom.xml
@@ -69,10 +69,6 @@
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-reflect</artifactId>
       <version>${scala.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>jline</groupId>
-      <artifactId>jline</artifactId>
     </dependency>
      <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/repl/scala-2.12/src/main/scala/org/apache/spark/repl/SparkILoop.scala b/repl/scala-2.12/src/main/scala/org/apache/spark/repl/SparkILoop.scala
index 413594021987..900edd63cb90 100644
--- a/repl/scala-2.12/src/main/scala/org/apache/spark/repl/SparkILoop.scala
+++ b/repl/scala-2.12/src/main/scala/org/apache/spark/repl/SparkILoop.scala
@@ -19,9 +19,6 @@ package org.apache.spark.repl
 
 import java.io.BufferedReader
 
-// scalastyle:off println
-import scala.Predef.{println => _, _}
-// scalastyle:on println
 import scala.tools.nsc.Settings
 import scala.tools.nsc.interpreter.{ILoop, JPrintWriter}
 import scala.tools.nsc.util.stringFromStream
@@ -37,7 +34,7 @@ class SparkILoop(in0: Option[BufferedReader], out: JPrintWriter)
 
   def initializeSpark() {
     intp.beQuietDuring {
-      processLine("""
+      command("""
         @transient val spark = if (org.apache.spark.repl.Main.sparkSession != null) {
             org.apache.spark.repl.Main.sparkSession
           } else {
@@ -64,10 +61,10 @@ class SparkILoop(in0: Option[BufferedReader], out: JPrintWriter)
           _sc
         }
         """)
-      processLine("import org.apache.spark.SparkContext._")
-      processLine("import spark.implicits._")
-      processLine("import spark.sql")
-      processLine("import org.apache.spark.sql.functions._")
+      command("import org.apache.spark.SparkContext._")
+      command("import spark.implicits._")
+      command("import spark.sql")
+      command("import org.apache.spark.sql.functions._")
     }
   }
 

From e4f528209a9b580e3e214dae32648c7709f9f79f Mon Sep 17 00:00:00 2001
From: Sean Owen <sowen@cloudera.com>
Date: Mon, 30 Oct 2017 20:14:26 +0000
Subject: [PATCH 2/2] Still manage up jline version for SPARK-16770 in 2.11

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

diff --git a/pom.xml b/pom.xml
index 3f0b1724fcc8..9e928196c073 100644
--- a/pom.xml
+++ b/pom.xml
@@ -730,6 +730,12 @@
         <artifactId>scalap</artifactId>
         <version>${scala.version}</version>
       </dependency>
+      <!-- SPARK-16770 affecting Scala 2.11.x -->
+      <dependency>
+        <groupId>jline</groupId>
+        <artifactId>jline</artifactId>
+        <version>2.12.1</version>
+      </dependency>
       <dependency>
         <groupId>org.scalatest</groupId>
         <artifactId>scalatest_${scala.binary.version}</artifactId>
@@ -1183,6 +1189,10 @@
             <groupId>org.jboss.netty</groupId>
             <artifactId>netty</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>jline</groupId>
+            <artifactId>jline</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>