This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-projection.git
The following commit(s) were added to refs/heads/main by this push:
new 02bece9 Update Cassandra container image version to 5.0.5 (#326)
02bece9 is described below
commit 02bece9cef4c54073d0c42127af0dfd3158f5027
Author: PJ Fanning <[email protected]>
AuthorDate: Sat Oct 25 09:05:01 2025 +0100
Update Cassandra container image version to 5.0.5 (#326)
* Update Cassandra container image version to 5.0.5
* Update testcontainers version and dependencies
* Update JdbcContainerOffsetStoreSpec.scala
* Update SlickContainerOffsetStoreSpec.scala
* Update SlickContainerOffsetStoreSpec.scala
* deprecation
* compile issues
---
.../projection/cassandra/ContainerSessionProvider.scala | 2 +-
.../projection/jdbc/JdbcContainerOffsetStoreSpec.scala | 14 +++++++++-----
project/Dependencies.scala | 12 ++++++------
.../projection/slick/SlickContainerOffsetStoreSpec.scala | 14 +++++++-------
4 files changed, 23 insertions(+), 19 deletions(-)
diff --git
a/cassandra-test/src/test/scala/org/apache/pekko/projection/cassandra/ContainerSessionProvider.scala
b/cassandra-test/src/test/scala/org/apache/pekko/projection/cassandra/ContainerSessionProvider.scala
index 87dd300..a25f2e3 100644
---
a/cassandra-test/src/test/scala/org/apache/pekko/projection/cassandra/ContainerSessionProvider.scala
+++
b/cassandra-test/src/test/scala/org/apache/pekko/projection/cassandra/ContainerSessionProvider.scala
@@ -43,7 +43,7 @@ final class ContainerSessionProvider extends
CqlSessionProvider {
object ContainerSessionProvider {
private val disabled =
java.lang.Boolean.getBoolean("disable-cassandra-testcontainer")
- private lazy val container: CassandraContainer = new
CassandraContainer(DockerImageName.parse("cassandra:5.0.1"))
+ private lazy val container: CassandraContainer = new
CassandraContainer(DockerImageName.parse("cassandra:5.0.5"))
lazy val started: Future[Unit] = {
if (disabled)
diff --git
a/jdbc-int-test/src/test/scala/org/apache/pekko/projection/jdbc/JdbcContainerOffsetStoreSpec.scala
b/jdbc-int-test/src/test/scala/org/apache/pekko/projection/jdbc/JdbcContainerOffsetStoreSpec.scala
index 44c9830..d11de5c 100644
---
a/jdbc-int-test/src/test/scala/org/apache/pekko/projection/jdbc/JdbcContainerOffsetStoreSpec.scala
+++
b/jdbc-int-test/src/test/scala/org/apache/pekko/projection/jdbc/JdbcContainerOffsetStoreSpec.scala
@@ -26,8 +26,12 @@ import pekko.projection.jdbc.internal.OracleDialect
import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
import org.scalatest.Tag
-import org.testcontainers.containers._
+import org.testcontainers.containers.JdbcDatabaseContainer
+import org.testcontainers.containers.OracleContainer
import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy
+import org.testcontainers.mssqlserver.MSSQLServerContainer
+import org.testcontainers.mysql.MySQLContainer
+import org.testcontainers.postgresql.PostgreSQLContainer
object JdbcContainerOffsetStoreSpec {
@@ -78,7 +82,7 @@ object JdbcContainerOffsetStoreSpec {
object PostgresSpecConfig extends
ContainerJdbcSpecConfig("postgres-dialect") {
val name = "Postgres Database"
override def newContainer(): JdbcDatabaseContainer[_] =
- new
PostgreSQLContainer("postgres:13.1").withInitScript("db/default-init.sql")
+ new
PostgreSQLContainer("postgres:18.0").withInitScript("db/default-init.sql")
}
object PostgresLegacySchemaSpecConfig extends
ContainerJdbcSpecConfig("postgres-dialect") {
val name = "Postgres Database"
@@ -91,20 +95,20 @@ object JdbcContainerOffsetStoreSpec {
"""))
override def newContainer(): JdbcDatabaseContainer[_] =
- new
PostgreSQLContainer("postgres:13.1").withInitScript("db/default-init.sql")
+ new
PostgreSQLContainer("postgres:18.0").withInitScript("db/default-init.sql")
}
object MySQLSpecConfig extends ContainerJdbcSpecConfig("mysql-dialect") {
val name = "MySQL Database"
override def newContainer(): JdbcDatabaseContainer[_] =
- new MySQLContainer("mysql:8.0.22").withDatabaseName(schemaName)
+ new MySQLContainer("mysql:9.5.0").withDatabaseName(schemaName)
}
object MSSQLServerSpecConfig extends
ContainerJdbcSpecConfig("mssql-dialect") {
val name = "MS SQL Server Database"
override val tag: Tag = TestTags.FlakyDb
override def newContainer(): JdbcDatabaseContainer[_] = {
- val container: MSSQLServerContainer[_] =
+ val container =
new
MSSQLServerContainer("mcr.microsoft.com/mssql/server:2019-CU32-ubuntu-20.04")
container.acceptLicense()
container.withInitScript("db/default-init.sql")
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 8eb8066..1dc3329 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -30,7 +30,7 @@ object Dependencies {
val connectorsKafka = PekkoConnectorsKafkaDependency.version
val slick = "3.6.1"
val scalaTest = "3.2.19"
- val testContainers = "1.21.3"
+ val testContainers = "2.0.1"
val junit = "4.13.2"
val h2Driver = "2.4.240"
val jackson = "2.20.0" // this should match the version of jackson used by
pekko-serialization-jackson
@@ -86,16 +86,16 @@ object Dependencies {
val logback = "ch.qos.logback" % "logback-classic" % Versions.logback
val cassandraContainer =
- "org.testcontainers" % "cassandra" % Versions.testContainers
+ "org.testcontainers" % "testcontainers-cassandra" %
Versions.testContainers
val postgresContainer =
- "org.testcontainers" % "postgresql" % Versions.testContainers
+ "org.testcontainers" % "testcontainers-postgresql" %
Versions.testContainers
val mysqlContainer =
- "org.testcontainers" % "mysql" % Versions.testContainers
+ "org.testcontainers" % "testcontainers-mysql" % Versions.testContainers
val msSQLServerContainer =
- "org.testcontainers" % "mssqlserver" % Versions.testContainers
+ "org.testcontainers" % "testcontainers-mssqlserver" %
Versions.testContainers
val oracleDbContainer =
- "org.testcontainers" % "oracle-xe" % Versions.testContainers
+ "org.testcontainers" % "testcontainers-oracle-xe" %
Versions.testContainers
val connectorsKafkaTestkit =
"org.apache.pekko" %% "pekko-connectors-kafka-testkit" %
Versions.connectorsKafka
diff --git
a/slick-int-test/src/test/scala/org/apache/pekko/projection/slick/SlickContainerOffsetStoreSpec.scala
b/slick-int-test/src/test/scala/org/apache/pekko/projection/slick/SlickContainerOffsetStoreSpec.scala
index b655899..73980e4 100644
---
a/slick-int-test/src/test/scala/org/apache/pekko/projection/slick/SlickContainerOffsetStoreSpec.scala
+++
b/slick-int-test/src/test/scala/org/apache/pekko/projection/slick/SlickContainerOffsetStoreSpec.scala
@@ -22,11 +22,11 @@ import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
import org.scalatest.Tag
import org.testcontainers.containers.JdbcDatabaseContainer
-import org.testcontainers.containers.MSSQLServerContainer
-import org.testcontainers.containers.MySQLContainer
import org.testcontainers.containers.OracleContainer
-import org.testcontainers.containers.PostgreSQLContainer
import org.testcontainers.containers.startupcheck.IsRunningStartupCheckStrategy
+import org.testcontainers.mssqlserver.MSSQLServerContainer
+import org.testcontainers.mysql.MySQLContainer
+import org.testcontainers.postgresql.PostgreSQLContainer
object SlickContainerOffsetStoreSpec {
@@ -65,7 +65,7 @@ object SlickContainerOffsetStoreSpec {
class PostgresSpecConfig extends ContainerJdbcSpecConfig {
val name = "Postgres Database"
- val container = initContainer(new PostgreSQLContainer("postgres:13.1"))
+ val container = initContainer(new PostgreSQLContainer("postgres:18.0"))
override def config: Config =
super.config.withFallback(ConfigFactory.parseString("""
@@ -79,7 +79,7 @@ object SlickContainerOffsetStoreSpec {
class PostgresLegacySchemaSpecConfig extends ContainerJdbcSpecConfig {
val name = "Postgres Database"
- val container = initContainer(new PostgreSQLContainer("postgres:13.1"))
+ val container = initContainer(new PostgreSQLContainer("postgres:18.0"))
override def config: Config =
ConfigFactory.parseString("""
@@ -94,7 +94,7 @@ object SlickContainerOffsetStoreSpec {
class MySQLSpecConfig extends ContainerJdbcSpecConfig {
val name = "MySQL Database"
- val container = initContainer(new MySQLContainer("mysql:8.0.22"))
+ val container = initContainer(new MySQLContainer("mysql:9.5.0"))
override def config: Config =
super.config.withFallback(ConfigFactory.parseString("""
@@ -111,7 +111,7 @@ object SlickContainerOffsetStoreSpec {
val container = initContainer(new
MSSQLServerContainer("mcr.microsoft.com/mssql/server:2019-CU32-ubuntu-20.04"))
override protected def initContainer(container: JdbcDatabaseContainer[_]):
JdbcDatabaseContainer[_] = {
- container.asInstanceOf[MSSQLServerContainer[_]].acceptLicense()
+ container.asInstanceOf[MSSQLServerContainer].acceptLicense()
container.withUrlParam("integratedSecurity", "false")
container.withUrlParam("encrypt", "false")
super.initContainer(container)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
