diff --git a/build.sbt b/build.sbt index a1bacfa..3740f69 100644 --- a/build.sbt +++ b/build.sbt @@ -50,7 +50,7 @@ "com.github.takezoe" %% "blocking-slick-32" % "0.0.11", "com.novell.ldap" % "jldap" % "2009-10-07", "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", "ch.qos.logback" % "logback-classic" % "1.2.3", "com.zaxxer" % "HikariCP" % "3.2.0", @@ -68,9 +68,9 @@ "junit" % "junit" % "4.12" % "test", "org.scalatra" %% "scalatra-scalatest" % ScalatraVersion % "test", "org.mockito" % "mockito-core" % "2.23.4" % "test", - "com.dimafeng" %% "testcontainers-scala" % "0.28.0" % "test", - "org.testcontainers" % "mysql" % "1.10.3" % "test", - "org.testcontainers" % "postgresql" % "1.10.3" % "test", + "com.dimafeng" %% "testcontainers-scala" % "0.29.0" % "test", + "org.testcontainers" % "mysql" % "1.11.4" % "test", + "org.testcontainers" % "postgresql" % "1.11.4" % "test", "net.i2p.crypto" % "eddsa" % "0.3.0", "is.tagomor.woothee" % "woothee-java" % "1.8.0", "org.ec4j.core" % "ec4j-core" % "0.0.3" diff --git a/src/test/scala/gitbucket/core/GitBucketCoreModuleSpec.scala b/src/test/scala/gitbucket/core/GitBucketCoreModuleSpec.scala index b5ade72..5381a23 100644 --- a/src/test/scala/gitbucket/core/GitBucketCoreModuleSpec.scala +++ b/src/test/scala/gitbucket/core/GitBucketCoreModuleSpec.scala @@ -30,7 +30,7 @@ override val container = new org.testcontainers.containers.MySQLContainer(s"mysql:$tag") { 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.start()