From e4bf237ed43461897beb00211de2d10321fe40b1 Mon Sep 17 00:00:00 2001
From: Stefan Schulze <stefan.schulze@pentasys.de>
Date: Sun, 31 Jul 2016 14:59:55 +0200
Subject: [PATCH 1/3] [SPARK-16770][BUILD] Fix JLine dependency management and
 version (Scala 2.11.x)

---
 pom.xml      | 17 +++++++++++++++--
 repl/pom.xml |  4 ++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0491e981d585..b17b49083d49 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>
@@ -2645,7 +2647,18 @@
       <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>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>${jline.groupid}</groupId>
+            <artifactId>jline</artifactId>
+            <version>${jline.version}</version>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
       <build>
         <plugins>
           <plugin>
diff --git a/repl/pom.xml b/repl/pom.xml
index 4e623a6ac1f1..545c514c69cb 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>

From c925a3fb8ab98d33e6efeacb4d762dc9194346f9 Mon Sep 17 00:00:00 2001
From: Stefan Schulze <stefan.schulze@pentasys.de>
Date: Sun, 31 Jul 2016 16:50:36 +0200
Subject: [PATCH 2/3] [SPARK-16770][BUILD] Update Jline version in dev/deps/*

---
 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 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2
index d0771e1ac85f..e2433bd71822 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
diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3
index ef97ffd9ab31..51eaec5e6ae5 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
diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4
index fba3c18b1449..43c85fabfd48 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
diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6
index 9747acda8170..93f68f3f9e3f 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
diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7
index 7231bcaf6c30..9740fc8d5969 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

From 35cc6c3f62ff9895f2786df73c56f46ba890497a Mon Sep 17 00:00:00 2001
From: Stefan Schulze <stefan.schulze@pentasys.de>
Date: Wed, 3 Aug 2016 21:47:47 +0200
Subject: [PATCH 3/3] [SPARK-16770][BUILD] Move jline to dependencyManagement
 section

---
 pom.xml      | 23 +++++------------------
 repl/pom.xml |  7 -------
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index b17b49083d49..989658216e5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1834,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>
 
@@ -2540,15 +2545,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>
@@ -2650,15 +2646,6 @@
         <jline.version>2.12.1</jline.version>
         <jline.groupid>jline</jline.groupid>
       </properties>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>${jline.groupid}</groupId>
-            <artifactId>jline</artifactId>
-            <version>${jline.version}</version>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
       <build>
         <plugins>
           <plugin>
diff --git a/repl/pom.xml b/repl/pom.xml
index 545c514c69cb..73493e600e54 100644
--- a/repl/pom.xml
+++ b/repl/pom.xml
@@ -164,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>