GEOMESA-3435. use Cassandra and ScyllaDB containers

Author: mkorolyov

geomesa-cassandra/geomesa-cassandra-datastore/pom.xml

@@ -52,8 +52,14 @@
         <!-- test deps -->
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
-            <version>1.20.4</version>
+            <artifactId>cassandra</artifactId>
+            <version>1.20.6</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>scylladb</artifactId>
+            <version>1.20.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>

geomesa-cassandra/geomesa-cassandra-datastore/src/test/scala/org/locationtech/geomesa/cassandra/data/CassandraDataStoreTest.scala

@@ -27,7 +27,9 @@ import org.specs2.matcher.MatchResult
 import org.specs2.mutable.Specification
 import org.specs2.runner.JUnitRunner
 import org.specs2.specification.BeforeAfterAll
+import org.testcontainers.cassandra.CassandraContainer
 import org.testcontainers.containers.GenericContainer
+import org.testcontainers.scylladb.ScyllaDBContainer
 
 @RunWith(classOf[JUnitRunner])
 class CassandraDataStoreTest extends Specification with BeforeAfterAll {
@@ -38,8 +40,8 @@ class CassandraDataStoreTest extends Specification with BeforeAfterAll {
 
   var params: Map[String, String] = _
 
-  private val cassandraContainer = new GenericContainer[Nothing]("cassandra:4.0.8")
-  private val scyllaContainer = new GenericContainer[Nothing]("scylladb/scylla:6.2")
+  private val cassandraContainer: GenericContainer[?] = new CassandraContainer("cassandra:4.0.8")
+  private val scyllaContainer: GenericContainer[?] = new ScyllaDBContainer("scylladb/scylla:6.2")
   private var dsList: List[CassandraDataStore] = List()
 
   def beforeAll(): Unit = {
@@ -57,7 +59,7 @@ class CassandraDataStoreTest extends Specification with BeforeAfterAll {
   }
 
 
-  def dsFromContainer(container: GenericContainer[Nothing]): CassandraDataStore = {
+  def dsFromContainer(container: GenericContainer[?]): CassandraDataStore = {
     val cqlSession = new Cluster.Builder().addContactPoints(container.getHost).withPort(9042)
       .withSocketOptions(new SocketOptions().setReadTimeoutMillis(12000)).build().connect()
     val cqlDataLoader = new CQLDataLoader(cqlSession)

pom.xml

@@ -122,7 +122,7 @@
         <specs2.version>4.20.5</specs2.version>
         <junit.version>4.13.2</junit.version>
         <junit.jupiter.version>5.9.3</junit.jupiter.version>
-        <testcontainers.version>1.20.3</testcontainers.version>
+        <testcontainers.version>1.20.6</testcontainers.version>
         <testcontainers.accumulo.version>1.4.1</testcontainers.accumulo.version>
         <!-- needs to track hadoop: https://github.com/apache/hadoop/blob/release-3.3.6-RC1/hadoop-project/pom.xml#L1279C18-L1279C24 -->
         <hadoop.minicluster.mockito.version>2.28.2</hadoop.minicluster.mockito.version>