Bump amazon-kinesis-client to 0.14.5 (close #533)

snowplow · Dec 16, 2021 · 3344a0d · 3344a0d
1 parent 38d242c
commit 3344a0d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/...s/src/main/scala/com.snowplowanalytics.snowplow.enrich.stream/sources/KinesisSource.scala b/...s/src/main/scala/com.snowplowanalytics.snowplow.enrich.stream/sources/KinesisSource.scala
@@ -148,6 +148,8 @@ class KinesisSource private (
     log.info("Using workerId: " + workerId)
 
     val kinesisClientLibConfiguration = {
+      // https://github.com/awslabs/amazon-kinesis-client/issues/737
+      @annotation.nowarn("msg=constructor KinesisClientLibConfiguration in class KinesisClientLibConfiguration is deprecated")
       val kclc = new KinesisClientLibConfiguration(
         config.appName,
         config.in.raw,

diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -102,9 +102,12 @@ object BuildSettings {
       case x if x.endsWith("ProjectSettings$.class") => MergeStrategy.first
       case x if x.endsWith("module-info.class") => MergeStrategy.first
       case x if x.endsWith("nowarn.class") => MergeStrategy.first
+      case x if x.endsWith("nowarn$.class") => MergeStrategy.first
       case x if x.endsWith("log4j.properties") => MergeStrategy.first
       case x if x.endsWith(".proto") => MergeStrategy.first
       case x if x.endsWith("reflection-config.json") => MergeStrategy.first
+      case x if x.endsWith("config.fmpp") => MergeStrategy.first
+      case x if x.endsWith("git.properties") => MergeStrategy.discard
       case x =>
         val oldStrategy = (assembly / assemblyMergeStrategy).value
         oldStrategy(x)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -62,7 +62,7 @@ object Dependencies {
 
     val awsSdk           = "1.11.728"
     val gcpSdk           = "1.106.0"
-    val kinesisClient    = "1.13.3"
+    val kinesisClient    = "1.14.5"
     val kafka            = "2.2.1"
     val nsqClient        = "1.2.0"
     val jackson          = "2.10.5"
@@ -183,4 +183,4 @@ object Dependencies {
     val http4sDsl        = "org.http4s"                       %% "http4s-dsl"                        % V.http4s          % Test
     val http4sServer     = "org.http4s"                       %% "http4s-blaze-server"               % V.http4s          % Test
   }
-}
+}