diff --git a/project/build.properties b/project/build.properties index be6c454..a6e117b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.5 +sbt.version=0.13.8 diff --git a/project/build.scala b/project/build.scala index 5a7ba6e..7624b00 100644 --- a/project/build.scala +++ b/project/build.scala @@ -11,8 +11,8 @@ val Organization = "gitbucket" val Name = "gitbucket" val Version = "3.0.0" - val ScalaVersion = "2.11.2" - val ScalatraVersion = "2.3.0" + val ScalaVersion = "2.11.6" + val ScalatraVersion = "2.3.1" lazy val project = Project ( "gitbucket", @@ -42,29 +42,29 @@ ), scalacOptions := Seq("-deprecation", "-language:postfixOps"), libraryDependencies ++= Seq( - "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "3.4.1.201406201815-r", - "org.eclipse.jgit" % "org.eclipse.jgit.archive" % "3.4.1.201406201815-r", + "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "3.4.2.201412180340-r", + "org.eclipse.jgit" % "org.eclipse.jgit.archive" % "3.4.2.201412180340-r", "org.scalatra" %% "scalatra" % ScalatraVersion, "org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test", "org.scalatra" %% "scalatra-json" % ScalatraVersion, - "org.json4s" %% "json4s-jackson" % "3.2.10", + "org.json4s" %% "json4s-jackson" % "3.2.11", "jp.sf.amateras" %% "scalatra-forms" % "0.1.0", "commons-io" % "commons-io" % "2.4", - "org.pegdown" % "pegdown" % "1.4.1", - "org.apache.commons" % "commons-compress" % "1.5", - "org.apache.commons" % "commons-email" % "1.3.1", - "org.apache.httpcomponents" % "httpclient" % "4.3", + "org.pegdown" % "pegdown" % "1.4.1", // 1.4.2 has incompatible APi changes + "org.apache.commons" % "commons-compress" % "1.9", + "org.apache.commons" % "commons-email" % "1.3.3", + "org.apache.httpcomponents" % "httpclient" % "4.3.6", "org.apache.sshd" % "apache-sshd" % "0.11.0", "com.typesafe.slick" %% "slick" % "2.1.0", "com.novell.ldap" % "jldap" % "2009-10-07", - "com.h2database" % "h2" % "1.4.180", + "com.h2database" % "h2" % "1.4.186", // "ch.qos.logback" % "logback-classic" % "1.0.13" % "runtime", - "org.eclipse.jetty" % "jetty-webapp" % "8.1.8.v20121106" % "container;provided", + "org.eclipse.jetty" % "jetty-webapp" % "8.1.16.v20140903" % "container;provided", "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container;provided;test" artifacts Artifact("javax.servlet", "jar", "jar"), - "junit" % "junit" % "4.11" % "test", + "junit" % "junit" % "4.12" % "test", "com.mchange" % "c3p0" % "0.9.5", "com.typesafe" % "config" % "1.2.1", - "com.typesafe.play" %% "twirl-compiler" % "1.0.2" + "com.typesafe.play" %% "twirl-compiler" % "1.0.4" ), play.twirl.sbt.Import.TwirlKeys.templateImports += "gitbucket.core._", EclipseKeys.withSource := true, diff --git a/project/plugins.sbt b/project/plugins.sbt index dee3cdf..e19dd70 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,11 +1,8 @@ +scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature") + addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.4.0") - -addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0") - -addSbtPlugin("org.scalatra.sbt" % "scalatra-sbt" % "0.3.5") - -addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.0.2") - -addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.4") - -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.12.0") \ No newline at end of file +addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0") +addSbtPlugin("org.scalatra.sbt" % "scalatra-sbt" % "0.3.5") +addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.0.4") +addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.8") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.12.0") diff --git a/sbt-launch-0.13.5.jar b/sbt-launch-0.13.5.jar deleted file mode 100644 index 174a7e1..0000000 --- a/sbt-launch-0.13.5.jar +++ /dev/null Binary files differ diff --git a/sbt-launch-0.13.8.jar b/sbt-launch-0.13.8.jar new file mode 100755 index 0000000..0d9dd94 --- /dev/null +++ b/sbt-launch-0.13.8.jar Binary files differ diff --git a/sbt.bat b/sbt.bat index 6c83e1a..7e90f12 100644 --- a/sbt.bat +++ b/sbt.bat @@ -1,2 +1,2 @@ set SCRIPT_DIR=%~dp0 -java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar "%SCRIPT_DIR%\sbt-launch-0.13.5.jar" %* +java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar "%SCRIPT_DIR%\sbt-launch-0.13.8.jar" %* diff --git a/sbt.sh b/sbt.sh index 0ffa9fe..eae1ce3 100755 --- a/sbt.sh +++ b/sbt.sh @@ -1,2 +1,2 @@ #!/bin/sh -java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar `dirname $0`/sbt-launch-0.13.5.jar "$@" +java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar `dirname $0`/sbt-launch-0.13.8.jar "$@"