aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2013-07-06 19:51:20 -0700
committerMatei Zaharia <matei@eecs.berkeley.edu>2013-07-06 19:51:20 -0700
commit3cc6818f138371c279277e4bf733402a43cc40f6 (patch)
tree9ea20a92af05fe98f7e9fa6367c5a50b514cde14 /project
parentebe1efc8620591ac1f01d4337988bb55c48246fe (diff)
parent04567a1771ec02e1efcc3ce078291a975fbb4e68 (diff)
downloadspark-3cc6818f138371c279277e4bf733402a43cc40f6.tar.gz
spark-3cc6818f138371c279277e4bf733402a43cc40f6.tar.bz2
spark-3cc6818f138371c279277e4bf733402a43cc40f6.zip
Merge pull request #668 from shimingfei/guava-14.0.1
update guava version from 11.0.1 to 14.0.1
Diffstat (limited to 'project')
-rw-r--r--project/SparkBuild.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 700fa4c250..641d379749 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -143,7 +143,8 @@ object SparkBuild extends Build {
),
libraryDependencies ++= Seq(
- "com.google.guava" % "guava" % "11.0.1",
+ "com.google.guava" % "guava" % "14.0.1",
+ "com.google.code.findbugs" % "jsr305" % "1.3.+",
"log4j" % "log4j" % "1.2.16",
"org.slf4j" % "slf4j-api" % slf4jVersion,
"org.slf4j" % "slf4j-log4j12" % slf4jVersion,