Remove joda-convert dependency (closes snowplow/snowplow#3304)

snowplow · Jun 5, 2020 · acc26b5 · acc26b5
1 parent 2f1cb6f
commit acc26b5
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 47 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -31,7 +31,6 @@ object Dependencies {
     // Java
     val awsSdk               = "1.6.10"
     val yodaTime             = "2.1"
-    val yodaConvert          = "1.2"
     val kafka                = "0.10.1.0"
     // Scala
     val snowplowCommonEnrich = "0.22.0"
@@ -54,7 +53,6 @@ object Dependencies {
     // Java
     val awsSdk               = "com.amazonaws"         %  "aws-java-sdk"              % V.awsSdk
     val yodaTime             = "joda-time"             %  "joda-time"                 % V.yodaTime
-    val yodaConvert          = "org.joda"              %  "joda-convert"              % V.yodaConvert
     val kafkaClients         = "org.apache.kafka"      %  "kafka-clients"             % V.kafka
 
     // Scala

diff --git a/project/ScalaCollectorBuild.scala b/project/ScalaCollectorBuild.scala
@@ -34,7 +34,6 @@ object ScalaCollectorBuild extends Build {
         Libraries.akkaActor,
         Libraries.akkaSlf4j,
         Libraries.yodaTime,
-        Libraries.yodaConvert,
         Libraries.logback,
         Libraries.sprayCan,
         Libraries.sprayRouting,

diff --git a/src/main/scala/com.snowplowanalytics.snowplow.collectors/scalastream/ResponseHandler.scala b/src/main/scala/com.snowplowanalytics.snowplow.collectors/scalastream/ResponseHandler.scala
@@ -75,9 +75,7 @@ import generated._
 import CollectorPayload.thrift.model1.CollectorPayload
 import sinks._
 import utils.SplitBatch
-
-// Common Enrich
-import com.snowplowanalytics.snowplow.enrich.common.outputs.BadRow
+import enrich.common.outputs.BadRow
 
 // Contains an invisible pixel to return for `/i` requests.
 object ResponseHandler {

diff --git a/src/main/scala/com.snowplowanalytics.snowplow.collectors/scalastream/sinks/KafkaSink.scala b/src/main/scala/com.snowplowanalytics.snowplow.collectors/scalastream/sinks/KafkaSink.scala
@@ -18,13 +18,7 @@ package sinks
 import java.util.Properties
 
 // Kafka
-import org.apache.kafka.clients.producer._;
-
-// Config
-import com.typesafe.config.Config
-
-// Logging
-import org.slf4j.LoggerFactory
+import org.apache.kafka.clients.producer._
 
 /**
  * Kafka Sink for the Scala collector

diff --git a/src/main/scala/com.snowplowanalytics.snowplow.collectors/scalastream/sinks/KinesisSink.scala b/src/main/scala/com.snowplowanalytics.snowplow.collectors/scalastream/sinks/KinesisSink.scala
@@ -41,16 +41,10 @@ import io.github.cloudify.scala.aws.kinesis.Definitions.{
 import io.github.cloudify.scala.aws.kinesis.KinesisDsl._
 import io.github.cloudify.scala.aws.auth.CredentialsProvider.InstanceProfile
 
-// Config
-import com.typesafe.config.Config
-
 // Concurrent libraries
 import scala.concurrent.{Future,Await,TimeoutException}
 import scala.concurrent.duration._
 
-// Logging
-import org.slf4j.LoggerFactory
-
 // Scala
 import scala.util.{Success, Failure}
 import scala.collection.JavaConverters._

diff --git a/src/main/scala/com.snowplowanalytics.snowplow.collectors/scalastream/sinks/StdoutSink.scala b/src/main/scala/com.snowplowanalytics.snowplow.collectors/scalastream/sinks/StdoutSink.scala
@@ -21,22 +21,10 @@ package collectors
 package scalastream
 package sinks
 
-// Java
-import java.nio.ByteBuffer
-
 // Apache Commons
 import org.apache.commons.codec.binary.Base64
 
-// Thrift
-import org.apache.thrift.TSerializer
-
-// Config
-import com.typesafe.config.Config
-
-// Snowplow
-import CollectorPayload.thrift.model1.CollectorPayload
-
-class StdoutSink (inputType: InputType.InputType) extends AbstractSink {
+class StdoutSink(inputType: InputType.InputType) extends AbstractSink {
 
   val MaxBytes = Long.MaxValue
 

diff --git a/src/main/scala/com.snowplowanalytics.snowplow.collectors/scalastream/sinks/TestSink.scala b/src/main/scala/com.snowplowanalytics.snowplow.collectors/scalastream/sinks/TestSink.scala
@@ -21,21 +21,6 @@ package collectors
 package scalastream
 package sinks
 
-// Java
-import java.nio.ByteBuffer
-
-// Apache Commons
-import org.apache.commons.codec.binary.Base64
-
-// Thrift
-import org.apache.thrift.TSerializer
-
-// Config
-import com.typesafe.config.Config
-
-// Snowplow
-import CollectorPayload.thrift.model1.CollectorPayload
-
 // Allow the testing framework to test collection events using the
 // same methods from AbstractSink as the other sinks.
 class TestSink extends AbstractSink {