From 25ccc687aaad848e9fd6fa747243ffee206eb61a Mon Sep 17 00:00:00 2001 From: "scala-steward-asf[bot]" <147768647+scala-steward-asf[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 17:18:24 +0800 Subject: [PATCH] Update cassandra, mssqlserver, mysql, ... to 1.19.7 (#141) --- .../projection/cassandra/ContainerSessionProvider.scala | 2 +- jdbc/src/it/resources/db/oracle-init.sql | 2 -- .../pekko/projection/jdbc/JdbcContainerOffsetStoreSpec.scala | 5 +++-- project/Dependencies.scala | 2 +- .../projection/slick/SlickContainerOffsetStoreSpec.scala | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 jdbc/src/it/resources/db/oracle-init.sql diff --git a/cassandra/src/it/scala/org/apache/pekko/projection/cassandra/ContainerSessionProvider.scala b/cassandra/src/it/scala/org/apache/pekko/projection/cassandra/ContainerSessionProvider.scala index 43152ce3..a55eed5a 100644 --- a/cassandra/src/it/scala/org/apache/pekko/projection/cassandra/ContainerSessionProvider.scala +++ b/cassandra/src/it/scala/org/apache/pekko/projection/cassandra/ContainerSessionProvider.scala @@ -34,7 +34,7 @@ final class ContainerSessionProvider extends CqlSessionProvider { override def connect()(implicit ec: ExecutionContext): Future[CqlSession] = started.map { _ => CqlSession.builder .addContactEndPoint(new DefaultEndPoint(InetSocketAddress - .createUnresolved(container.getContainerIpAddress, container.getFirstMappedPort.intValue()))) + .createUnresolved(container.getHost, container.getFirstMappedPort.intValue()))) .withLocalDatacenter("datacenter1") .build() } diff --git a/jdbc/src/it/resources/db/oracle-init.sql b/jdbc/src/it/resources/db/oracle-init.sql deleted file mode 100644 index 30145706..00000000 --- a/jdbc/src/it/resources/db/oracle-init.sql +++ /dev/null @@ -1,2 +0,0 @@ -CREATE USER "TEST_SCHEMA" IDENTIFIED BY password; -GRANT UNLIMITED TABLESPACE TO "TEST_SCHEMA"; \ No newline at end of file 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 a6e21bf2..5021f400 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 @@ -121,8 +121,9 @@ object JdbcContainerOffsetStoreSpec { // otherwise we get ORA-01882: timezone region not found System.setProperty("oracle.jdbc.timezoneAsRegion", "false") override def newContainer() = - new OracleContainer("oracleinanutshell/oracle-xe-11g:1.0.0") - .withInitScript("db/oracle-init.sql") + new OracleContainer("gvenzl/oracle-xe:21-slim-faststart") + .withUsername("TEST_SCHEMA") + .withPassword("password") } } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8b64eb2f..7df4f2fa 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -32,7 +32,7 @@ object Dependencies { val connectorsKafka = PekkoConnectorsKafkaDependency.version val slick = "3.5.0" val scalaTest = "3.2.18" - val testContainers = "1.15.3" + val testContainers = "1.19.7" val junit = "4.13.2" val h2Driver = "2.2.224" val jackson = "2.16.2" // this should match the version of jackson used by pekko-serialization-jackson 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 81df8262..b924fe9b 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 @@ -132,7 +132,7 @@ object SlickContainerOffsetStoreSpec { // otherwise we get ORA-01882: timezone region not found System.setProperty("oracle.jdbc.timezoneAsRegion", "false") - val container = initContainer(new OracleContainer("oracleinanutshell/oracle-xe-11g:1.0.0")) + val container = initContainer(new OracleContainer("gvenzl/oracle-xe:21-slim-faststart")) override def config: Config = super.config.withFallback(ConfigFactory.parseString("""