Dropped 2.10.x and moved to 2.11.1

Upgraded to Lift 2.6-M4
Upgraded specs2 to latest

README.md

@@ -7,7 +7,7 @@ This repository contains templates for Lift projects.
 
 These templates offer a starting point for your Lift-based project.
 
-If you want to start with Scala 2.10.0, use the templates in the scala_210 directory
+If you want to start with Scala 2.11.1, use the templates in the scala_211 directory
 
 ##Getting started.
 
@@ -21,7 +21,7 @@ Most people will want to start with the `lift_basic` template. This template sho
 At your terminal, enter:
 
 1. `git clone https://github.com/lift/lift_26_sbt.git`
-2. `cd lift_26_sbt/scala_210/lift_basic`
+2. `cd lift_26_sbt/scala_211/lift_basic`
 3. `./sbt`
 
        SBT will download a lot of stuff and after some time, you will see the sbt prompt `>`
@@ -39,7 +39,7 @@ Now that you have your first Lift application running, you may want to look arou
 You can use any IDE you want, even a text editor, but one of the best IDE for Scala is IntelliJ IDEA with the scala plugin. We'll assume you already got that installed. If you need help, this is the [plugin page](http://confluence.jetbrains.net/display/SCA/Scala+Plugin+for+IntelliJ+IDEA)
 
 1. Open Intellij, click on `File` -> `Open Project`
-2. Navigate to the folder `lift_26_sbt/scala_210/lift_basic` and click open.
+2. Navigate to the folder `lift_26_sbt/scala_211/lift_basic` and click open.
 
        Because we run the `gen-idea` command in the previous section, **sbt** already created the files Intellij needs to understand a new project.
        You can now navigate through the different files, and make changes as you wish. To see those changes take effect, you go back to `sbt` and restart `jetty` by doing `;container:stop;container:start`

scala_210/lift_advanced_bs3/build.sbt → scala_211/lift_advanced_bs3/build.sbt

@@ -1,14 +1,14 @@
 name := "Lift v2.6 Template Application with Bootstrap v3"
 
-version := "0.0.3"
+version := "0.0.4"
 
 organization := "net.liftweb"
 
-scalaVersion := "2.10.4"
+scalaVersion := "2.11.1"
 
-resolvers ++= Seq("snapshots"     at "http://oss.sonatype.org/content/repositories/snapshots",
-                  "staging"       at "http://oss.sonatype.org/content/repositories/staging",
-                  "releases"      at "http://oss.sonatype.org/content/repositories/releases"
+resolvers ++= Seq("snapshots"     at "https://oss.sonatype.org/content/repositories/snapshots",
+                  "staging"       at "https://oss.sonatype.org/content/repositories/staging",
+                  "releases"      at "https://oss.sonatype.org/content/repositories/releases"
                  )
 
 seq(webSettings :_*)
@@ -18,16 +18,16 @@ unmanagedResourceDirectories in Test <+= (baseDirectory) { _ / "src/main/webapp"
 scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature")
 
 libraryDependencies ++= {
-  val liftVersion = "2.6-M3"
+  val liftVersion = "2.6-M4"
   Seq(
     "net.liftweb"       %% "lift-webkit"        % liftVersion        % "compile",
     "net.liftweb"       %% "lift-mapper"        % liftVersion        % "compile",
-    "net.liftmodules"   %% "fobo_2.6"           % "1.2"              % "compile",
+    "net.liftmodules"   %% "fobo_2.6"           % "1.3-SNAPSHOT"     % "compile",
     "org.eclipse.jetty" % "jetty-webapp"        % "8.1.7.v20120910"  % "container,test",
     "org.eclipse.jetty" % "jetty-plus"          % "8.1.7.v20120910"  % "container,test", // For Jetty Config
     "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container,test" artifacts Artifact("javax.servlet", "jar", "jar"),
     "ch.qos.logback"    % "logback-classic"     % "1.0.6",
-    "org.specs2"        %% "specs2"             % "1.14"             % "test",
+    "org.specs2"        %% "specs2"             % "2.3.12"           % "test",
     "com.h2database"    % "h2"                  % "1.3.167"
   )
 }

scala_210/lift_advanced_bs3/src/main/scala/bootstrap/liftweb/Boot.scala → scala_211/lift_advanced_bs3/src/main/scala/bootstrap/liftweb/Boot.scala

@@ -30,7 +30,7 @@ class Boot {
 
       LiftRules.unloadHooks.append(vendor.closeAllConnections_! _)
 
-      DB.defineConnectionManager(DefaultConnectionIdentifier, vendor)
+      DB.defineConnectionManager(util.DefaultConnectionIdentifier, vendor)
     }
 
     // Use Lift's Mapper ORM to populate the database

scala_210/lift_basic/build.sbt → scala_211/lift_basic/build.sbt

@@ -1,14 +1,14 @@
 name := "Lift 2.6 starter template"
 
-version := "0.0.3"
+version := "0.0.4"
 
 organization := "net.liftweb"
 
-scalaVersion := "2.10.4"
+scalaVersion := "2.11.1"
 
-resolvers ++= Seq("snapshots"     at "http://oss.sonatype.org/content/repositories/snapshots",
-                  "staging"       at "http://oss.sonatype.org/content/repositories/staging",
-                  "releases"      at "http://oss.sonatype.org/content/repositories/releases"
+resolvers ++= Seq("snapshots"     at "https://oss.sonatype.org/content/repositories/snapshots",
+                  "staging"       at "https://oss.sonatype.org/content/repositories/staging",
+                  "releases"      at "https://oss.sonatype.org/content/repositories/releases"
                  )
 
 seq(webSettings :_*)
@@ -18,16 +18,16 @@ unmanagedResourceDirectories in Test <+= (baseDirectory) { _ / "src/main/webapp"
 scalacOptions ++= Seq("-deprecation", "-unchecked")
 
 libraryDependencies ++= {
-  val liftVersion = "2.6-M3"
+  val liftVersion = "2.6-M4"
   Seq(
     "net.liftweb"       %% "lift-webkit"        % liftVersion        % "compile",
     "net.liftweb"       %% "lift-mapper"        % liftVersion        % "compile",
-    "net.liftmodules"   %% "lift-jquery-module_2.6" % "2.5",
+    "net.liftmodules"   %% "lift-jquery-module_2.6" % "2.8-SNAPSHOT",
     "org.eclipse.jetty" % "jetty-webapp"        % "8.1.7.v20120910"  % "container,test",
     "org.eclipse.jetty" % "jetty-plus"          % "8.1.7.v20120910"  % "container,test", // For Jetty Config
     "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container,test" artifacts Artifact("javax.servlet", "jar", "jar"),
     "ch.qos.logback"    % "logback-classic"     % "1.0.6",
-    "org.specs2"        %% "specs2"             % "1.14"             % "test",
+    "org.specs2"        %% "specs2"             % "2.3.12"             % "test",
     "com.h2database"    % "h2"                  % "1.3.167"
   )
 }

scala_210/lift_basic/src/main/scala/bootstrap/liftweb/Boot.scala → scala_211/lift_basic/src/main/scala/bootstrap/liftweb/Boot.scala

@@ -30,7 +30,7 @@ class Boot {
 
       LiftRules.unloadHooks.append(vendor.closeAllConnections_! _)
 
-      DB.defineConnectionManager(DefaultConnectionIdentifier, vendor)
+      DB.defineConnectionManager(util.DefaultConnectionIdentifier, vendor)
     }
 
     // Use Lift's Mapper ORM to populate the database

scala_210/lift_blank/build.sbt → scala_211/lift_blank/build.sbt

@@ -1,13 +1,13 @@
 name := "Lift 2.6 starter template"
 
-version := "0.0.3"
+version := "0.0.4"
 
 organization := "net.liftweb"
 
-scalaVersion := "2.10.4"
+scalaVersion := "2.11.1"
 
-resolvers ++= Seq("snapshots"     at "http://oss.sonatype.org/content/repositories/snapshots",
-                "releases"        at "http://oss.sonatype.org/content/repositories/releases"
+resolvers ++= Seq("snapshots"     at "https://oss.sonatype.org/content/repositories/snapshots",
+                "releases"        at "https://oss.sonatype.org/content/repositories/releases"
                 )
 
 seq(webSettings :_*)
@@ -17,15 +17,15 @@ unmanagedResourceDirectories in Test <+= (baseDirectory) { _ / "src/main/webapp"
 scalacOptions ++= Seq("-deprecation", "-unchecked")
 
 libraryDependencies ++= {
-  val liftVersion = "2.6-M3"
+  val liftVersion = "2.6-M4"
   Seq(
     "net.liftweb"       %% "lift-webkit"        % liftVersion        % "compile",
-    "net.liftmodules"   %% "lift-jquery-module_2.6" % "2.5",
+    "net.liftmodules"   %% "lift-jquery-module_2.6" % "2.8-SNAPSHOT",
     "org.eclipse.jetty" % "jetty-webapp"        % "8.1.7.v20120910"  % "container,test",
     "org.eclipse.jetty" % "jetty-plus"          % "8.1.7.v20120910"  % "container,test", // For Jetty Config
     "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container,test" artifacts Artifact("javax.servlet", "jar", "jar"),
     "ch.qos.logback"    % "logback-classic"     % "1.0.6",
-    "org.specs2"        %% "specs2"             % "1.14"            % "test"
+    "org.specs2"        %% "specs2"             % "2.3.12"           % "test"
   )
 }
 

scala_211/lift_json/build.sbt

@@ -0,0 +1,23 @@
+name := "Lift 2.6 starter template"
+
+version := "0.0.4"
+
+organization := "net.liftweb"
+
+scalaVersion := "2.11.1"
+
+resolvers ++= Seq("snapshots"     at "https://oss.sonatype.org/content/repositories/snapshots",
+                "releases"        at "https://oss.sonatype.org/content/repositories/releases"
+                )
+
+scalacOptions ++= Seq("-deprecation", "-unchecked")
+
+libraryDependencies ++= {
+  val liftVersion = "2.6-M4"
+  Seq(
+    "net.liftweb"       %% "lift-json"          % liftVersion % "compile",
+    "ch.qos.logback"    % "logback-classic"     % "1.0.6",
+    "org.specs2"        %% "specs2"             % "2.3.12"      % "test"
+  )
+}
+

scala_210/lift_mvc/build.sbt → scala_211/lift_mvc/build.sbt

@@ -1,13 +1,13 @@
 name := "Lift 2.6 starter template"
 
-version := "0.0.3"
+version := "0.0.4"
 
 organization := "net.liftweb"
 
-scalaVersion := "2.10.4"
+scalaVersion := "2.11.1"
 
-resolvers ++= Seq("snapshots"     at "http://oss.sonatype.org/content/repositories/snapshots",
-                "releases"        at "http://oss.sonatype.org/content/repositories/releases"
+resolvers ++= Seq("snapshots"     at "https://oss.sonatype.org/content/repositories/snapshots",
+                "releases"        at "https://oss.sonatype.org/content/repositories/releases"
                 )
 
 seq(webSettings :_*)
@@ -17,16 +17,16 @@ unmanagedResourceDirectories in Test <+= (baseDirectory) { _ / "src/main/webapp"
 scalacOptions ++= Seq("-deprecation", "-unchecked")
 
 libraryDependencies ++= {
-  val liftVersion = "2.6-M3"
+  val liftVersion = "2.6-M4"
   Seq(
     "net.liftweb"       %% "lift-webkit"        % liftVersion        % "compile",
     "net.liftweb"       %% "lift-mapper"        % liftVersion        % "compile",
-    "net.liftmodules"   %% "lift-jquery-module_2.6" % "2.5",
+    "net.liftmodules"   %% "lift-jquery-module_2.6" % "2.8-SNAPSHOT",
     "org.eclipse.jetty" % "jetty-webapp"        % "8.1.7.v20120910"  % "container,test",
     "org.eclipse.jetty" % "jetty-plus"          % "8.1.7.v20120910"  % "container,test", // For Jetty Config
     "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container,test" artifacts Artifact("javax.servlet", "jar", "jar"),
     "ch.qos.logback"    % "logback-classic"     % "1.0.6",
-    "org.specs2"        %% "specs2"             % "1.14"             % "test",
+    "org.specs2"        %% "specs2"             % "2.3.12"           % "test",
     "com.h2database"    % "h2"                  % "1.3.167"
   )
 }