Merge branch 'release/3.4.0-RC1'

.scalafmt.conf

@@ -0,0 +1,26 @@
+version = "2.0.0-RC7"
+align = more    # For pretty alignment.
+assumeStandardLibraryStripMargin = true
+style = defaultWithAlign
+maxColumn = 150
+
+align.openParenCallSite = false
+align.openParenDefnSite = false
+newlines.alwaysBeforeTopLevelStatements = true
+rewrite.rules = [
+  # ExpandImportSelectors
+  RedundantBraces
+  RedundantParens
+  SortModifiers
+  PreferCurlyFors
+  SortImports
+]
+
+includeCurlyBraceInSelectChains = true
+includeNoParensInSelectChains = true
+
+rewriteTokens {
+  "=>" : "⇒"
+  "<-" : "←"
+  "->": "→"
+}

build.sbt

@@ -22,28 +22,6 @@ lazy val thehiveBackend = (project in file("thehive-backend"))
     play.sbt.routes.RoutesKeys.routesImport -= "controllers.Assets.Asset"
   )
 
-lazy val thehiveMetrics = (project in file("thehive-metrics"))
-  .enablePlugins(PlayScala)
-  .dependsOn(thehiveBackend)
-  .settings(projectSettings)
-  .settings(
-    publish := {},
-    libraryDependencies ++= Seq(
-      Library.Play.cache,
-      Library.Play.ws,
-      Library.scalaGuice,
-      Library.elastic4play,
-      Library.reflections,
-      "io.dropwizard.metrics" % "metrics-core" % "3.1.2",
-      "io.dropwizard.metrics" % "metrics-json" % "3.1.2",
-      "io.dropwizard.metrics" % "metrics-jvm" % "3.1.2",
-      "io.dropwizard.metrics" % "metrics-logback" % "3.1.2",
-      "io.dropwizard.metrics" % "metrics-graphite" % "3.1.2",
-      "io.dropwizard.metrics" % "metrics-ganglia" % "3.1.2",
-      "info.ganglia.gmetric4j" % "gmetric4j" % "1.0.10"
-    )
-  )
-
 lazy val thehiveMisp = (project in file("thehive-misp"))
   .enablePlugins(PlayScala)
   .dependsOn(thehiveBackend)
@@ -77,8 +55,8 @@ lazy val thehiveCortex = (project in file("thehive-cortex"))
 lazy val thehive = (project in file("."))
   .enablePlugins(PlayScala/*, PlayAkkaHttp2Support*/)
   .enablePlugins(Bintray)
-  .dependsOn(thehiveBackend, thehiveMetrics, thehiveMisp, thehiveCortex)
-  .aggregate(thehiveBackend, thehiveMetrics, thehiveMisp, thehiveCortex)
+  .dependsOn(thehiveBackend, thehiveMisp, thehiveCortex)
+  .aggregate(thehiveBackend, thehiveMisp, thehiveCortex)
   .settings(projectSettings)
   .settings(
     aggregate in Debian := false,

project/Dependencies.scala

@@ -16,11 +16,11 @@ object Dependencies {
       val guice = "com.typesafe.play" %% "play-guice" % version
     }
 
-    val scalaGuice = "net.codingwell" %% "scala-guice" % "4.2.1"
+    val scalaGuice = "net.codingwell" %% "scala-guice" % "4.2.3"
 
     val reflections = "org.reflections" % "reflections" % "0.9.11"
     val zip4j = "net.lingala.zip4j" % "zip4j" % "1.3.2"
-    val elastic4play = "org.thehive-project" %% "elastic4play" % "1.10.0"
+    val elastic4play = "org.thehive-project" %% "elastic4play" % "1.11.3"
     val akkaCluster = "com.typesafe.akka" %% "akka-cluster" % "2.5.19"
     val akkaClusterTools = "com.typesafe.akka" %% "akka-cluster-tools" % "2.5.19"
   }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.1.6
+sbt.version=1.2.8

project/plugins.sbt

@@ -1,8 +1,6 @@
 // Comment to get more information during initialization
 logLevel := Level.Info
 
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.21")
-
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.22")
 addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.1")
-
-addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
+addSbtPlugin("org.scalameta"     % "sbt-scalafmt" % "2.0.0")