You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2016/03/31 21:14:22 UTC
spark git commit: [SPARK-13710][SHELL][WINDOWS] Fix jline dependency
on Windows
Repository: spark
Updated Branches:
refs/heads/master 10508f36a -> 3cfbeb70b
[SPARK-13710][SHELL][WINDOWS] Fix jline dependency on Windows
## What changes were proposed in this pull request?
Exclude jline from curator-recipes since it conflicts with scala 2.11 when running spark-shell. Should not affect scala 2.10 since it is builtin.
## How was this patch tested?
Ran spark-shell manually.
Author: Michel Lemay <ml...@gmail.com>
Closes #12043 from michellemay/spark-13710-fix-jline-on-windows.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3cfbeb70
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3cfbeb70
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3cfbeb70
Branch: refs/heads/master
Commit: 3cfbeb70b1feb1f3a8c4d0b2d2f3715a356c80f2
Parents: 10508f3
Author: Michel Lemay <ml...@gmail.com>
Authored: Thu Mar 31 12:15:32 2016 -0700
Committer: Sean Owen <so...@cloudera.com>
Committed: Thu Mar 31 12:15:32 2016 -0700
----------------------------------------------------------------------
pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/3cfbeb70/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9dab0bc..25d6136 100644
--- a/pom.xml
+++ b/pom.xml
@@ -733,6 +733,10 @@
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org