version 2.0.0.M3

- [engine] #279 UnstableAccessValidation to detect unstable access - [engine] #280 Add thread id validation to detect illegal dynamic scope access more - [engine] #281 Split engine-scalate from engine project - [engine] #282 Keep supporting Servlet 3.0 for now
skinny-framework · Jul 30, 2015 · 2eb354e · 2eb354e
1 parent f2b7097
commit 2eb354e
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 20 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -6,7 +6,7 @@ import scala.language.postfixOps
 
 object SkinnyFrameworkBuild extends Build {
 
-  lazy val currentVersion = "2.0.0-SNAPSHOT"
+  lazy val currentVersion = "2.0.0.M3"
   // Scalatra 2.4 will be incompatible with Skinny
   lazy val compatibleScalatraVersion = "2.3.1"
   lazy val json4SVersion = "3.3.0.RC3"

diff --git a/skinny-engine-blank-app/build.sbt b/skinny-engine-blank-app/build.sbt
@@ -5,16 +5,16 @@ lazy val root = (project in file("."))
     scalaVersion := "2.11.7",
     resolvers += "sonatype releases" at "https://oss.sonatype.org/content/repositories/releases",
     libraryDependencies ++= Seq(
-      "org.skinny-framework" %% "skinny-engine"      % skinnyVersion,
-      "org.skinny-framework" %  "skinny-logback"     % "1.0.6",
-      "org.scalatra.scalate" %% "scalate-core"       % "1.7.1",
-      "org.eclipse.jetty"    %  "jetty-webapp"       % jettyVersion    % "container",
-      "org.eclipse.jetty"    %  "jetty-plus"         % jettyVersion    % "container",
-      "javax.servlet"        %  "javax.servlet-api"  % "3.1.0"         % "container;provided;test",
-      "org.skinny-framework" %% "skinny-engine-test" % skinnyVersion   % "test"
+      "org.skinny-framework" %% "skinny-engine"         % skinnyVersion,
+      "org.skinny-framework" %% "skinny-engine-scalate" % skinnyVersion,
+      "org.skinny-framework" %  "skinny-logback"        % "1.0.6",
+      "org.eclipse.jetty"    %  "jetty-webapp"          % jettyVersion    % "container",
+      "org.eclipse.jetty"    %  "jetty-plus"            % jettyVersion    % "container",
+      "javax.servlet"        %  "javax.servlet-api"     % "3.0.1"         % "container;provided;test",
+      "org.skinny-framework" %% "skinny-engine-test"    % skinnyVersion   % "test"
     ),
     unmanagedClasspath in Test <+= (baseDirectory) map { bd =>  Attributed.blank(bd / "src/main/webapp") }
   ).enablePlugins(JavaAppPackaging)
 
-val skinnyVersion = "2.0.0.M2-20150725"
+val skinnyVersion = "2.0.0.M3"
 val jettyVersion = "9.2.12.v20150709"
diff --git a/skinny-engine-blank-app/src/main/scala/app/Hello.scala b/skinny-engine-blank-app/src/main/scala/app/Hello.scala
@@ -11,6 +11,10 @@ trait MessageExtractor { self: SkinnyEngineBase =>
 
 object Hello extends WebApp with MessageExtractor {
 
+  get("/") {
+    redirect("/hello")
+  }
+
   get("/hello")(message)
 
   post("/hello")(message)

diff --git a/skinny-engine-blank-app/standalone-app/app.scala b/skinny-engine-blank-app/standalone-app/app.scala
@@ -3,7 +3,7 @@
 /***
 scalaVersion := "2.11.7"
 resolvers += "sonatype releases" at "https://oss.sonatype.org/content/repositories/releases"
-libraryDependencies += "org.skinny-framework" %% "skinny-engine-server" % "2.0.0.M2-20150725"
+libraryDependencies += "org.skinny-framework" %% "skinny-engine-server" % "2.0.0.M3"
 */
 import skinny.engine._
 import scala.concurrent._

diff --git a/skinny-engine-blank-app/standalone-app/sbt-project/build.sbt b/skinny-engine-blank-app/standalone-app/sbt-project/build.sbt
@@ -5,5 +5,5 @@ lazy val root = (project in file("."))
     libraryDependencies += "org.skinny-framework" %% "skinny-engine-server" % skinnyVersion
   )
 
-val skinnyVersion = "2.0.0.M2-20150725"
+val skinnyVersion = "2.0.0.M3"
 val jettyVersion = "9.2.12.v20150709"
diff --git a/yeoman-generator-skinny/app/templates/README.md b/yeoman-generator-skinny/app/templates/README.md
@@ -21,8 +21,10 @@ Skinny apps are Servlet applications. Let's create war file and deploy it to Ser
 
 ### Skinny Framework
 
-Skinny is a full-stack web app framework built on Scalatra.
+Skinny is a full-stack web app framework to build Servlet applications.
+
 To put it simply, Skinny framework’s concept is Scala on Rails. 
+
 Skinny is highly inspired by Ruby on Rails and it is optimized for sustainable productivity for Servlet-based web app development.
 
 http://skinny-framework.org/
@@ -31,13 +33,6 @@ http://skinny-framework.org/
 
 Skinny is built upon several stable OSS libraries. 
 
-#### Scalatra 
-
-Scalatra is a simple, accessible and free web micro-framework. Skinny Framework's Web MVC part is a thin wrapper fof Scalatra core framework. 
-Skinny users sometimes need to understand the Scalatra layer when learning deeper.
-
-http://scalatra.org/
-
 #### ScalikeJDBC
 
 Skinny ORM is built upon ScalikeJDBC which is a tidy JDBC wrapper library.

diff --git a/yeoman-generator-skinny/app/templates/project/Build.scala b/yeoman-generator-skinny/app/templates/project/Build.scala
@@ -15,7 +15,7 @@ object SkinnyAppBuild extends Build {
   val appName = "skinny-blank-app"
   val appVersion = "0.1.0-SNAPSHOT"
 
-  val skinnyVersion = "2.0.0-SNAPSHOT"
+  val skinnyVersion = "2.0.0.M3"
   val theScalaVersion = "2.11.7"
   val jettyVersion = "9.2.12.v20150709"