* Updated to latest jetty server (and bypassing the orbit issue)

lift · Sep 12, 2012 · 4ca093f · 4ca093f
1 parent 5586e07
commit 4ca093f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/scala_29/lift_basic/build.sbt b/scala_29/lift_basic/build.sbt
@@ -20,7 +20,8 @@ libraryDependencies ++= {
     "net.liftweb"       %% "lift-webkit"        % liftVersion        % "compile",
     "net.liftweb"       %% "lift-mapper"        % liftVersion        % "compile",
     "net.liftmodules"   %% "lift-jquery-module" % (liftVersion + "-1.0"),
-    "org.eclipse.jetty" % "jetty-webapp"        % "7.5.4.v20111024"  % "container; test",
+    "org.eclipse.jetty" % "jetty-webapp"        % "8.1.7.v20120910"  % "container",
+    "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container" artifacts Artifact("javax.servlet", "jar", "jar"),
     "ch.qos.logback"    % "logback-classic"     % "1.0.6",
     "org.specs2"        %% "specs2"             % "1.12.1"           % "test",
     "com.h2database"    % "h2"                  % "1.3.167"

diff --git a/scala_29/lift_blank/build.sbt b/scala_29/lift_blank/build.sbt
@@ -19,7 +19,8 @@ libraryDependencies ++= {
   Seq(
     "net.liftweb"       %% "lift-webkit"        % liftVersion        % "compile",
     "net.liftmodules"   %% "lift-jquery-module" % (liftVersion + "-1.0"),
-    "org.eclipse.jetty" % "jetty-webapp"        % "7.5.4.v20111024"  % "container; test",
+    "org.eclipse.jetty" % "jetty-webapp"        % "8.1.7.v20120910"  % "container",
+    "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container" artifacts Artifact("javax.servlet", "jar", "jar"),
     "ch.qos.logback"    % "logback-classic"     % "1.0.6",
     "org.specs2"        %% "specs2"             % "1.12.1"           % "test"
   )

diff --git a/scala_29/lift_mvc/build.sbt b/scala_29/lift_mvc/build.sbt
@@ -20,7 +20,8 @@ libraryDependencies ++= {
     "net.liftweb"       %% "lift-webkit"        % liftVersion        % "compile",
     "net.liftweb"       %% "lift-mapper"        % liftVersion        % "compile",
     "net.liftmodules"   %% "lift-jquery-module" % (liftVersion + "-1.0"),
-    "org.eclipse.jetty" % "jetty-webapp"        % "7.5.4.v20111024"  % "container; test",
+    "org.eclipse.jetty" % "jetty-webapp"        % "8.1.7.v20120910"  % "container",
+    "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container" artifacts Artifact("javax.servlet", "jar", "jar"),
     "ch.qos.logback"    % "logback-classic"     % "1.0.6",
     "org.specs2"        %% "specs2"             % "1.12.1"           % "test",
     "com.h2database"    % "h2"                  % "1.3.167"