Skip to content
Snippets Groups Projects
Commit a11c8683 authored by Prashant Sharma's avatar Prashant Sharma Committed by Sean Owen
Browse files

[SPARK-7092] Update spark scala version to 2.11.6

Author: Prashant Sharma <prashant.s@imaginea.com>

Closes #5662 from ScrapCodes/SPARK-7092/scala-update-2.11.6 and squashes the following commits:

58cf4f9 [Prashant Sharma] [SPARK-7092] Update spark scala version to 2.11.6
parent aa6966ff
No related branches found
No related tags found
No related merge requests found
...@@ -1745,9 +1745,9 @@ ...@@ -1745,9 +1745,9 @@
<property><name>scala-2.11</name></property> <property><name>scala-2.11</name></property>
</activation> </activation>
<properties> <properties>
<scala.version>2.11.2</scala.version> <scala.version>2.11.6</scala.version>
<scala.binary.version>2.11</scala.binary.version> <scala.binary.version>2.11</scala.binary.version>
<jline.version>2.12</jline.version> <jline.version>2.12.1</jline.version>
<jline.groupid>jline</jline.groupid> <jline.groupid>jline</jline.groupid>
</properties> </properties>
</profile> </profile>
......
...@@ -1129,7 +1129,7 @@ class SparkIMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings ...@@ -1129,7 +1129,7 @@ class SparkIMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings
def apply(line: String): Result = debugging(s"""parse("$line")""") { def apply(line: String): Result = debugging(s"""parse("$line")""") {
var isIncomplete = false var isIncomplete = false
currentRun.reporting.withIncompleteHandler((_, _) => isIncomplete = true) { currentRun.parsing.withIncompleteHandler((_, _) => isIncomplete = true) {
reporter.reset() reporter.reset()
val trees = newUnitParser(line).parseStats() val trees = newUnitParser(line).parseStats()
if (reporter.hasErrors) Error if (reporter.hasErrors) Error
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment