(refs #815)Upgrade Scalatra to 2.4.0

project/build.scala

@@ -11,7 +11,7 @@ object MyBuild extends Build {
   val Name = "gitbucket"
   val Version = "3.10.0"
   val ScalaVersion = "2.11.6"
-  val ScalatraVersion = "2.3.1"
+  val ScalatraVersion = "2.4.0"
 
   lazy val project = Project (
     "gitbucket",
@@ -47,7 +47,7 @@ object MyBuild extends Build {
       "org.scalatra" %% "scalatra" % ScalatraVersion,
       "org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
       "org.scalatra" %% "scalatra-json" % ScalatraVersion,
-      "org.json4s" %% "json4s-jackson" % "3.2.11",
+      "org.json4s" %% "json4s-jackson" % "3.3.0",
       "jp.sf.amateras" %% "scalatra-forms" % "0.2.0",
       "commons-io" % "commons-io" % "2.4",
       "io.github.gitbucket" % "markedj" % "1.0.6-SNAPSHOT",
@@ -60,8 +60,8 @@ object MyBuild extends Build {
       "com.novell.ldap" % "jldap" % "2009-10-07",
       "com.h2database" % "h2" % "1.4.190",
       "ch.qos.logback" % "logback-classic" % "1.1.1",
-      "org.eclipse.jetty" % "jetty-webapp" % "8.1.16.v20140903" % "provided",
+      "org.eclipse.jetty" % "jetty-webapp" % "9.3.6.v20151106" % "provided",
-      "javax.servlet" % "javax.servlet-api" % "3.0.1" % "provided",
+      "javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided",
       "junit" % "junit" % "4.12" % "test",
       "com.mchange" % "c3p0" % "0.9.5.2",
       "com.typesafe" % "config" % "1.2.1",

release/build.xml

@@ -7,8 +7,8 @@
   <property name="jetty.dir" value="embed-jetty"/>
   <property name="scala.version" value="2.11"/>
   <property name="gitbucket.version" value="${env.GITBUCKET_VERSION}"/>
-  <property name="jetty.version" value="8.1.16.v20140903"/>
+  <property name="jetty.version" value="9.3.6.v20151106"/>
-  <property name="servlet.version" value="3.0.0.v201112011016"/>
+  <property name="servlet.version" value="3.1.0"/>
 
   <condition property="sbt.exec" value="sbt.bat" else="sbt.sh">
     <os family="windows" />
@@ -28,7 +28,7 @@
   <target name="embed" depends="war">
     <mkdir dir="${embed.classes.dir}"/>
 
-    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/javax.servlet-${servlet.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/javax.servlet-api-${servlet.version}.jar" />
     <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-continuation-${jetty.version}.jar" />
     <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-http-${jetty.version}.jar" />
     <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-io-${jetty.version}.jar" />

src/main/java/JettyLauncher.java

@@ -1,5 +1,4 @@
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.webapp.WebAppContext;
 
 import java.io.File;
@@ -30,16 +29,16 @@ public class JettyLauncher {
             }
         }
 
-        Server server = new Server();
+        Server server = new Server(port);
 
-        SelectChannelConnector connector = new SelectChannelConnector();
+//        SelectChannelConnector connector = new SelectChannelConnector();
-        if(host != null) {
+//        if(host != null) {
-            connector.setHost(host);
+//            connector.setHost(host);
-        }
+//        }
-        connector.setMaxIdleTime(1000 * 60 * 60);
+//        connector.setMaxIdleTime(1000 * 60 * 60);
-        connector.setSoLingerTime(-1);
+//        connector.setSoLingerTime(-1);
-        connector.setPort(port);
+//        connector.setPort(port);
-        server.addConnector(connector);
+//        server.addConnector(connector);
 
         WebAppContext context = new WebAppContext();
 

src/test/scala/gitbucket/core/util/GitSpecUtil.scala

@@ -18,7 +18,7 @@ import java.util.Date
 import java.io.File
 
 object GitSpecUtil {
-  def withTestFolder[U](f: File => U) {
+  def withTestFolder[U](f: File => U): U = {
     val folder = new File(System.getProperty("java.io.tmpdir"), "test-" + System.nanoTime)
     if(!folder.mkdirs()){
       throw new java.io.IOException("can't create folder "+folder.getAbsolutePath)
@@ -29,7 +29,7 @@ object GitSpecUtil {
       FileUtils.deleteQuietly(folder)
     }
   }
-  def withTestRepository[U](f: Git => U) = withTestFolder(folder => using(Git.open(createTestRepository(folder)))(f))
+  def withTestRepository[U](f: Git => U): U = withTestFolder(folder => using(Git.open(createTestRepository(folder)))(f))
   def createTestRepository(dir: File): File = {
     RepositoryCache.clear()
     FileUtils.deleteQuietly(dir)