Permalink
Browse files

[split] Move tbird into birdcage

In addition to just importing the latest tbird into birdcage, I made the following
changes
1) Removed the AdhocInlines trait and used ProjectDependencies instead
2) All the files which are loaded from the config directory by the tests are now
   loaded using the testResourcesPath instead of hard coding the relative path
   in the test files.
3) The dependency on gizzard was changed to pickup gizzard from birdcage
4) The dependency on the standard project was changed to 1.0.4.
5) Refresh gizzard to the latest code & dependencies from the gizzard repo.
  • Loading branch information...
1 parent ec9a239 commit 3b6e417c63e743b8595284066bfd3123851abd1d Sumeet Lahorani committed Apr 2, 2012
Showing with 10 additions and 8 deletions.
  1. +1 −0 OWNERS
  2. +2 −2 project/build.properties
  3. +4 −3 project/build/GizzardProject.scala
  4. +3 −3 project/release.properties
View
1 OWNERS
@@ -0,0 +1 @@
+review_group:data-services
View
@@ -1,8 +1,8 @@
#Project properties
-#Tue Mar 27 01:56:24 PDT 2012
+#Fri Mar 30 14:48:08 PDT 2012
project.organization=com.twitter
project.name=gizzard
sbt.version=0.7.4
-project.version=3.0.11-SNAPSHOT
+project.version=3.0.14-SNAPSHOT
build.scala.versions=2.8.1
project.initialize=false
@@ -7,12 +7,13 @@ with DefaultRepos
with SubversionPublisher
with ProjectDependencies {
- def finagleVersion = "1.11.0"
+ def finagleVersion = "3.0.0"
+ def utilVersion = "3.0.0"
override def filterScalaJars = false
val scalaTools = "org.scala-lang" % "scala-compiler" % "2.8.1"
- val querulous = "com.twitter" % "querulous" % "2.7.4"
+ val querulous = "com.twitter" % "querulous" % "2.7.6"
//val kestrel = "net.lag" % "kestrel" % "1.2.7"
// remove when moved to libkestrel
@@ -21,7 +22,7 @@ with ProjectDependencies {
val finagleThrift = "com.twitter" % "finagle-thrift" % finagleVersion
val finagleOstrich4 = "com.twitter" % "finagle-ostrich4" % finagleVersion
- val utilThrift = "com.twitter" % "util-thrift" % "2.0.0"
+ val utilThrift = "com.twitter" % "util-thrift" % utilVersion
val jackson = "org.codehaus.jackson" % "jackson-core-asl" % "1.9.2"
val jacksonMap = "org.codehaus.jackson" % "jackson-mapper-asl" % "1.9.2"
@@ -1,4 +1,4 @@
#Automatically generated by ReleaseManagement
-#Tue Mar 27 01:56:24 PDT 2012
-version=3.0.10
-sha1=6e94df8c8ce691fb152136b61c262cdaaee03514
+#Fri Mar 30 14:48:08 PDT 2012
+version=3.0.13
+sha1=ea0194fe74e0d04b01c453edfda61eec2662424c

0 comments on commit 3b6e417

Please sign in to comment.