Skip to content

Commit f2e998e

Browse files
committed
Revert "[HOTFIX] Revert "[SPARK-7092] Update spark scala version to 2.11.6""
This reverts commit 27fa88b.
1 parent 0bad052 commit f2e998e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1799,9 +1799,9 @@
17991799
<property><name>scala-2.11</name></property>
18001800
</activation>
18011801
<properties>
1802-
<scala.version>2.11.2</scala.version>
1802+
<scala.version>2.11.6</scala.version>
18031803
<scala.binary.version>2.11</scala.binary.version>
1804-
<jline.version>2.12</jline.version>
1804+
<jline.version>2.12.1</jline.version>
18051805
<jline.groupid>jline</jline.groupid>
18061806
</properties>
18071807
</profile>

repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,7 @@ class SparkIMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings
11291129

11301130
def apply(line: String): Result = debugging(s"""parse("$line")""") {
11311131
var isIncomplete = false
1132-
currentRun.reporting.withIncompleteHandler((_, _) => isIncomplete = true) {
1132+
currentRun.parsing.withIncompleteHandler((_, _) => isIncomplete = true) {
11331133
reporter.reset()
11341134
val trees = newUnitParser(line).parseStats()
11351135
if (reporter.hasErrors) Error

0 commit comments

Comments
 (0)