From 17cca0e4785c75733a5662da516aeec889d44636 Mon Sep 17 00:00:00 2001 From: Ben Fradet Date: Mon, 26 Jun 2017 17:52:15 +0100 Subject: [PATCH] Remove joda-convert dependency (closes #98) --- project/Dependencies.scala | 2 -- project/SnowplowS3SinkBuild.scala | 1 - .../s3/S3Emitter.scala | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f467a8d..d2370e9 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -27,7 +27,6 @@ object Dependencies { val elephantbird = "4.5" val hadoopLZO = "0.4.20" val yodaTime = "2.2" - val yodaConvert = "1.2" val config = "1.0.2" // Thrift (test only) val collectorPayload = "0.0.0" @@ -49,7 +48,6 @@ object Dependencies { val elephantbird = "com.twitter.elephantbird" % "elephant-bird-core" % V.elephantbird val hadoopLZO = "com.hadoop.gplcompression" % "hadoop-lzo" % V.hadoopLZO val yodaTime = "joda-time" % "joda-time" % V.yodaTime - val yodaConvert = "org.joda" % "joda-convert" % V.yodaConvert val config = "com.typesafe" % "config" % V.config // Thrift (test only) val collectorPayload = "com.snowplowanalytics" % "collector-payload-1" % V.collectorPayload % "test" diff --git a/project/SnowplowS3SinkBuild.scala b/project/SnowplowS3SinkBuild.scala index b575f19..7e57fa1 100644 --- a/project/SnowplowS3SinkBuild.scala +++ b/project/SnowplowS3SinkBuild.scala @@ -41,7 +41,6 @@ object SnowplowKinesisEnrichBuild extends Build { Libraries.json4sJackson, Libraries.collectorPayload, Libraries.yodaTime, - Libraries.yodaConvert, Libraries.snowplowTracker ) ) diff --git a/src/main/scala/com.snowplowanalytics.snowplow.storage.kinesis/s3/S3Emitter.scala b/src/main/scala/com.snowplowanalytics.snowplow.storage.kinesis/s3/S3Emitter.scala index afe8b54..083e771 100644 --- a/src/main/scala/com.snowplowanalytics.snowplow.storage.kinesis/s3/S3Emitter.scala +++ b/src/main/scala/com.snowplowanalytics.snowplow.storage.kinesis/s3/S3Emitter.scala @@ -79,7 +79,7 @@ import serializers._ * * Once the buffer is full, the emit function is called. */ -class S3Emitter(config: KinesisConnectorConfiguration, badSink: ISink, serializer: ISerializer, maxConnectionTime: Long, tracker: Option[Tracker]) extends IEmitter[ EmitterInput ] { +class S3Emitter(config: KinesisConnectorConfiguration, badSink: ISink, serializer: ISerializer, maxConnectionTime: Long, tracker: Option[Tracker]) extends IEmitter[EmitterInput] { /** * The amount of time to wait in between unsuccessful index requests (in milliseconds).