Merge branch 'apache-main' into pr/126

apache · Mar 31, 2024 · 2ab7209 · 2ab7209
2 parents ced3e10 + 09a091d
commit 2ab7209
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
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
@@ -63,7 +63,7 @@ object JdbcContainerOffsetStoreSpec {
 
     def newContainer(): JdbcDatabaseContainer[_]
 
-    final override def initContainer(): Unit = {
+    override def initContainer(): Unit = {
       val container = newContainer()
       _container = Some(container)
       container.withStartupCheckStrategy(new IsRunningStartupCheckStrategy)
@@ -103,9 +103,13 @@ object JdbcContainerOffsetStoreSpec {
   object MSSQLServerSpecConfig extends ContainerJdbcSpecConfig("mssql-dialect") {
     val name = "MS SQL Server Database"
     override val tag: Tag = TestTags.FlakyDb
-    override def newContainer(): JdbcDatabaseContainer[_] =
-      new MSSQLServerContainer("mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04")
-        .withInitScript("db/default-init.sql")
+    override def newContainer(): JdbcDatabaseContainer[_] = {
+      val container: MSSQLServerContainer[_] =
+        new MSSQLServerContainer("mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04")
+      container.acceptLicense()
+      container.withInitScript("db/default-init.sql")
+      container
+    }
   }
 
   object OracleSpecConfig extends ContainerJdbcSpecConfig("oracle-dialect") {

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
@@ -110,6 +110,11 @@ object SlickContainerOffsetStoreSpec {
 
     val container = initContainer(new MSSQLServerContainer("mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04"))
 
+    override protected def initContainer(container: JdbcDatabaseContainer[_]): JdbcDatabaseContainer[_] = {
+      container.asInstanceOf[MSSQLServerContainer[_]].acceptLicense()
+      super.initContainer(container)
+    }
+
     override def config: Config =
       super.config.withFallback(ConfigFactory.parseString("""
         pekko.projection.slick {