Skip to content

Commit aa9084a

Browse files
committed
Bump to 1.0.10-2.1.1-rc2 and add explicit jline/jackson version to avoid conflicts
1 parent f5ae723 commit aa9084a

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

assembly/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>com.hortonworks.spark</groupId>
66
<artifactId>spark-llap-assembly_2.11</artifactId>
77
<packaging>pom</packaging>
8-
<version>1.0.9-2.1.1-rc2</version>
8+
<version>1.0.10-2.1.1-rc2</version>
99
<name>spark-llap-assembly_2.11</name>
1010
<url>https://github.com/hortonworks-spark/spark-llap</url>
1111

@@ -21,7 +21,7 @@
2121
<dependency>
2222
<groupId>com.hortonworks.spark</groupId>
2323
<artifactId>spark-llap_2.11</artifactId>
24-
<version>1.0.9-2.1.1-rc2</version>
24+
<version>1.0.10-2.1.1-rc2</version>
2525
<exclusions>
2626
<exclusion>
2727
<groupId>org.apache.hadoop</groupId>

build.sbt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
name := "spark-llap"
3-
version := "1.0.9-2.1.1-rc2"
3+
version := "1.0.10-2.1.1-rc2"
44
organization := "com.hortonworks.spark"
55
scalaVersion := "2.11.8"
66
val scalatestVersion = "2.2.6"
@@ -30,6 +30,8 @@ libraryDependencies ++= Seq(
3030
"org.apache.spark" %% "spark-catalyst" % testSparkVersion.value % "provided" force(),
3131
"org.apache.spark" %% "spark-sql" % testSparkVersion.value % "provided" force(),
3232
"org.apache.spark" %% "spark-hive" % testSparkVersion.value % "provided" force(),
33+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.6.5" % "compile",
34+
"jline" % "jline" % "2.12.1" % "compile",
3335

3436
"org.scala-lang" % "scala-library" % scalaVersion.value % "compile",
3537
"org.scalatest" %% "scalatest" % scalatestVersion % "test",

project/plugins.sbt

+2
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")
99
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
1010

1111
addSbtPlugin("org.spark-project" %% "sbt-pom-reader" % "1.0.0-spark")
12+
13+
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")

0 commit comments

Comments
 (0)