From 8f3608c4c2f1349a00038a7480edd9d8c5784b0a Mon Sep 17 00:00:00 2001 From: To-om Date: Thu, 16 Dec 2021 11:37:07 +0100 Subject: [PATCH] #2291 Update logback --- ScalliGraph | 2 +- build.sbt | 5 +++-- project/Dependencies.scala | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ScalliGraph b/ScalliGraph index ff0c21df8f..e3d3fce06b 160000 --- a/ScalliGraph +++ b/ScalliGraph @@ -1 +1 @@ -Subproject commit ff0c21df8f84e779b88e4005971781ff4ebe94c6 +Subproject commit e3d3fce06baec550c9597df4d9f2ced50bc527a2 diff --git a/build.sbt b/build.sbt index 61003d9d43..5752739f11 100644 --- a/build.sbt +++ b/build.sbt @@ -63,8 +63,9 @@ libraryDependencies in ThisBuild ++= { } dependencyOverrides in ThisBuild ++= Seq( // "org.locationtech.spatial4j" % "spatial4j" % "0.6", -// "org.elasticsearch.client" % "elasticsearch-rest-client" % "6.7.2" - akkaActor +// "org.elasticsearch.client" % "elasticsearch-rest-client" % "6.7.2 + akkaActor, + logbackClassic ) PlayKeys.includeDocumentationInBinary := false milestoneFilter := ((milestone: Milestone) => milestone.title.startsWith("4")) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 0485f64973..bfa3e79cf4 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -9,6 +9,7 @@ object Dependencies { lazy val playLogback = "com.typesafe.play" %% "play-logback" % play.core.PlayVersion.current lazy val playGuice = "com.typesafe.play" %% "play-guice" % play.core.PlayVersion.current lazy val playFilters = "com.typesafe.play" %% "filters-helpers" % play.core.PlayVersion.current + lazy val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.2.8" lazy val playMockws = "de.leanovate.play-mockws" %% "play-mockws" % "2.8.0" lazy val akkaActor = "com.typesafe.akka" %% "akka-actor" % akkaVersion lazy val akkaCluster = "com.typesafe.akka" %% "akka-cluster" % akkaVersion