diff options
| author | Matei Zaharia <matei@databricks.com> | 2014-04-25 11:12:41 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2014-04-25 11:12:41 -0700 |
| commit | a24d918c71f6ac4adbe3ae363ef69f4658118938 (patch) | |
| tree | edfdceb390784baaf8ef9277fef66676e082b418 /project/SparkBuild.scala | |
| parent | dc3b640a0ab3501b678b591be3e99fbcf3badbec (diff) | |
| download | spark-a24d918c71f6ac4adbe3ae363ef69f4658118938.tar.gz spark-a24d918c71f6ac4adbe3ae363ef69f4658118938.tar.bz2 spark-a24d918c71f6ac4adbe3ae363ef69f4658118938.zip | |
SPARK-1621 Upgrade Chill to 0.3.6
It registers more Scala classes, including things like Ranges that we had to register manually before. See https://github.com/twitter/chill/releases for Chill's change log.
Author: Matei Zaharia <matei@databricks.com>
Closes #543 from mateiz/chill-0.3.6 and squashes the following commits:
a1dc5e0 [Matei Zaharia] Upgrade Chill to 0.3.6 and remove our special registration of Ranges
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 9cbc188c4d..48f234ce87 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -294,7 +294,7 @@ object SparkBuild extends Build { ) ++ net.virtualvoid.sbt.graph.Plugin.graphSettings ++ ScalaStyleSettings ++ genjavadocSettings val akkaVersion = "2.2.3-shaded-protobuf" - val chillVersion = "0.3.1" + val chillVersion = "0.3.6" val codahaleMetricsVersion = "3.0.0" val jblasVersion = "1.2.3" val jettyVersion = "8.1.14.v20131031" @@ -412,8 +412,8 @@ object SparkBuild extends Build { ) def examplesSettings = sharedSettings ++ Seq( - name := "spark-examples", - jarName in assembly <<= version map { + name := "spark-examples", + jarName in assembly <<= version map { v => "spark-examples-" + v + "-hadoop" + hadoopVersion + ".jar" }, libraryDependencies ++= Seq( "com.twitter" %% "algebird-core" % "0.1.11", |