diff options
| -rw-r--r-- | dev/deps/spark-deps-hadoop-2.2 | 2 | ||||
| -rw-r--r-- | dev/deps/spark-deps-hadoop-2.3 | 2 | ||||
| -rw-r--r-- | dev/deps/spark-deps-hadoop-2.4 | 2 | ||||
| -rw-r--r-- | dev/deps/spark-deps-hadoop-2.6 | 2 | ||||
| -rw-r--r-- | dev/deps/spark-deps-hadoop-2.7 | 2 | ||||
| -rw-r--r-- | pom.xml | 22 | ||||
| -rw-r--r-- | repl/pom.xml | 11 |
7 files changed, 20 insertions, 23 deletions
diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2 index d0771e1ac8..e2433bd718 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 ef97ffd9ab..51eaec5e6a 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 fba3c18b14..43c85fabfd 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 9747acda81..93f68f3f9e 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 7231bcaf6c..9740fc8d59 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 @@ -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> @@ -2538,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> @@ -2645,6 +2643,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> 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> |