Permalink
Browse files

break with scala 2.7, upgrate twitter.util

  • Loading branch information...
1 parent 7feb02f commit e6769e6b45ae6004f17c800988afc141f15ae5bb @freels freels committed Feb 16, 2011
View
@@ -3,6 +3,6 @@
project.organization=com.twitter
project.name=querulous
sbt.version=0.7.4
-project.version=1.5.5-SNAPSHOT
-build.scala.versions=2.7.7 2.8.0
+project.version=2.0.0-SNAPSHOT
+build.scala.versions=2.8.0
project.initialize=false
@@ -2,32 +2,20 @@ import sbt._
import Process._
import com.twitter.sbt._
-class QuerulousProject(info: ProjectInfo) extends StandardProject(info) with SubversionPublisher with InlineDependencies {
- val hamcrest = "org.hamcrest" % "hamcrest-all" % "1.1" % "test"
- val specs = buildScalaVersion match {
- case "2.7.7" => "org.scala-tools.testing" % "specs" % "1.6.2.1" % "test"
- case _ => "org.scala-tools.testing" %% "specs" % "1.6.5" % "test"
- }
-
- buildScalaVersion match {
- case "2.7.7" => inline("net.lag" % "configgy" % "1.6.6")
- case _ => inline("net.lag" % "configgy" % "2.0.0")
- }
-
- val util = buildScalaVersion match {
- case "2.7.7" => "com.twitter" % "util" % "1.1.2"
- case _ => "com.twitter" % "util" % "1.2.8"
- }
+class QuerulousProject(info: ProjectInfo) extends StandardProject(info) with SubversionPublisher {
+ val configgy = "net.lag" % "configgy" % "2.0.2"
+ val util = "com.twitter" % "util" % "1.6.4"
val dbcp = "commons-dbcp" % "commons-dbcp" % "1.4"
val mysqljdbc = "mysql" % "mysql-connector-java" % "5.1.13"
val pool = "commons-pool" % "commons-pool" % "1.5.4"
+
+ val hamcrest = "org.hamcrest" % "hamcrest-all" % "1.1" % "test"
+ val specs = "org.scala-tools.testing" % "specs_2.8.0" % "1.6.5" % "test"
val objenesis = "org.objenesis" % "objenesis" % "1.1" % "test"
val jmock = "org.jmock" % "jmock" % "2.4.0" % "test"
val cglib = "cglib" % "cglib" % "2.1_3" % "test"
val asm = "asm" % "asm" % "1.5.3" % "test"
- override def disableCrossPaths = false
-
override def subversionRepository = Some("http://svn.local.twitter.com/maven-public/")
}
@@ -9,7 +9,7 @@ trait AutoDisabler {
protected val disableErrorCount: Int
protected val disableDuration: Duration
- private var disabledUntil: Time = Time.never
+ private var disabledUntil: Time = Time.fromSeconds(0)
private var consecutiveErrors = 0
protected def throwIfDisabled(throwMessage: String): Unit = {
@@ -30,9 +30,6 @@ class AutoDisablingQueryEvaluator (
protected val disableErrorCount: Int,
protected val disableDuration: Duration) extends QueryEvaluatorProxy(queryEvaluator) with AutoDisabler {
- private var disabledUntil: Time = Time.never
- private var consecutiveErrors = 0
-
override protected def delegate[A](f: => A) = {
throwIfDisabled()
try {

0 comments on commit e6769e6

Please sign in to comment.