diff --git a/build.sbt b/build.sbt index c1d678e..d8a31dd 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ val Name = "gitbucket" val GitBucketVersion = "4.12.1" val ScalatraVersion = "2.5.0" -val JettyVersion = "9.3.9.v20160517" +val JettyVersion = "9.4.4.v20170414" lazy val root = (project in file(".")).enablePlugins(SbtTwirl, JettyPlugin) @@ -25,26 +25,26 @@ "org.eclipse.jgit" % "org.eclipse.jgit.archive" % "4.7.0.201704051617-r", "org.scalatra" %% "scalatra" % ScalatraVersion, "org.scalatra" %% "scalatra-json" % ScalatraVersion, - "org.json4s" %% "json4s-jackson" % "3.5.0", + "org.json4s" %% "json4s-jackson" % "3.5.1", "io.github.gitbucket" %% "scalatra-forms" % "1.1.0", - "commons-io" % "commons-io" % "2.4", - "io.github.gitbucket" % "solidbase" % "1.0.0", + "commons-io" % "commons-io" % "2.5", + "io.github.gitbucket" % "solidbase" % "1.0.2", "io.github.gitbucket" % "markedj" % "1.0.10", - "org.apache.commons" % "commons-compress" % "1.11", + "org.apache.commons" % "commons-compress" % "1.13", "org.apache.commons" % "commons-email" % "1.4", - "org.apache.httpcomponents" % "httpclient" % "4.5.1", - "org.apache.sshd" % "apache-sshd" % "1.2.0" exclude("org.slf4j","slf4j-jdk14"), - "org.apache.tika" % "tika-core" % "1.13", + "org.apache.httpcomponents" % "httpclient" % "4.5.3", + "org.apache.sshd" % "apache-sshd" % "1.4.0" exclude("org.slf4j","slf4j-jdk14"), + "org.apache.tika" % "tika-core" % "1.14", "com.github.takezoe" %% "blocking-slick-32" % "0.0.8", - "joda-time" % "joda-time" % "2.9.6", + "joda-time" % "joda-time" % "2.9.9", "com.novell.ldap" % "jldap" % "2009-10-07", - "com.h2database" % "h2" % "1.4.192", - "mysql" % "mysql-connector-java" % "5.1.39", - "org.postgresql" % "postgresql" % "9.4.1208", - "ch.qos.logback" % "logback-classic" % "1.1.7", - "com.zaxxer" % "HikariCP" % "2.4.6", - "com.typesafe" % "config" % "1.3.0", - "com.typesafe.akka" %% "akka-actor" % "2.4.12", + "com.h2database" % "h2" % "1.4.195", + "mysql" % "mysql-connector-java" % "6.0.6", + "org.postgresql" % "postgresql" % "42.0.0", + "ch.qos.logback" % "logback-classic" % "1.2.3", + "com.zaxxer" % "HikariCP" % "2.6.1", + "com.typesafe" % "config" % "1.3.1", + "com.typesafe.akka" %% "akka-actor" % "2.5.0", "fr.brouillard.oss.security.xhub" % "xhub4j-core" % "1.0.0", "com.github.bkromhout" % "java-diff-utils" % "2.1.1", "org.cache2k" % "cache2k-all" % "1.0.0.CR1", @@ -54,9 +54,9 @@ "javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided", "junit" % "junit" % "4.12" % "test", "org.scalatra" %% "scalatra-scalatest" % ScalatraVersion % "test", - "org.mockito" % "mockito-core" % "2.7.16" % "test", + "org.mockito" % "mockito-core" % "2.7.22" % "test", "com.wix" % "wix-embedded-mysql" % "2.1.4" % "test", - "ru.yandex.qatools.embed" % "postgresql-embedded" % "1.14" % "test" + "ru.yandex.qatools.embed" % "postgresql-embedded" % "2.0" % "test" ) // Compiler settings diff --git a/project/build.properties b/project/build.properties index 27e88aa..64317fd 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.13 +sbt.version=0.13.15