Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 05:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

update some more dependencies

Browse Source
This commit is contained in:
aadrian
2018-11-22 19:14:57 +01:00
parent 6104d7657b
commit 60592debe3
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build.sbt
View File

@@ -5,7 +5,7 @@ val Organization = "io.github.gitbucket"
val Name = "gitbucket" val Name = "gitbucket"
val GitBucketVersion = "4.30.0-SNAPSHOT" val GitBucketVersion = "4.30.0-SNAPSHOT"
val ScalatraVersion = "2.6.3" val ScalatraVersion = "2.6.3"
val JettyVersion = "9.4.11.v20180605" val JettyVersion = "9.4.14.v20181114"
val JgitVersion = "5.1.3.201810200350-r" val JgitVersion = "5.1.3.201810200350-r"
lazy val root = (project in file(".")) lazy val root = (project in file("."))
@@ -36,9 +36,9 @@ libraryDependencies ++= Seq(
"org.scalatra" %% "scalatra" % ScalatraVersion, "org.scalatra" %% "scalatra" % ScalatraVersion,
"org.scalatra" %% "scalatra-json" % ScalatraVersion, "org.scalatra" %% "scalatra-json" % ScalatraVersion,
"org.scalatra" %% "scalatra-forms" % ScalatraVersion, "org.scalatra" %% "scalatra-forms" % ScalatraVersion,
"org.json4s" %% "json4s-jackson" % "3.5.4", "org.json4s" %% "json4s-jackson" % "3.6.2",
"commons-io" % "commons-io" % "2.6", "commons-io" % "commons-io" % "2.6",
"io.github.gitbucket" % "solidbase" % "1.0.2", "io.github.gitbucket" % "solidbase" % "1.0.3",
"io.github.gitbucket" % "markedj" % "1.0.15", "io.github.gitbucket" % "markedj" % "1.0.15",
"org.apache.commons" % "commons-compress" % "1.18", "org.apache.commons" % "commons-compress" % "1.18",
"org.apache.commons" % "commons-email" % "1.5", "org.apache.commons" % "commons-email" % "1.5",
@@ -65,12 +65,12 @@ libraryDependencies ++= Seq(
"javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided", "javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",
"org.scalatra" %% "scalatra-scalatest" % ScalatraVersion % "test", "org.scalatra" %% "scalatra-scalatest" % ScalatraVersion % "test",
"org.mockito" % "mockito-core" % "2.23.0" % "test", "org.mockito" % "mockito-core" % "2.23.4" % "test",
"com.wix" % "wix-embedded-mysql" % "3.0.0" % "test", "com.wix" % "wix-embedded-mysql" % "4.2.0" % "test",
"ru.yandex.qatools.embed" % "postgresql-embedded" % "2.9" % "test", "ru.yandex.qatools.embed" % "postgresql-embedded" % "2.10" % "test",
"net.i2p.crypto" % "eddsa" % "0.3.0", "net.i2p.crypto" % "eddsa" % "0.3.0",
"is.tagomor.woothee" % "woothee-java" % "1.8.0", "is.tagomor.woothee" % "woothee-java" % "1.8.0",
"org.ec4j.core" % "ec4j-core" % "0.0.2" "org.ec4j.core" % "ec4j-core" % "0.0.3"
) )
// Compiler settings // Compiler settings

2
src/test/scala/gitbucket/core/GitBucketCoreModuleSpec.scala
View File

@@ -33,7 +33,7 @@ class GitBucketCoreModuleSpec extends FunSuite {
.withPort(3306) .withPort(3306)
.withUser("sa", "sa") .withUser("sa", "sa")
.withCharset(Charset.UTF8) .withCharset(Charset.UTF8)
.withServerVariable("log_syslog", 0) // .withServerVariable("log_syslog", 0)
.withServerVariable("bind-address", "127.0.0.1") .withServerVariable("bind-address", "127.0.0.1")
.build() .build()