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

twitter-forks · Nov 20, 2011 · affd513 · affd513
2 parents c807861 + ecc12f2
commit affd513
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/project/build.properties b/project/build.properties
@@ -1,8 +1,8 @@
 #Project properties
-#Mon Dec 27 13:52:24 EST 2010
+#Wed Jun 01 10:40:20 PDT 2011
 project.organization=com.twitter
 project.name=streamyj
 sbt.version=0.7.4
-project.version=0.2.2-SNAPSHOT
+project.version=0.3.1-SNAPSHOT
 build.scala.versions=2.8.1 2.7.7
 project.initialize=false
diff --git a/project/build/StreamyJ.scala b/project/build/StreamyJ.scala
@@ -6,7 +6,7 @@ with SubversionPublisher
 with PublishSourcesAndJavadocs
 with PublishSite
 {
-  val jackson = "org.codehaus.jackson" % "jackson-core-asl" % "1.5.2"
+  val jackson = "org.codehaus.jackson" % "jackson-core-asl" % "1.8.1"
   val objenesis = "org.objenesis" % "objenesis" % "1.1"
   val specs     = buildScalaVersion match {
     case "2.7.7" => "org.scala-tools.testing" % "specs" % "1.6.2.1" % "test"