diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2013-07-15 11:15:55 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-07-15 11:15:55 +0530 |
| commit | a3494d405d4c54b672711dfbee0c7d5d688e96d8 (patch) | |
| tree | 2f17e0c477786732dfef85e36b1e059196b21b15 /project/SparkBuild.scala | |
| parent | a220e11a07eb56fade8d0573503b58ce659fda54 (diff) | |
| parent | 4698a0d6886905ef21cbd52e108d0dcab3df12df (diff) | |
| download | spark-a3494d405d4c54b672711dfbee0c7d5d688e96d8.tar.gz spark-a3494d405d4c54b672711dfbee0c7d5d688e96d8.tar.bz2 spark-a3494d405d4c54b672711dfbee0c7d5d688e96d8.zip | |
Merge branch 'master' of github.com:mesos/spark into scala-2.10
Conflicts:
core/src/main/scala/spark/Utils.scala
core/src/test/scala/spark/ui/UISuite.scala
project/SparkBuild.scala
run
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index bb2a97837c..d7cd337fa4 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -143,13 +143,12 @@ object SparkBuild extends Build { libraryDependencies ++= Seq( "com.google.guava" % "guava" % "14.0.1", - "com.google.code.findbugs" % "jsr305" % "1.3.+", + "com.google.code.findbugs" % "jsr305" % "1.3.9", "log4j" % "log4j" % "1.2.16", "org.slf4j" % "slf4j-api" % slf4jVersion, "org.slf4j" % "slf4j-log4j12" % slf4jVersion, "com.ning" % "compress-lzf" % "0.8.4", "commons-daemon" % "commons-daemon" % "1.0.10", - "org.apache.hadoop" % "hadoop-core" % HADOOP_VERSION excludeAll(excludeNetty, excludeJackson), "org.ow2.asm" % "asm" % "4.0", "com.google.protobuf" % "protobuf-java" % "2.4.1", "de.javakaffee" % "kryo-serializers" % "0.22", @@ -197,7 +196,7 @@ object SparkBuild extends Build { def replSettings = sharedSettings ++ Seq( name := "spark-repl", libraryDependencies ++= Seq("org.scala-lang" % "scala-compiler" % "2.10.1") - ) + ) ++ assemblySettings ++ extraAssemblySettings def examplesSettings = sharedSettings ++ Seq( name := "spark-examples", |