Bump akka http version and simplify dependencies

Moves the json parsing out of the common package so all projects don't
need the spray json parsing. Bump akka http version.

This is an addition to the memory leak fix, in the previous fix old akka
versions were still being included on the classpath

Author: afoerster

alert-engine/src/main/scala/io/phdata/pulse/alertengine/AlertEngineImpl.scala

@@ -18,7 +18,7 @@ package io.phdata.pulse.alertengine
 
 import com.typesafe.scalalogging.LazyLogging
 import io.phdata.pulse.alertengine.notification.NotificationServices
-import io.phdata.pulse.common.{ JsonSupport, SolrService }
+import io.phdata.pulse.common.{ SolrService }
 
 /**
  * The Alert Engine will
@@ -31,7 +31,6 @@ import io.phdata.pulse.common.{ JsonSupport, SolrService }
  */
 class AlertEngineImpl(solrService: SolrService, notificatonServices: NotificationServices)
     extends AlertEngine
-    with JsonSupport
     with LazyLogging {
 
   def run(applications: List[Application], silencedApplications: List[String]): Unit = {

build.sbt

@@ -69,7 +69,7 @@ lazy val dependencies =
     val scalaTest         = "org.scalatest" %% "scalatest"                   % scalaTestVersion     % Test
     val scalaDockerTest   = "com.whisk"     %% "docker-testkit-scalatest"    % dockerTestKitVersion % Test
     val spotifyDockerTest = "com.whisk"     %% "docker-testkit-impl-spotify" % dockerTestKitVersion % Test
-    val slf4jLogging   = "org.slf4j"                  % "slf4j-log4j12"   % "1.7.5" % Test
+    val slf4jLogging   = "org.slf4j"                  % "slf4j-log4j12"   % "1.7.5"
 
     val kudu          = "org.apache.kudu" % "kudu-client"     % kuduVersion
     val kuduTestUtils = "org.apache.kudu" % "kudu-test-utils" % kuduVersion % Test
@@ -86,10 +86,10 @@ lazy val dependencies =
     val apacheKafka = "org.apache.kafka" % "kafka_2.11" % "0.10.2-kafka-2.2.0" % Provided
 
     // Http depends
+    val akkaActor         = "com.typesafe.akka" %% "akka-actor"           % akkaActorVersion
+    val akkaStream        = "com.typesafe.akka" %% "akka-stream"          % akkaActorVersion
     val akkaHttp          = "com.typesafe.akka" %% "akka-http"            % akkaHttpVersion
     val akkaHttpSprayJson = "com.typesafe.akka" %% "akka-http-spray-json" % akkaHttpVersion
-    val akkaCors          = "ch.megard"         %% "akka-http-cors"       % akkaCorsVersion
-    val akka              = "com.typesafe.akka" %% "akka-actor"           % akkaVersion
 
     val akkaTestKit  = "com.typesafe.akka" %% "akka-testkit"      % "2.4.20"        % Test
     val akkaHttpTest = "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion % Test
@@ -127,7 +127,7 @@ lazy val dependencies =
     val cli = Seq(scallop, scalaYaml)
     val all = common ++ cli ++ Seq(scalaDockerTest, spotifyDockerTest)
 
-    val http = Seq(akkaHttp, akkaHttpSprayJson, akkaCors, akkaTestKit, akkaHttpTest)
+    val http = Seq(akkaHttp, akkaHttpSprayJson, akkaTestKit, akkaHttpTest, akkaActor, akkaStream)
 
     val mocking = Seq(mockito, powermock, powerMockApi, powerMockJunit)
   }
@@ -172,8 +172,7 @@ lazy val `log-collector` = project
       dependencies.kudu,
       dependencies.kuduBinary,
       dependencies.kuduTestUtils
-    ) ++ dependencies.solr ++ dependencies.common,
-    dependencyOverrides += dependencies.akka
+    ) ++ dependencies.solr ++ dependencies.common
   )
   .dependsOn(common)
   .dependsOn(solrModule)
@@ -198,15 +197,14 @@ lazy val `alert-engine` = project
     settings,
     libraryDependencies ++= dependencies.common ++ dependencies.solr ++ Seq(dependencies.javaMail) ++ Seq(
       dependencies.scalaYaml,
-      dependencies.sprayJson,
       dependencies.scallop) ++ dependencies.mocking
   )
   .dependsOn(common)
   .dependsOn(solrModule)
   .dependsOn(solrModule % "test->test")
 
 lazy val `common` = project
-  .settings(name := "common", settings, libraryDependencies ++= dependencies.common :+ dependencies.akkaHttpSprayJson)
+  .settings(name := "common", settings, libraryDependencies ++= dependencies.common)
 
 lazy val `solr4` = project
   .settings(
@@ -247,9 +245,8 @@ val scalaTestVersion     = "3.0.8"
 val dockerTestKitVersion = "0.9.5"
 val solrj4Version        = "4.10.3-cdh5.12.1"
 val solrj7Version        = "7.4.0-cdh6.1.1"
-val akkaVersion          = "2.5.8"
-val akkaHttpVersion      = "10.0.15"
-val akkaCorsVersion      = "0.2.2"
+val akkaActorVersion     = "2.5.23"
+val akkaHttpVersion      = "10.1.10"
 val sprayJsonVersion     = "1.3.5"
 val sparkVersion         = "2.2.0.cloudera1"
 val log4jVersion         = "1.2.17"

common/src/main/scala/io/phdata/pulse/common/JsonSupport.scala renamed to log-collector/src/main/scala/io/phdata/pulse/logcollector/JsonSupport.scala

@@ -1,19 +1,4 @@
-/*
- * Copyright 2018 phData Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.phdata.pulse.common
+package io.phdata.pulse.logcollector
 
 import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
 import io.phdata.pulse.common.domain.{ LogEvent, TimeseriesEvent, TimeseriesRequest }

log-collector/src/main/scala/io/phdata/pulse/logcollector/LogCollectorRoutes.scala

@@ -20,7 +20,6 @@ import akka.http.scaladsl.common.EntityStreamingSupport
 import akka.http.scaladsl.model.{ ContentTypes, HttpEntity, StatusCodes }
 import akka.http.scaladsl.server.Directives._
 import com.typesafe.scalalogging.LazyLogging
-import io.phdata.pulse.common.JsonSupport
 import io.phdata.pulse.common.domain.{ LogEvent, TimeseriesRequest }
 
 /**

log-collector/src/main/scala/io/phdata/pulse/logcollector/PulseKafkaConsumer.scala

@@ -20,7 +20,6 @@ import java.util.{ Collections, Properties }
 
 import org.apache.kafka.clients.consumer.KafkaConsumer
 import com.typesafe.scalalogging.LazyLogging
-import io.phdata.pulse.common.JsonSupport
 import spray.json.JsonParser.ParsingException
 
 import scala.collection.JavaConverters._

log-collector/src/test/scala/io/phdata/pulse/logcollector/LogCollectorRoutesTest.scala

@@ -21,7 +21,6 @@ import akka.http.scaladsl.marshalling.Marshal
 import akka.http.scaladsl.model.{ ContentTypes, HttpEntity, MessageEntity, StatusCodes }
 import akka.http.scaladsl.server.Route
 import akka.http.scaladsl.testkit.ScalatestRouteTest
-import io.phdata.pulse.common.JsonSupport
 import io.phdata.pulse.common.domain.{ LogEvent, TimeseriesEvent, TimeseriesRequest }
 import io.phdata.pulse.solr.BaseSolrCloudTest
 import org.mockito.Mockito.verify

log-collector/src/test/scala/io/phdata/pulse/logcollector/PulseKafkaConsumerTest.scala

@@ -20,7 +20,6 @@ import java.sql.Timestamp
 import java.text.SimpleDateFormat
 import java.util.Properties
 
-import io.phdata.pulse.common.JsonSupport
 import io.phdata.pulse.logcollector.utils.{ KafkaMiniCluster, ZooKafkaConfig }
 import io.phdata.pulse.solr.{ BaseSolrCloudTest }
 import org.apache.kafka.clients.consumer.ConsumerConfig