Merge branch 'release/2.0.1' into scala-2.8.x/release/2.0.1

chenwenfeng · Sep 22, 2011 · 992f92b · 992f92b
2 parents 810e39b + 050a6f4
commit 992f92b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/notes/2.0.1.markdown b/notes/2.0.1.markdown
@@ -4,3 +4,6 @@
 
 ### scalatra-lift-json
 * Only read the input stream once when parsing the request body.
+
+### scalatra-specs2
+* Upgrade from Specs2 1.6.0 to 1.6.1.
diff --git a/project/build.scala b/project/build.scala
@@ -10,7 +10,7 @@ object ScalatraBuild extends Build {
 
   val scalatraSettings = Defaults.defaultSettings ++ Seq(
     organization := "org.scalatra",
-    version := "2.0.1-SNAPSHOT",
+    version := "2.0.1",
     crossScalaVersions := Seq("2.9.1", "2.9.0-1", "2.9.0"),
     crossScalaVersions_2_8 := Seq("2.8.1"),
     crossScalaVersions <<= (crossScalaVersions_2_8) { v => v },
@@ -154,8 +154,9 @@ object ScalatraBuild extends Build {
 
     def specs2(scalaVersion: String) = {
       val libVersion = scalaVersion match {
-        case "2.9.1" => "1.6"
-        case _ => "1.5"
+        case x if x startsWith "2.8." => "1.5"
+        case "2.9.0" => "1.5" // https://github.com/etorreborre/specs2/issues/33
+        case _ => "1.6.1"
       }
       "org.specs2" %% "specs2" % libVersion
     }