Skip to content

Commit 4775eb4

Browse files
stsc-pentasyssrowen
authored andcommitted
[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.
1 parent 685b08e commit 4775eb4

File tree

7 files changed

+20
-23
lines changed

7 files changed

+20
-23
lines changed

dev/deps/spark-deps-hadoop-2.2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jersey-media-jaxb-2.22.2.jar
9898
jersey-server-2.22.2.jar
9999
jets3t-0.7.1.jar
100100
jetty-util-6.1.26.jar
101-
jline-2.12.jar
101+
jline-2.12.1.jar
102102
joda-time-2.9.3.jar
103103
jodd-core-3.5.2.jar
104104
jpam-1.1.jar

dev/deps/spark-deps-hadoop-2.3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jersey-server-2.22.2.jar
103103
jets3t-0.9.3.jar
104104
jetty-6.1.26.jar
105105
jetty-util-6.1.26.jar
106-
jline-2.12.jar
106+
jline-2.12.1.jar
107107
joda-time-2.9.3.jar
108108
jodd-core-3.5.2.jar
109109
jpam-1.1.jar

dev/deps/spark-deps-hadoop-2.4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jersey-server-2.22.2.jar
103103
jets3t-0.9.3.jar
104104
jetty-6.1.26.jar
105105
jetty-util-6.1.26.jar
106-
jline-2.12.jar
106+
jline-2.12.1.jar
107107
joda-time-2.9.3.jar
108108
jodd-core-3.5.2.jar
109109
jpam-1.1.jar

dev/deps/spark-deps-hadoop-2.6

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jersey-server-2.22.2.jar
111111
jets3t-0.9.3.jar
112112
jetty-6.1.26.jar
113113
jetty-util-6.1.26.jar
114-
jline-2.12.jar
114+
jline-2.12.1.jar
115115
joda-time-2.9.3.jar
116116
jodd-core-3.5.2.jar
117117
jpam-1.1.jar

dev/deps/spark-deps-hadoop-2.7

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jersey-server-2.22.2.jar
111111
jets3t-0.9.3.jar
112112
jetty-6.1.26.jar
113113
jetty-util-6.1.26.jar
114-
jline-2.12.jar
114+
jline-2.12.1.jar
115115
joda-time-2.9.3.jar
116116
jodd-core-3.5.2.jar
117117
jpam-1.1.jar

pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,6 @@
159159
<commons.collections.version>3.2.2</commons.collections.version>
160160
<scala.version>2.11.8</scala.version>
161161
<scala.binary.version>2.11</scala.binary.version>
162-
<jline.version>${scala.version}</jline.version>
163-
<jline.groupid>org.scala-lang</jline.groupid>
164162
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
165163
<fasterxml.jackson.version>2.6.5</fasterxml.jackson.version>
166164
<snappy.version>1.1.2.4</snappy.version>
@@ -1428,6 +1426,10 @@
14281426
<groupId>org.codehaus.groovy</groupId>
14291427
<artifactId>groovy-all</artifactId>
14301428
</exclusion>
1429+
<exclusion>
1430+
<groupId>jline</groupId>
1431+
<artifactId>jline</artifactId>
1432+
</exclusion>
14311433
</exclusions>
14321434
</dependency>
14331435
<dependency>
@@ -1832,6 +1834,11 @@
18321834
<artifactId>antlr4-runtime</artifactId>
18331835
<version>${antlr4.version}</version>
18341836
</dependency>
1837+
<dependency>
1838+
<groupId>${jline.groupid}</groupId>
1839+
<artifactId>jline</artifactId>
1840+
<version>${jline.version}</version>
1841+
</dependency>
18351842
</dependencies>
18361843
</dependencyManagement>
18371844

@@ -2538,15 +2545,6 @@
25382545
<jline.version>${scala.version}</jline.version>
25392546
<jline.groupid>org.scala-lang</jline.groupid>
25402547
</properties>
2541-
<dependencyManagement>
2542-
<dependencies>
2543-
<dependency>
2544-
<groupId>${jline.groupid}</groupId>
2545-
<artifactId>jline</artifactId>
2546-
<version>${jline.version}</version>
2547-
</dependency>
2548-
</dependencies>
2549-
</dependencyManagement>
25502548
<build>
25512549
<plugins>
25522550
<plugin>
@@ -2645,6 +2643,8 @@
26452643
<properties>
26462644
<scala.version>2.11.8</scala.version>
26472645
<scala.binary.version>2.11</scala.binary.version>
2646+
<jline.version>2.12.1</jline.version>
2647+
<jline.groupid>jline</jline.groupid>
26482648
</properties>
26492649
<build>
26502650
<plugins>

repl/pom.xml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@
7171
<version>${scala.version}</version>
7272
</dependency>
7373
<dependency>
74+
<groupId>${jline.groupid}</groupId>
75+
<artifactId>jline</artifactId>
76+
</dependency>
77+
<dependency>
7478
<groupId>org.slf4j</groupId>
7579
<artifactId>jul-to-slf4j</artifactId>
7680
</dependency>
@@ -160,13 +164,6 @@
160164
<activation>
161165
<property><name>scala-2.10</name></property>
162166
</activation>
163-
<dependencies>
164-
<dependency>
165-
<groupId>${jline.groupid}</groupId>
166-
<artifactId>jline</artifactId>
167-
<version>${jline.version}</version>
168-
</dependency>
169-
</dependencies>
170167
</profile>
171168

172169
<profile>

0 commit comments

Comments
 (0)