Permalink
Browse files

Merge swagger support, deprecate old docs.

  • Loading branch information...
1 parent dfd1bc2 commit 51a39809bd50942c1fb1efa5ff93eee3f98869b3 @rossabaker rossabaker committed Mar 12, 2012
View
@@ -12,6 +12,7 @@
## Other contributors
- [Luke Amdor](http://rubbish.io/)
+- [Stefan De Boey](http://stefandeboey.be/)
- [JR Boyens](http://jrboyens.github.com/)
- [Jon Buffington](http://blog.jon.buffington.name/)
- [Gregg Carrier](http://janxspirit.blogspot.com/)
@@ -2,6 +2,7 @@ package org.scalatra.docs
import org.scalatra._
+@deprecated("See scalatra-swagger")
trait DocumentationSupport {
this: ScalatraBase =>
View
@@ -164,7 +164,16 @@ object ScalatraBuild extends Build {
id = "scalatra-docs",
base = file("docs"),
settings = scalatraSettings ++ Seq(
- libraryDependencies ++= Seq(liftJson, liftJsonExt)
+ description := "Scalatra legacy documentation; see scalatra-swagger"
+ )
+ ) dependsOn(scalatraCore % "compile;test->test")
+
+ lazy val scalatraSwagger = Project(
+ id = "scalatra-swagger",
+ base = file("swagger"),
+ settings = scalatraSettings ++ Seq(
+ libraryDependencies ++= Seq(liftJson, liftJsonExt),
+ description := "Scalatra integration with Swagger"
)
) dependsOn(scalatraCore % "compile;test->test")

0 comments on commit 51a3980

Please sign in to comment.