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

Bump testcontainers to 1.11.4 (#2346)

Browse Source 
* Bump testcontainers to 1.11.4
* Bump mariadb-java-client to 2.4.2
* Bump testcontainers-scala to 0.29.0
This commit is contained in:
Naoki Takezoe
2019-07-16 16:25:47 +09:00
committed by GitHub
parent 92b35bd458
commit b015cdde74
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.sbt
View File

@@ -50,7 +50,7 @@ libraryDependencies ++= Seq(
"com.github.takezoe" %% "blocking-slick-32" % "0.0.11", "com.github.takezoe" %% "blocking-slick-32" % "0.0.11",
"com.novell.ldap" % "jldap" % "2009-10-07", "com.novell.ldap" % "jldap" % "2009-10-07",
"com.h2database" % "h2" % "1.4.197", "com.h2database" % "h2" % "1.4.197",
"org.mariadb.jdbc" % "mariadb-java-client" % "2.3.0", "org.mariadb.jdbc" % "mariadb-java-client" % "2.4.2",
"org.postgresql" % "postgresql" % "42.2.5", "org.postgresql" % "postgresql" % "42.2.5",
"ch.qos.logback" % "logback-classic" % "1.2.3", "ch.qos.logback" % "logback-classic" % "1.2.3",
"com.zaxxer" % "HikariCP" % "3.2.0", "com.zaxxer" % "HikariCP" % "3.2.0",
@@ -68,9 +68,9 @@ libraryDependencies ++= Seq(
"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.4" % "test", "org.mockito" % "mockito-core" % "2.23.4" % "test",
"com.dimafeng" %% "testcontainers-scala" % "0.28.0" % "test", "com.dimafeng" %% "testcontainers-scala" % "0.29.0" % "test",
"org.testcontainers" % "mysql" % "1.10.3" % "test", "org.testcontainers" % "mysql" % "1.11.4" % "test",
"org.testcontainers" % "postgresql" % "1.10.3" % "test", "org.testcontainers" % "postgresql" % "1.11.4" % "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.3" "org.ec4j.core" % "ec4j-core" % "0.0.3"

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

@@ -30,7 +30,7 @@ class GitBucketCoreModuleSpec extends FunSuite {
override val container = new org.testcontainers.containers.MySQLContainer(s"mysql:$tag") { override val container = new org.testcontainers.containers.MySQLContainer(s"mysql:$tag") {
override def getDriverClassName = "org.mariadb.jdbc.Driver" override def getDriverClassName = "org.mariadb.jdbc.Driver"
} }
// TODO https://github.com/testcontainers/testcontainers-java/issues/736 // TODO https://jira.mariadb.org/browse/CONJ-663
container.withCommand("mysqld --default-authentication-plugin=mysql_native_password") container.withCommand("mysqld --default-authentication-plugin=mysql_native_password")
} }
container.start() container.start()