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

Update dependencies (#2339)

Browse Source 
prepare Scala 2.13
This commit is contained in:
kenji yoshida
2019-07-04 14:43:27 +09:00
committed by Naoki Takezoe
parent c4ff760bda
commit 160c4a8a72
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.sbt
View File

@@ -55,7 +55,7 @@ libraryDependencies ++= Seq(
"ch.qos.logback" % "logback-classic" % "1.2.3",
"com.zaxxer" % "HikariCP" % "3.2.0",
"com.typesafe" % "config" % "1.3.3",
"com.typesafe.akka" %% "akka-actor" % "2.5.18",
"com.typesafe.akka" %% "akka-actor" % "2.5.23",
"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.0.Final",
@@ -68,7 +68,7 @@ libraryDependencies ++= Seq(
"junit" % "junit" % "4.12" % "test",
"org.scalatra" %% "scalatra-scalatest" % ScalatraVersion % "test",
"org.mockito" % "mockito-core" % "2.23.4" % "test",
"com.dimafeng" %% "testcontainers-scala" % "0.22.0" % "test",
"com.dimafeng" %% "testcontainers-scala" % "0.28.0" % "test",
"org.testcontainers" % "mysql" % "1.10.3" % "test",
"org.testcontainers" % "postgresql" % "1.10.3" % "test",
"net.i2p.crypto" % "eddsa" % "0.3.0",

2
project/plugins.sbt
View File

@@ -1,7 +1,7 @@
scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.4.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.4.2")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra" % "1.0.3")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")

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

@@ -33,7 +33,7 @@ class GitBucketCoreModuleSpec extends FunSuite {
// TODO https://github.com/testcontainers/testcontainers-java/issues/736
container.withCommand("mysqld --default-authentication-plugin=mysql_native_password")
}
container.starting()
container.start()
try {
new Solidbase().migrate(
DriverManager.getConnection(s"${container.jdbcUrl}?useSSL=false", container.username, container.password),
@@ -42,7 +42,7 @@ class GitBucketCoreModuleSpec extends FunSuite {
new Module(GitBucketCoreModule.getModuleId, GitBucketCoreModule.getVersions)
)
} finally {
container.finished()
container.stop()
}
}
}
@@ -51,7 +51,7 @@ class GitBucketCoreModuleSpec extends FunSuite {
test(s"Migration PostgreSQL $tag", ExternalDBTest) {
val container = PostgreSQLContainer(s"postgres:$tag")
container.starting()
container.start()
try {
new Solidbase().migrate(
DriverManager.getConnection(container.jdbcUrl, container.username, container.password),
@@ -60,7 +60,7 @@ class GitBucketCoreModuleSpec extends FunSuite {
new Module(GitBucketCoreModule.getModuleId, GitBucketCoreModule.getVersions)
)
} finally {
container.finished()
container.stop()
}
}
}