Merge pull request #163 from advancedtelematic/feat/upgrade-flyway

Bump libats version to upgrade Flyway.
advancedtelematic · Feb 14, 2020 · d69ee9d · d69ee9d
2 parents 2fab8ec + 41bdaa1
commit d69ee9d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -37,7 +37,7 @@ lazy val library =
     object Version {
       val scalaCheck = "1.14.1"
       val scalaTest  = "3.0.8"
-      val libAts     = "0.3.0-74-ge5279dc"
+      val libAts     = "0.3.0-83-g43409bd"
       val akka = "2.5.25"
       val akkaHttp = "10.1.10"
       val mariaDb = "2.4.4"

diff --git a/src/main/scala/com/advancedtelematic/ota/deviceregistry/Boot.scala b/src/main/scala/com/advancedtelematic/ota/deviceregistry/Boot.scala
@@ -15,14 +15,13 @@ import akka.http.scaladsl.settings.{ParserSettings, ServerSettings}
 import com.advancedtelematic.libats.auth.NamespaceDirectives
 import com.advancedtelematic.libats.data.DataType.Namespace
 import com.advancedtelematic.libats.http._
-import com.advancedtelematic.libats.http.monitoring.MetricsSupport
 import com.advancedtelematic.libats.http.tracing.Tracing
 import com.advancedtelematic.libats.messaging._
 import com.advancedtelematic.libats.messaging_datatype.DataType.DeviceId
 import com.advancedtelematic.libats.slick.db.{CheckMigrations, DatabaseConfig}
 import com.advancedtelematic.libats.slick.monitoring.{DatabaseMetrics, DbHealthResource}
-import com.advancedtelematic.metrics.{AkkaHttpConnectionMetrics, AkkaHttpRequestMetrics}
 import com.advancedtelematic.metrics.prometheus.PrometheusMetricsSupport
+import com.advancedtelematic.metrics.{AkkaHttpConnectionMetrics, AkkaHttpRequestMetrics, MetricsSupport}
 import com.advancedtelematic.ota.deviceregistry.db.DeviceRepository
 import com.advancedtelematic.ota.deviceregistry.http.`application/toml`
 import com.typesafe.config.ConfigFactory

diff --git a/src/main/scala/com/advancedtelematic/ota/deviceregistry/DaemonBoot.scala b/src/main/scala/com/advancedtelematic/ota/deviceregistry/DaemonBoot.scala
@@ -1,18 +1,16 @@
 package com.advancedtelematic.ota.deviceregistry
 
-
 import akka.http.scaladsl.Http
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.Route
 import com.advancedtelematic.libats.http.BootApp
 import com.advancedtelematic.libats.http.VersionDirectives.versionHeaders
-import com.advancedtelematic.libats.http.monitoring.MetricsSupport
 import com.advancedtelematic.libats.messaging.{MessageBus, MessageListenerSupport}
 import com.advancedtelematic.libats.messaging_datatype.Messages.{DeviceEventMessage, DeviceSeen, DeviceUpdateEvent}
 import com.advancedtelematic.libats.slick.db.{BootMigrations, CheckMigrations, DatabaseConfig}
 import com.advancedtelematic.libats.slick.monitoring.DbHealthResource
-import com.advancedtelematic.metrics.MonitoredBusListenerSupport
 import com.advancedtelematic.metrics.prometheus.PrometheusMetricsSupport
+import com.advancedtelematic.metrics.{MetricsSupport, MonitoredBusListenerSupport}
 import com.advancedtelematic.ota.deviceregistry.daemon.{DeleteDeviceHandler, DeviceEventListener, DeviceSeenListener, DeviceUpdateEventListener}
 import com.advancedtelematic.ota.deviceregistry.messages.DeleteDeviceRequest