You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by gu...@apache.org on 2018/07/02 14:09:52 UTC

spark git commit: [SPARK-24715][BUILD] Override jline version as 2.14.3 in SBT

Repository: spark
Updated Branches:
  refs/heads/master 8f91c697e -> 8008f9cb8


[SPARK-24715][BUILD] Override jline version as 2.14.3 in SBT

## What changes were proposed in this pull request?

During SPARK-24418 (Upgrade Scala to 2.11.12 and 2.12.6), we upgrade `jline` version together. So, `mvn` works correctly. However, `sbt` brings old jline library and is hitting `NoSuchMethodError` in `master` branch, see https://github.com/apache/spark/pull/21495#issuecomment-401560826. This overrides jline version in SBT to make sbt build work.

## How was this patch tested?

Manually test.

Author: Liang-Chi Hsieh <vi...@gmail.com>

Closes #21692 from viirya/SPARK-24715.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8008f9cb
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8008f9cb
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8008f9cb

Branch: refs/heads/master
Commit: 8008f9cb82e7c228b94eade2e7cb484d6d17e6a4
Parents: 8f91c69
Author: Liang-Chi Hsieh <vi...@gmail.com>
Authored: Mon Jul 2 22:09:47 2018 +0800
Committer: hyukjinkwon <gu...@apache.org>
Committed: Mon Jul 2 22:09:47 2018 +0800

----------------------------------------------------------------------
 project/SparkBuild.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/8008f9cb/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index b606f93..f887e45 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -464,7 +464,8 @@ object DockerIntegrationTests {
  */
 object DependencyOverrides {
   lazy val settings = Seq(
-    dependencyOverrides += "com.google.guava" % "guava" % "14.0.1")
+    dependencyOverrides += "com.google.guava" % "guava" % "14.0.1",
+    dependencyOverrides += "jline" % "jline" % "2.14.3")
 }
 
 /**


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org