diff --git a/ScalliGraph b/ScalliGraph index 4d439fcd2d..561c5c1f27 160000 --- a/ScalliGraph +++ b/ScalliGraph @@ -1 +1 @@ -Subproject commit 4d439fcd2d1294c998f1a0d8d559e533500e18c7 +Subproject commit 561c5c1f2755b3df94ece18ec951869b1ee0a660 diff --git a/build.sbt b/build.sbt index 5bfefd2092..6c80c3f996 100644 --- a/build.sbt +++ b/build.sbt @@ -62,11 +62,15 @@ libraryDependencies in ThisBuild ++= { } } dependencyOverrides in ThisBuild ++= Seq( -// "org.locationtech.spatial4j" % "spatial4j" % "0.6", -// "org.elasticsearch.client" % "elasticsearch-rest-client" % "6.7.2 akkaActor, logbackClassic ) +val securityUpdates = Seq( + "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.12.6", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.12.6.1", + "org.yaml" % "snakeyaml" % "1.30" +) +dependencyOverrides in ThisBuild ++= securityUpdates PlayKeys.includeDocumentationInBinary := false milestoneFilter := ((milestone: Milestone) => milestone.title.startsWith("4")) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f541c56dc1..23ffb177b5 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -32,7 +32,7 @@ object Dependencies { lazy val macroParadise = "org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full lazy val chimney = "io.scalaland" %% "chimney" % "0.6.1" lazy val reflections = "org.reflections" % "reflections" % "0.9.12" - lazy val hadoopClient = "org.apache.hadoop" % "hadoop-client" % "3.3.0" exclude ("log4j", "log4j") + lazy val hadoopClient = "org.apache.hadoop" % "hadoop-client" % "3.3.2" exclude ("log4j", "log4j") lazy val zip4j = "net.lingala.zip4j" % "zip4j" % "2.6.4" lazy val alpakka = "com.lightbend.akka" %% "akka-stream-alpakka-json-streaming" % "2.0.2" lazy val handlebars = "com.github.jknack" % "handlebars" % "4.2.0" diff --git a/project/plugins.sbt b/project/plugins.sbt index 3cc2c244d7..a21a80dc51 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.7") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.13") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.0") addSbtPlugin("org.thehive-project" % "sbt-github-changelog" % "0.3.0")