From 7630c490ceaba202e64b310af9daac78ab65d68d Mon Sep 17 00:00:00 2001 From: Laglangyue <35491928+laglangyue@users.noreply.github.com> Date: Fri, 5 Apr 2024 18:35:25 +0800 Subject: [PATCH] upgrade mssql driver (#126) * upgrade mssql driver * add encrypt --------- Co-authored-by: tangjiafu --- .../pekko/projection/jdbc/JdbcContainerOffsetStoreSpec.scala | 2 ++ project/Dependencies.scala | 2 +- .../pekko/projection/slick/SlickContainerOffsetStoreSpec.scala | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/jdbc/src/it/scala/org/apache/pekko/projection/jdbc/JdbcContainerOffsetStoreSpec.scala b/jdbc/src/it/scala/org/apache/pekko/projection/jdbc/JdbcContainerOffsetStoreSpec.scala index 146e5534..a6e21bf2 100644 --- a/jdbc/src/it/scala/org/apache/pekko/projection/jdbc/JdbcContainerOffsetStoreSpec.scala +++ b/jdbc/src/it/scala/org/apache/pekko/projection/jdbc/JdbcContainerOffsetStoreSpec.scala @@ -108,6 +108,8 @@ object JdbcContainerOffsetStoreSpec { new MSSQLServerContainer("mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04") container.acceptLicense() container.withInitScript("db/default-init.sql") + container.withUrlParam("integratedSecurity", "false") + container.withUrlParam("encrypt", "false") container } } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 51429f04..7c9a4bf0 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -76,7 +76,7 @@ object Dependencies { val h2Driver = Compile.h2Driver % allTestConfig val postgresDriver = "org.postgresql" % "postgresql" % "42.7.3" % allTestConfig val mysqlDriver = "mysql" % "mysql-connector-java" % "8.0.33" % allTestConfig - val msSQLServerDriver = "com.microsoft.sqlserver" % "mssql-jdbc" % "8.4.1.jre8" % allTestConfig + val msSQLServerDriver = "com.microsoft.sqlserver" % "mssql-jdbc" % "12.6.1.jre8" % allTestConfig val oracleDriver = "com.oracle.ojdbc" % "ojdbc8" % "19.3.0.0" % allTestConfig val logback = "ch.qos.logback" % "logback-classic" % Versions.logback % allTestConfig diff --git a/slick/src/it/scala/org/apache/pekko/projection/slick/SlickContainerOffsetStoreSpec.scala b/slick/src/it/scala/org/apache/pekko/projection/slick/SlickContainerOffsetStoreSpec.scala index 1d610127..81df8262 100644 --- a/slick/src/it/scala/org/apache/pekko/projection/slick/SlickContainerOffsetStoreSpec.scala +++ b/slick/src/it/scala/org/apache/pekko/projection/slick/SlickContainerOffsetStoreSpec.scala @@ -112,6 +112,8 @@ object SlickContainerOffsetStoreSpec { override protected def initContainer(container: JdbcDatabaseContainer[_]): JdbcDatabaseContainer[_] = { container.asInstanceOf[MSSQLServerContainer[_]].acceptLicense() + container.withUrlParam("integratedSecurity", "false") + container.withUrlParam("encrypt", "false") super.initContainer(container) }