Merge branch 'master' of github.com:twitter/finagle

twitter · Nov 15, 2010 · baccbd0 · baccbd0
2 parents 43fa1a5 + ddaa51b
commit baccbd0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/project/build.properties b/project/build.properties
@@ -4,5 +4,5 @@ project.organization=com.twitter
 project.name=finagle
 sbt.version=0.7.4
 project.version=1.0
-build.scala.versions=2.8.0
+build.scala.versions=2.8.1
 project.initialize=false
diff --git a/project/build/Project.scala b/project/build/Project.scala
@@ -10,15 +10,15 @@ class Project(info: ProjectInfo) extends DefaultProject(info) {
   val twitterRepo  = "twitter.com" at "http://maven.twttr.com/"
   val codehausRepo = "codehaus.org" at "http://repository.codehaus.org/"
 
-  val ostrich      = "com.twitter"          %% "ostrich"          % "2.2.10"
-  val util         = "com.twitter"          %% "util"             % "1.2.4"
+  val ostrich      = "com.twitter"          %  "ostrich_2.8.0"    % "2.2.10"
+  val util         = "com.twitter"          %  "util_2.8.1"       % "1.2.4"
   val netty        = "org.jboss.netty"      %  "netty"            % "3.2.2.Final"
   val thrift       = "thrift"               %  "libthrift"        % "0.2.0"
   val slf4jNop     = "org.slf4j"            %  "slf4j-nop"        % "1.6.1"
   val jackson      = "org.codehaus.jackson" %  "jackson-core-asl" % "1.6.1" withSources()
 
   // ** test-only
   val mockito  = "org.mockito"             %  "mockito-all" % "1.8.5" % "test" withSources()
-  val specs    = "org.scala-tools.testing" %% "specs"       % "1.6.5" % "test" withSources()
+  val specs    = "org.scala-tools.testing" %  "specs_2.8.0" % "1.6.5" % "test" withSources()
   val killdeer = "com.twitter"             %  "killdeer"    % "0.5"   % "test"
 }