Upgrade testcontainers (#192)

* Upgrade testcontainers

* Remove commented config

Author: kevinwallimann

driver/src/test/scala/za/co/absa/hyperdrive/driver/drivers/KafkaSchemaRegistryWrapper.scala

@@ -20,8 +20,9 @@ import java.util.Properties
 import org.apache.kafka.clients.consumer.KafkaConsumer
 import org.apache.kafka.clients.producer.KafkaProducer
 import org.apache.logging.log4j.LogManager
-import org.testcontainers.containers.{GenericContainer, KafkaContainer, Network}
 import org.testcontainers.containers.wait.strategy.Wait
+import org.testcontainers.containers.{GenericContainer, KafkaContainer, Network}
+import org.testcontainers.utility.DockerImageName
 
 case class SchemaRegistryContainer(dockerImageName: String) extends GenericContainer[SchemaRegistryContainer](dockerImageName)
 
@@ -37,7 +38,8 @@ class KafkaSchemaRegistryWrapper {
   logger.info(s"Created network with id ${commonNetwork.getId}")
 
   private def startKafka(network: Network): KafkaContainer = {
-    val kafka = new KafkaContainer(confluentPlatformVersion).withNetwork(network)
+    val kafka = new KafkaContainer(DockerImageName.parse(s"confluentinc/cp-kafka:$confluentPlatformVersion"))
+      .withNetwork(network)
     kafka.start()
     kafka
   }

hyperdrive-release/pom.xml

@@ -51,6 +51,10 @@
                                     <pattern>org.apache.commons.beanutils</pattern>
                                     <shadedPattern>org.apache.shaded.commons.beanutils</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.fasterxml.jackson</pattern>
+                                    <shadedPattern>com.fasterxml.shaded.jackson</shadedPattern>
+                                </relocation>
                             </relocations>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">

ingestor-default/src/test/scala/za/co/absa/hyperdrive/ingestor/implementation/utils/TestKafkaUtilDockerTest.scala

@@ -27,13 +27,14 @@ import org.apache.kafka.common.TopicPartition
 import org.apache.kafka.common.serialization.{StringDeserializer, StringSerializer}
 import org.scalatest.{AppendedClues, BeforeAndAfter, FlatSpec, Matchers}
 import org.testcontainers.containers.KafkaContainer
+import org.testcontainers.utility.DockerImageName
 
 import scala.collection.JavaConverters._
 import scala.collection.mutable
 class TestKafkaUtilDockerTest extends FlatSpec with Matchers with BeforeAndAfter with AppendedClues {
 
   private val confluentPlatformVersion = "5.3.4" // should be same as kafka.avro.serializer.version property in pom file
-  private val kafka = new KafkaContainer(confluentPlatformVersion)
+  private val kafka = new KafkaContainer(DockerImageName.parse(s"confluentinc/cp-kafka:$confluentPlatformVersion"))
   private val kafkaSufficientTimeout = Duration.ofSeconds(5L)
   private val kafkaInsufficientTimeout = Duration.ofMillis(1L)
   private val topic = "test-topic"

parent-conf/pom.xml

@@ -39,7 +39,6 @@
 
     <properties>
         <!--Enforced versions-->
-        <fasterxml.jackson.databind.version>2.6.7.1</fasterxml.jackson.databind.version> <!--Same as Spark uses-->
         <avro.version>1.8.2</avro.version> <!--Same as Abris uses-->
 
         <!--Maven-->
@@ -65,7 +64,7 @@
         <kafka.spark.version>0-10</kafka.spark.version>
         <spark.sql.kafka.version>2.4.3</spark.sql.kafka.version>
         <spark.sql.mongo.version>2.4.2</spark.sql.mongo.version>
-        <testcontainers.kafka.version>1.12.4</testcontainers.kafka.version>
+        <testcontainers.kafka.version>1.15.1</testcontainers.kafka.version>
         <kafka.avro.serializer.version>5.3.4</kafka.avro.serializer.version> <!--Same as Abris uses-->
 
         <!--Spark-->
@@ -96,11 +95,6 @@
 
     <dependencies>
         <!--Enforced dependency versions-->
-        <!--Jackson Databind-->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
         <!--Avro-->
         <dependency>
             <groupId>org.apache.avro</groupId>
@@ -162,12 +156,6 @@
 
         <dependencies>
             <!--Enforced dependency versions-->
-            <!--Jackson Databind-->
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-databind</artifactId>
-                <version>${fasterxml.jackson.databind.version}</version>
-            </dependency>
             <!--Avro-->
             <dependency>
                 <groupId>org.apache.avro</groupId>