diff --git a/.gitignore b/.gitignore index 8616b69b9..2e054be4f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ target .DS_Store *.py[cod] /report-templates/*.zip +/.bsp /bin/ !/bin/activator diff --git a/project/Common.scala b/project/Common.scala index fe7ffdd6d..2f4b4b9a5 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -31,9 +31,9 @@ object Common { Test / fork := true, javaOptions += "-Xmx1G", // Redirect logs from ElasticSearch (which uses log4j2) to slf4j - libraryDependencies += "org.apache.logging.log4j" % "log4j-to-slf4j" % "2.9.1", + libraryDependencies += "org.apache.logging.log4j" % "log4j-to-slf4j" % "2.17.0", excludeDependencies += "org.apache.logging.log4j" % "log4j-core", - dependencyOverrides += "com.typesafe.akka" %% "akka-actor" % play.core.PlayVersion.akkaVersion + dependencyOverrides += "com.typesafe.akka" %% "akka-actor" % play.core.PlayVersion.akkaVersion ) val stableVersion: Regex = "(\\d+\\.\\d+\\.\\d+)-(\\d+)".r diff --git a/project/build.properties b/project/build.properties index 10fd9eee0..baf5ff3ec 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.5 +sbt.version=1.5.7