From f34edece4538c0195bc3162fe1e00219abee6715 Mon Sep 17 00:00:00 2001 From: Simon Dumas Date: Wed, 21 Feb 2024 15:34:19 +0100 Subject: [PATCH 1/2] Update dependencies --- build.sbt | 27 +++++++++++++-------------- project/plugins.sbt | 2 +- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/build.sbt b/build.sbt index 8674a56738..a75f50037d 100755 --- a/build.sbt +++ b/build.sbt @@ -20,7 +20,7 @@ val akkaHttpCirceVersion = "1.39.2" val akkaCorsVersion = "1.2.0" val akkaVersion = "2.6.21" val alpakkaVersion = "3.0.4" -val apacheCompressVersion = "1.25.0" +val apacheCompressVersion = "1.26.0" val apacheIOVersion = "2.15.1" val awsSdkVersion = "2.17.184" val byteBuddyAgentVersion = "1.10.17" @@ -46,13 +46,13 @@ val kamonVersion = "2.7.0" val kanelaAgentVersion = "1.0.18" val kindProjectorVersion = "0.13.2" val log4catsVersion = "2.6.0" -val logbackVersion = "1.4.14" +val logbackVersion = "1.5.0" val magnoliaVersion = "1.1.8" val mockitoVersion = "1.17.30" val munitVersion = "1.0.0-M11" val munitCatsEffectVersion = "2.0.0-M4" val nimbusJoseJwtVersion = "9.37.3" -val postgresJdbcVersion = "42.7.1" +val postgresJdbcVersion = "42.7.2" val pureconfigVersion = "0.17.5" val scalaTestVersion = "3.2.18" val scalaXmlVersion = "2.2.0" @@ -881,17 +881,16 @@ lazy val shared = Seq( lazy val kamonSettings = Seq( libraryDependencies ++= Seq( kamonAkkaHttp, - "io.kamon" %% "kamon-akka" % kamonVersion, - "io.kamon" %% "kamon-core" % kamonVersion, - "io.kamon" %% "kamon-executors" % kamonVersion, - "io.kamon" %% "kamon-jaeger" % kamonVersion, - "io.jaegertracing" % "jaeger-thrift" % "1.6.0", // included jaeger-thrift causes a NoSuchMethod error - "io.kamon" %% "kamon-jdbc" % kamonVersion, - "io.kamon" %% "kamon-logback" % kamonVersion, - "io.kamon" %% "kamon-prometheus" % kamonVersion, - "io.kamon" %% "kamon-scala-future" % kamonVersion, - "io.kamon" %% "kamon-status-page" % kamonVersion, - "io.kamon" %% "kamon-system-metrics" % kamonVersion + "io.kamon" %% "kamon-akka" % kamonVersion, + "io.kamon" %% "kamon-core" % kamonVersion, + "io.kamon" %% "kamon-executors" % kamonVersion, + "io.kamon" %% "kamon-jaeger" % kamonVersion, + "io.kamon" %% "kamon-jdbc" % kamonVersion, + "io.kamon" %% "kamon-logback" % kamonVersion, + "io.kamon" %% "kamon-prometheus" % kamonVersion, + "io.kamon" %% "kamon-scala-future" % kamonVersion, + "io.kamon" %% "kamon-status-page" % kamonVersion, + "io.kamon" %% "kamon-system-metrics" % kamonVersion ), javaAgents += kanelaAgent ) diff --git a/project/plugins.sbt b/project/plugins.sbt index 9dd8cef1e4..c0c74d54be 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.10") addSbtPlugin("com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.2.2") addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.3") From e8a1415eaac73ea2a6e1ba35122ab234b9a0ace3 Mon Sep 17 00:00:00 2001 From: Simon Dumas Date: Wed, 21 Feb 2024 16:33:48 +0100 Subject: [PATCH 2/2] Revert postgresql driver version bump as Kamon does not support it --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index a75f50037d..7467a6a145 100755 --- a/build.sbt +++ b/build.sbt @@ -52,7 +52,7 @@ val mockitoVersion = "1.17.30" val munitVersion = "1.0.0-M11" val munitCatsEffectVersion = "2.0.0-M4" val nimbusJoseJwtVersion = "9.37.3" -val postgresJdbcVersion = "42.7.2" +val postgresJdbcVersion = "42.7.1" val pureconfigVersion = "0.17.5" val scalaTestVersion = "3.2.18" val scalaXmlVersion = "2.2.0"