Merge pull request #110 from tumblr/dallas-upgrade-bonecp

upgrade bonecp
tumblr · Dec 19, 2013 · 50a2099 · 50a2099
2 parents ce1afdf + 7201544
commit 50a2099
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/build.sbt b/build.sbt
@@ -11,8 +11,10 @@ parallelExecution in IntegrationTest := false
 libraryDependencies ++= Seq(
   "org.specs2" %% "specs2" % "1.7.1" % "test",
   "org.mockito" % "mockito-all" % "1.9.0" % "test",
-  "com.google.guava" % "guava" % "11.0.2",
   "com.yammer.metrics" %% "metrics-scala" % "2.1.1",
+  "com.google.guava" % "guava" % "15.0",
+  "com.google.code.findbugs" % "jsr305" % "1.3.9",
+  "com.jolbox" % "bonecp" % "0.8.0.RELEASE",
   "mysql" % "mysql-connector-java" % "5.1.19",
   "com.h2database" % "h2" % "1.3.158",
   "org.apache.solr" % "solr-solrj" % "3.6.1",