diff options
| author | Stefan Schulze <stefan.schulze@pentasys.de> | 2016-08-03 17:07:10 -0700 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2016-08-03 17:07:10 -0700 |
| commit | 4775eb414fa8285cfdc301e52dac52a2ef64c9e1 (patch) | |
| tree | 56ec7b936945366d35e5011e6230dfd691833ada /repl | |
| parent | 685b08e2611b69f8db60a00c0c94aecd315e2a3e (diff) | |
| download | spark-4775eb414fa8285cfdc301e52dac52a2ef64c9e1.tar.gz spark-4775eb414fa8285cfdc301e52dac52a2ef64c9e1.tar.bz2 spark-4775eb414fa8285cfdc301e52dac52a2ef64c9e1.zip | |
[SPARK-16770][BUILD] Fix JLine dependency management and version (Sca…
## What changes were proposed in this pull request?
As of Scala 2.11.x there is no longer a org.scala-lang:jline version aligned to the scala version itself. Scala console now uses the plain jline:jline module. Spark's dependency management did not reflect this change properly, causing Maven to pull in Jline via transitive dependency. Unfortunately Jline 2.12 contained a minor but very annoying bug rendering the shell almost useless for developers with german keyboard layout. This request contains the following chages:
- Exclude transitive dependency 'jline:jline' from hive-exec module
- Remove global properties 'jline.version' and 'jline.groupId'
- Add both properties and dependency to 'scala-2.11' profile
- Add explicit dependency on 'jline:jline' to module 'spark-repl'
## How was this patch tested?
- Running mvn dependency:tree and checking for correct Jline version 2.12.1
- Running full builds with assembly and checking for jline-2.12.1.jar in 'lib' folder of generated tarball
Author: Stefan Schulze <stefan.schulze@pentasys.de>
Closes #14429 from stsc-pentasys/SPARK-16770.
Diffstat (limited to 'repl')
| -rw-r--r-- | repl/pom.xml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/repl/pom.xml b/repl/pom.xml index 4e623a6ac1..73493e600e 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -71,6 +71,10 @@ <version>${scala.version}</version> </dependency> <dependency> + <groupId>${jline.groupid}</groupId> + <artifactId>jline</artifactId> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>jul-to-slf4j</artifactId> </dependency> @@ -160,13 +164,6 @@ <activation> <property><name>scala-2.10</name></property> </activation> - <dependencies> - <dependency> - <groupId>${jline.groupid}</groupId> - <artifactId>jline</artifactId> - <version>${jline.version}</version> - </dependency> - </dependencies> </profile> <profile> |