diff --git a/.travis.yml b/.travis.yml index fc93777..203071e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ services: - docker scala: - 2.11.11 -- 2.12.5 +- 2.12.8 jdk: - oraclejdk8 cache: diff --git a/build.sbt b/build.sbt index 3e3123c..4678000 100644 --- a/build.sbt +++ b/build.sbt @@ -25,8 +25,8 @@ lazy val library = object Version { val scalaCheck = "1.13.5" val scalaTest = "3.0.5" - val jackson = "2.9.4" - val akka = "2.5.11" + val jackson = "2.9.8" + val akka = "2.5.19" } val jackson = Seq( @@ -42,10 +42,11 @@ lazy val library = val amazon = Seq( // TODO: Upgrade this to 1.9.x when this issue is resolved and exposed in localstack: // https://github.com/mhart/kinesalite/issues/59 + // 1.9.3 breaks KinesisSourceGraphStageIntegrationSpec and ConsumerProcessingManagerIntegrationSpec "com.amazonaws" % "amazon-kinesis-client" % "1.8.10" % Compile excludeAll (ExclusionRule(organization = "com.fasterxml.jackson.core"), ExclusionRule(organization = "com.fasterxml.jackson.dataformat")), - "com.amazonaws" % "amazon-kinesis-producer" % "0.12.8" % Compile + "com.amazonaws" % "amazon-kinesis-producer" % "0.12.11" % Compile excludeAll (ExclusionRule(organization = "com.fasterxml.jackson.core"), ExclusionRule(organization = "com.fasterxml.jackson.dataformat")) ) @@ -54,7 +55,7 @@ lazy val library = "com.typesafe" % "config" % "1.3.3" % Compile, "com.typesafe.akka" %% "akka-actor" % Version.akka % Compile, "com.typesafe.akka" %% "akka-stream" % Version.akka % Compile, - "com.typesafe.scala-logging" %% "scala-logging" % "3.8.0" % Compile + "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0" % Compile ) val logback = Seq( diff --git a/project/build.properties b/project/build.properties index 210243d..dca663d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.1.1 +sbt.version = 1.2.8 diff --git a/src/test/scala/com/weightwatchers/reactive/kinesis/consumer/ConsumerConfSpec.scala b/src/test/scala/com/weightwatchers/reactive/kinesis/consumer/ConsumerConfSpec.scala index a66cd7c..178cfa9 100644 --- a/src/test/scala/com/weightwatchers/reactive/kinesis/consumer/ConsumerConfSpec.scala +++ b/src/test/scala/com/weightwatchers/reactive/kinesis/consumer/ConsumerConfSpec.scala @@ -216,6 +216,15 @@ class ConsumerConfSpec | # Default: not set | logWarningForTaskAfterMillis = 100 | + | # The sleep time between two listShards calls from the proxy when throttled. + | # Default: 1500 + | listShardsBackoffTimeInMillis = 1500 + | + | + | # The number of times the Proxy will retry listShards call when throttled. + | # Default: 50 + | maxListShardsRetryAttempts = 50 + | | # True if we should ignore child shards which have open parents | # Default: not set | ignoreUnexpectedChildShards = false