Merge 8144d83 into d1cb41f

exasol · Dec 11, 2020 · cb648aa · cb648aa
2 parents d1cb41f + 8144d83
commit cb648aa
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/doc/changes/changes_0.1.1.md b/doc/changes/changes_0.1.1.md
@@ -1,6 +1,10 @@
 # Kinesis Connector Extension 0.1.1, released 2020-??-??
 
-## Feature
+Code name: 
+
+## Bug
+
+* #18: Fixed jackson-core/jackson-dataformat-cbor incompatible library version.
 
 ## Refactoring
 
@@ -12,3 +16,10 @@
 * #15: Added a link to the development guide.
 
 ## Dependency updates
+
+* Added `com.fasterxml.jackson.core:jackson-dataformat-cbor:2.12.0`
+* Updated `com.fasterxml.jackson.core:jackson-databind:2.11.2` to `2.12.0`
+* Updated `com.fasterxml.jackson.core:jackson-module-scala:2.11.2` to `2.12.0`
+* Updated `com.exasol:exasol-testcontainers:3.0.0` to `3.4.0`
+* Updated `org.testcontainers:localstack:1.14.3` to `1.15.0`
+* Updated `com.amazonaws:aws-java-sdk-core:1.11.860` to `1.11.916`
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -9,15 +9,15 @@ object Dependencies {
   // Runtime dependencies versions
   private val ExasolVersion = "6.1.7"
   private val ImportExportUDFVersion = "0.1.0"
-  private val AwsJavaSdkVersion = "1.11.860"
+  private val AwsJavaSdkVersion = "1.11.916"
+  private val FasterxmlJacksonVersion = "2.12.0"
 
   // Test dependencies versions
   private val ScalaTestVersion = "3.2.2"
   private val ScalaTestPlusVersion = "1.0.0-M2"
   private val MockitoCoreVersion = "3.5.10"
-  private val ExasolTestContainersVersion = "3.0.0"
-  private val TestContainersLocalstackVersion = "1.14.3"
-  private val FasterxmlJacksonVersion = "2.11.2"
+  private val ExasolTestContainersVersion = "3.4.0"
+  private val TestContainersLocalstackVersion = "1.15.0"
 
   val Resolvers: Seq[Resolver] = Seq(
     "Confluent Maven Repo" at "https://packages.confluent.io/maven/",
@@ -30,7 +30,8 @@ object Dependencies {
     "com.amazonaws" % "aws-java-sdk-core" % AwsJavaSdkVersion,
     "com.amazonaws" % "aws-java-sdk-kinesis" % AwsJavaSdkVersion,
     "com.fasterxml.jackson.core" % "jackson-databind" % FasterxmlJacksonVersion,
-    "com.fasterxml.jackson.module" %% "jackson-module-scala" % FasterxmlJacksonVersion
+    "com.fasterxml.jackson.module" %% "jackson-module-scala" % FasterxmlJacksonVersion,
+    "com.fasterxml.jackson.dataformat" % "jackson-dataformat-cbor" % FasterxmlJacksonVersion
   )
 
   lazy val TestDependencies: Seq[ModuleID] = Seq(

diff --git a/src/it/scala/com/exasol/cloudetl/kinesis/KinesisAbstractIntegrationTest.scala b/src/it/scala/com/exasol/cloudetl/kinesis/KinesisAbstractIntegrationTest.scala
@@ -1,15 +1,16 @@
 package com.exasol.cloudetl.kinesis
 
-import java.io.File
-import java.nio.file.Paths
-import java.sql.ResultSet
-
 import com.amazonaws.SDKGlobalConfiguration.AWS_CBOR_DISABLE_SYSTEM_PROPERTY
 import com.amazonaws.services.kinesis.{AmazonKinesis, AmazonKinesisClientBuilder}
-import com.exasol.containers.{ExasolContainer, ExasolContainerConstants}
+import com.exasol.containers.ExasolContainer
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.funsuite.AnyFunSuite
 import org.testcontainers.containers.localstack.LocalStackContainer
+import org.testcontainers.utility.DockerImageName
+
+import java.io.File
+import java.nio.file.Paths
+import java.sql.ResultSet
 
 trait KinesisAbstractIntegrationTest extends AnyFunSuite with BeforeAndAfterAll {
   val JAR_DIRECTORY_PATTERN = "scala-"
@@ -18,11 +19,10 @@ trait KinesisAbstractIntegrationTest extends AnyFunSuite with BeforeAndAfterAll
   val TEST_SCHEMA_NAME = "kinesis_schema"
   var assembledJarName: String = _
 
-  val exasolContainer = new ExasolContainer(
-    ExasolContainerConstants.EXASOL_DOCKER_IMAGE_REFERENCE
-  )
+  val exasolContainer = new ExasolContainer("7.0.4")
   val kinesisLocalStack: LocalStackContainer =
-    new LocalStackContainer().withServices(LocalStackContainer.Service.KINESIS)
+    new LocalStackContainer(DockerImageName.parse("localstack/localstack:0.12.3"))
+      .withServices(LocalStackContainer.Service.KINESIS)
 
   private[this] var connection: java.sql.Connection = _
   var statement: java.sql.Statement = _
@@ -98,7 +98,6 @@ trait KinesisAbstractIntegrationTest extends AnyFunSuite with BeforeAndAfterAll
     statement.execute(
       s"""CREATE OR REPLACE JAVA SET SCRIPT KINESIS_METADATA (...)
          |EMITS (KINESIS_SHARD_ID VARCHAR(130), SHARD_SEQUENCE_NUMBER VARCHAR(2000)) AS
-         |     %jvmoption -Dcom.amazonaws.sdk.disableCbor=true;
          |     %scriptclass com.exasol.cloudetl.kinesis.KinesisShardsMetadataReader;
          |     %jar /buckets/bfsdefault/default/$assembledJarName;
          |/