diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2015-04-25 18:07:34 -0400 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2015-04-25 18:07:34 -0400 |
| commit | a11c8683c76c67f45749a1b50a0912a731fd2487 (patch) | |
| tree | 73f4a9adb583ae840be3ebdc4e0cbeb8229213a2 | |
| parent | aa6966ff34dacc83c3ca675b5109b05e35015469 (diff) | |
| download | spark-a11c8683c76c67f45749a1b50a0912a731fd2487.tar.gz spark-a11c8683c76c67f45749a1b50a0912a731fd2487.tar.bz2 spark-a11c8683c76c67f45749a1b50a0912a731fd2487.zip | |
[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
| -rw-r--r-- | pom.xml | 4 | ||||
| -rw-r--r-- | repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -1745,9 +1745,9 @@ <property><name>scala-2.11</name></property> </activation> <properties> - <scala.version>2.11.2</scala.version> + <scala.version>2.11.6</scala.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> </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 1bb62c84ab..1cb910f376 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.reporting.withIncompleteHandler((_, _) => isIncomplete = true) { + currentRun.parsing.withIncompleteHandler((_, _) => isIncomplete = true) { reporter.reset() val trees = newUnitParser(line).parseStats() if (reporter.hasErrors) Error |