spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sro...@apache.org
Subject spark git commit: [SPARK-16770][BUILD] Fix JLine dependency management and version (Sca…
Date Thu, 04 Aug 2016 00:07:19 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-2.0 b44da5b4e -> bb30a3d0f


[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.

(cherry picked from commit 4775eb414fa8285cfdc301e52dac52a2ef64c9e1)
Signed-off-by: Sean Owen <sowen@cloudera.com>


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

Branch: refs/heads/branch-2.0
Commit: bb30a3d0f4616c871016ba772515e9461a9048eb
Parents: b44da5b
Author: Stefan Schulze <stefan.schulze@pentasys.de>
Authored: Wed Aug 3 17:07:10 2016 -0700
Committer: Sean Owen <sowen@cloudera.com>
Committed: Wed Aug 3 17:07:16 2016 -0700

----------------------------------------------------------------------
 dev/deps/spark-deps-hadoop-2.2 |  2 +-
 dev/deps/spark-deps-hadoop-2.3 |  2 +-
 dev/deps/spark-deps-hadoop-2.4 |  2 +-
 dev/deps/spark-deps-hadoop-2.6 |  2 +-
 dev/deps/spark-deps-hadoop-2.7 |  2 +-
 pom.xml                        | 22 +++++++++++-----------
 repl/pom.xml                   | 11 ++++-------
 7 files changed, 20 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/bb30a3d0/dev/deps/spark-deps-hadoop-2.2
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2
index e1d4051..f4a39ab 100644
--- a/dev/deps/spark-deps-hadoop-2.2
+++ b/dev/deps/spark-deps-hadoop-2.2
@@ -98,7 +98,7 @@ jersey-media-jaxb-2.22.2.jar
 jersey-server-2.22.2.jar
 jets3t-0.7.1.jar
 jetty-util-6.1.26.jar
-jline-2.12.jar
+jline-2.12.1.jar
 joda-time-2.9.3.jar
 jodd-core-3.5.2.jar
 jpam-1.1.jar

http://git-wip-us.apache.org/repos/asf/spark/blob/bb30a3d0/dev/deps/spark-deps-hadoop-2.3
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3
index 78d9333..ba93f90 100644
--- a/dev/deps/spark-deps-hadoop-2.3
+++ b/dev/deps/spark-deps-hadoop-2.3
@@ -103,7 +103,7 @@ jersey-server-2.22.2.jar
 jets3t-0.9.3.jar
 jetty-6.1.26.jar
 jetty-util-6.1.26.jar
-jline-2.12.jar
+jline-2.12.1.jar
 joda-time-2.9.3.jar
 jodd-core-3.5.2.jar
 jpam-1.1.jar

http://git-wip-us.apache.org/repos/asf/spark/blob/bb30a3d0/dev/deps/spark-deps-hadoop-2.4
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4
index abc644d..19459b6 100644
--- a/dev/deps/spark-deps-hadoop-2.4
+++ b/dev/deps/spark-deps-hadoop-2.4
@@ -103,7 +103,7 @@ jersey-server-2.22.2.jar
 jets3t-0.9.3.jar
 jetty-6.1.26.jar
 jetty-util-6.1.26.jar
-jline-2.12.jar
+jline-2.12.1.jar
 joda-time-2.9.3.jar
 jodd-core-3.5.2.jar
 jpam-1.1.jar

http://git-wip-us.apache.org/repos/asf/spark/blob/bb30a3d0/dev/deps/spark-deps-hadoop-2.6
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6
index 10ecd48..f7022a1 100644
--- a/dev/deps/spark-deps-hadoop-2.6
+++ b/dev/deps/spark-deps-hadoop-2.6
@@ -111,7 +111,7 @@ jersey-server-2.22.2.jar
 jets3t-0.9.3.jar
 jetty-6.1.26.jar
 jetty-util-6.1.26.jar
-jline-2.12.jar
+jline-2.12.1.jar
 joda-time-2.9.3.jar
 jodd-core-3.5.2.jar
 jpam-1.1.jar

http://git-wip-us.apache.org/repos/asf/spark/blob/bb30a3d0/dev/deps/spark-deps-hadoop-2.7
----------------------------------------------------------------------
diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7
index e84689f..36f0fa5 100644
--- a/dev/deps/spark-deps-hadoop-2.7
+++ b/dev/deps/spark-deps-hadoop-2.7
@@ -111,7 +111,7 @@ jersey-server-2.22.2.jar
 jets3t-0.9.3.jar
 jetty-6.1.26.jar
 jetty-util-6.1.26.jar
-jline-2.12.jar
+jline-2.12.1.jar
 joda-time-2.9.3.jar
 jodd-core-3.5.2.jar
 jpam-1.1.jar

http://git-wip-us.apache.org/repos/asf/spark/blob/bb30a3d0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 910f1a8..ded5963 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,8 +159,6 @@
     <commons.collections.version>3.2.2</commons.collections.version>
     <scala.version>2.11.8</scala.version>
     <scala.binary.version>2.11</scala.binary.version>
-    <jline.version>${scala.version}</jline.version>
-    <jline.groupid>org.scala-lang</jline.groupid>
     <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
     <fasterxml.jackson.version>2.6.5</fasterxml.jackson.version>
     <snappy.version>1.1.2.4</snappy.version>
@@ -1428,6 +1426,10 @@
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>jline</groupId>
+            <artifactId>jline</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -1832,6 +1834,11 @@
         <artifactId>antlr4-runtime</artifactId>
         <version>${antlr4.version}</version>
       </dependency>
+      <dependency>
+        <groupId>${jline.groupid}</groupId>
+        <artifactId>jline</artifactId>
+        <version>${jline.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -2537,15 +2544,6 @@
         <jline.version>${scala.version}</jline.version>
         <jline.groupid>org.scala-lang</jline.groupid>
       </properties>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>${jline.groupid}</groupId>
-            <artifactId>jline</artifactId>
-            <version>${jline.version}</version>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
       <build>
         <plugins>
           <plugin>
@@ -2644,6 +2642,8 @@
       <properties>
         <scala.version>2.11.8</scala.version>
         <scala.binary.version>2.11</scala.binary.version>
+        <jline.version>2.12.1</jline.version>
+        <jline.groupid>jline</jline.groupid>
       </properties>
       <build>
         <plugins>

http://git-wip-us.apache.org/repos/asf/spark/blob/bb30a3d0/repl/pom.xml
----------------------------------------------------------------------
diff --git a/repl/pom.xml b/repl/pom.xml
index 0b5ec1a..6fe1d7d 100644
--- a/repl/pom.xml
+++ b/repl/pom.xml
@@ -72,6 +72,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>
@@ -161,13 +165,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>


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


Mime
View raw message