gistfile1.txt

diff --git a/project/Project.scala b/project/Project.scala
index 39f4ddd..d925db4 100644
--- a/project/Project.scala
+++ b/project/Project.scala
@@ -181,7 +181,7 @@ object Zipkin extends Build {
   ).settings(
     libraryDependencies ++= Seq(
       "play" %% "anorm" % "2.1-09142012",
-      "org.apache.commons" % "commons-dbcp2" % "2.1",
+      "com.zaxxer" % "HikariCP-java6" % "2.3.8",
       anormDriverDependencies("sqlite-persistent")
     ) ++ testDependencies,

diff --git a/zipkin-anormdb/src/main/scala/com/twitter/zipkin/storage/anormdb/DB.scala b/zipkin-anormdb/src/main/scala/com/twitter/zipkin/storage/anormdb/DB.scala
index 0bcd859..78b27cc 100644
--- a/zipkin-anormdb/src/main/scala/com/twitter/zipkin/storage/anormdb/DB.scala
+++ b/zipkin-anormdb/src/main/scala/com/twitter/zipkin/storage/anormdb/DB.scala
@@ -21,7 +21,7 @@ import anorm.SqlParser._
 import java.sql.{Blob, Connection, DriverManager, SQLException, SQLRecoverableException}
 import com.twitter.util.{Try, Return, Throw, Future}
 import AnormThreads.inNewThread
-import org.apache.commons.dbcp2.BasicDataSource
+import com.zaxxer.hikari.HikariDataSource

 /**
  * Provides SQL database access via Anorm from the Play framework.
@@ -38,10 +38,10 @@ case class DB(dbconfig: DBConfig = new DBConfig()) {
   if (dbconfig.install) this.install().close()

   // Initialize connection pool
-  private val connpool = new BasicDataSource()
+  private val connpool = new HikariDataSource()
   connpool.setDriverClassName(dbconfig.driver)
-  connpool.setUrl(dbconfig.location)
-  connpool.setMaxTotal(32)
+  connpool.setJdbcUrl(dbconfig.location)
+  connpool.setMaximumPoolSize(32)