From 27fa88b9ba320cd0d95703aa3437151ba7c86f98 Mon Sep 17 00:00:00 2001
From: Patrick Wendell <patrick@databricks.com>
Date: Tue, 19 May 2015 02:28:41 -0700
Subject: [PATCH] [HOTFIX] Revert "[SPARK-7092] Update spark scala version to
2.11.6"
This reverts commit a11c8683c76c67f45749a1b50a0912a731fd2487.
For more information see:
https://issues.apache.org/jira/browse/SPARK-7726
---
pom.xml | 4 ++--
.../src/main/scala/org/apache/spark/repl/SparkIMain.scala | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index c72d7cbf84..d903f02c1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1799,9 +1799,9 @@
<property><name>scala-2.11</name></property>
</activation>
<properties>
- <scala.version>2.11.6</scala.version>
+ <scala.version>2.11.2</scala.version>
<scala.binary.version>2.11</scala.binary.version>
- <jline.version>2.12.1</jline.version>
+ <jline.version>2.12</jline.version>
<jline.groupid>jline</jline.groupid>
</properties>
</profile>
diff --git a/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala b/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala
index 1cb910f376..1bb62c84ab 100644
--- a/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala
+++ b/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala
@@ -1129,7 +1129,7 @@ class SparkIMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings
def apply(line: String): Result = debugging(s"""parse("$line")""") {
var isIncomplete = false
- currentRun.parsing.withIncompleteHandler((_, _) => isIncomplete = true) {
+ currentRun.reporting.withIncompleteHandler((_, _) => isIncomplete = true) {
reporter.reset()
val trees = newUnitParser(line).parseStats()
if (reporter.hasErrors) Error
--
GitLab