Repository: spark Updated Branches: refs/heads/branch-1.4 586ede6b3 -> 31f5d53e9
[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 Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/31f5d53e Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/31f5d53e Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/31f5d53e Branch: refs/heads/branch-1.4 Commit: 31f5d53e9efea3c9728a51fe65e8baa589ddfa6f Parents: 586ede6 Author: Patrick Wendell <patr...@databricks.com> Authored: Tue May 19 02:28:41 2015 -0700 Committer: Patrick Wendell <patr...@databricks.com> Committed: Tue May 19 02:28:41 2015 -0700 ---------------------------------------------------------------------- pom.xml | 4 ++-- .../src/main/scala/org/apache/spark/repl/SparkIMain.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/31f5d53e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6f525b6..68edf03 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> http://git-wip-us.apache.org/repos/asf/spark/blob/31f5d53e/repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala ---------------------------------------------------------------------- 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 1cb910f..1bb62c8 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 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
