diff --git a/build.sbt b/build.sbt index f57b946..572f3fe 100644 --- a/build.sbt +++ b/build.sbt @@ -5,8 +5,8 @@ val Name = "gitbucket" val GitBucketVersion = "4.32.0" val ScalatraVersion = "2.7.0-RC1" -val JettyVersion = "9.4.22.v20191022" -val JgitVersion = "5.5.1.201910021850-r" +val JettyVersion = "9.4.25.v20191220" +val JgitVersion = "5.6.0.201912101111-r" lazy val root = (project in file(".")) .enablePlugins(SbtTwirl, ScalatraPlugin) @@ -44,16 +44,16 @@ "org.apache.commons" % "commons-email" % "1.5", "org.apache.httpcomponents" % "httpclient" % "4.5.10", "org.apache.sshd" % "apache-sshd" % "2.1.0" exclude ("org.slf4j", "slf4j-jdk14") exclude ("org.apache.sshd", "sshd-mina") exclude ("org.apache.sshd", "sshd-netty"), - "org.apache.tika" % "tika-core" % "1.22", + "org.apache.tika" % "tika-core" % "1.23", "com.github.takezoe" %% "blocking-slick-32" % "0.0.12", "com.novell.ldap" % "jldap" % "2009-10-07", "com.h2database" % "h2" % "1.4.199", - "org.mariadb.jdbc" % "mariadb-java-client" % "2.5.1", + "org.mariadb.jdbc" % "mariadb-java-client" % "2.5.2", "org.postgresql" % "postgresql" % "42.2.6", "ch.qos.logback" % "logback-classic" % "1.2.3", "com.zaxxer" % "HikariCP" % "3.4.1", "com.typesafe" % "config" % "1.4.0", - "com.typesafe.akka" %% "akka-actor" % "2.5.26", + "com.typesafe.akka" %% "akka-actor" % "2.5.27", "fr.brouillard.oss.security.xhub" % "xhub4j-core" % "1.1.0", "com.github.bkromhout" % "java-diff-utils" % "2.1.1", "org.cache2k" % "cache2k-all" % "1.2.4.Final", @@ -65,10 +65,10 @@ "javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided", "junit" % "junit" % "4.12" % "test", "org.scalatra" %% "scalatra-scalatest" % ScalatraVersion % "test", - "org.mockito" % "mockito-core" % "3.1.0" % "test", - "com.dimafeng" %% "testcontainers-scala" % "0.33.0" % "test", - "org.testcontainers" % "mysql" % "1.12.2" % "test", - "org.testcontainers" % "postgresql" % "1.12.2" % "test", + "org.mockito" % "mockito-core" % "3.2.4" % "test", + "com.dimafeng" %% "testcontainers-scala" % "0.34.2" % "test", + "org.testcontainers" % "mysql" % "1.12.4" % "test", + "org.testcontainers" % "postgresql" % "1.12.4" % "test", "net.i2p.crypto" % "eddsa" % "0.3.0", "is.tagomor.woothee" % "woothee-java" % "1.10.1", "org.ec4j.core" % "ec4j-core" % "0.0.3" diff --git a/project/build.properties b/project/build.properties index 6adcdc7..6624da7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.3 +sbt.version=1.3.5 diff --git a/project/plugins.sbt b/project/plugins.sbt index 35c6b70..79471ba 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,10 +1,10 @@ scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature") addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.1") -addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.4.2") +addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.0") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10") addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra" % "1.0.3") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2") addSbtPlugin("com.typesafe.sbt" % "sbt-license-report" % "1.2.0") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")