From 12983f93a45a6434ab80a2f2a2ca913680f51048 Mon Sep 17 00:00:00 2001 From: hughsimpson Date: Mon, 9 Oct 2023 13:45:49 +0100 Subject: [PATCH] fix: Regression on jar size, slf4j (#1299) * pekko dependencies should only be provided * bump sbt, slf4j --- build.sbt | 2 +- instrumentation/kamon-pekko/build.sbt | 16 ++++++++-------- project/Build.scala | 6 +++--- project/build.properties | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.sbt b/build.sbt index 5d9bbea3b..8a31a09fb 100644 --- a/build.sbt +++ b/build.sbt @@ -60,7 +60,7 @@ lazy val `kamon-core` = (project in file("core/kamon-core")) ), libraryDependencies ++= Seq( "com.typesafe" % "config" % "1.4.1", - "org.slf4j" % "slf4j-api" % "1.7.25", + "org.slf4j" % "slf4j-api" % "1.7.36", "org.hdrhistogram" % "HdrHistogram" % "2.1.9" % "provided,shaded", "org.jctools" % "jctools-core" % "3.3.0" % "provided,shaded", "com.oracle.substratevm" % "svm" % "19.2.1" % "provided" diff --git a/instrumentation/kamon-pekko/build.sbt b/instrumentation/kamon-pekko/build.sbt index 83c083f55..c4b7ac397 100644 --- a/instrumentation/kamon-pekko/build.sbt +++ b/instrumentation/kamon-pekko/build.sbt @@ -6,16 +6,16 @@ inConfig(Compile)(Defaults.compileSettings ++ Seq( val pekkoVersion = "1.0.1" libraryDependencies ++= { if(scalaBinaryVersion.value == "2.11") Seq.empty else Seq( - kanelaAgent, + kanelaAgent % "provided", scalatest % Test, logbackClassic % Test, - "org.apache.pekko" %% "pekko-actor" % pekkoVersion, - "org.apache.pekko" %% "pekko-testkit" % pekkoVersion, - "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion, - "org.apache.pekko" %% "pekko-remote" % pekkoVersion, - "org.apache.pekko" %% "pekko-cluster" % pekkoVersion, - "org.apache.pekko" %% "pekko-cluster-sharding" % pekkoVersion, - "org.apache.pekko" %% "pekko-protobuf" % pekkoVersion, + "org.apache.pekko" %% "pekko-actor" % pekkoVersion % "provided,test", + "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % "provided,test", + "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion % "provided,test", + "org.apache.pekko" %% "pekko-remote" % pekkoVersion % "provided,test", + "org.apache.pekko" %% "pekko-cluster" % pekkoVersion % "provided,test", + "org.apache.pekko" %% "pekko-cluster-sharding" % pekkoVersion % "provided,test", + "org.apache.pekko" %% "pekko-protobuf" % pekkoVersion % "provided,test", "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test )} diff --git a/project/Build.scala b/project/Build.scala index 82185ce78..bd76ec5fd 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -27,9 +27,9 @@ object BaseProject extends AutoPlugin { lazy val Shaded = config("shaded").hide val kanelaAgent = "io.kamon" % "kanela-agent" % "1.0.17" - val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.25" - val slf4jnop = "org.slf4j" % "slf4j-nop" % "1.7.24" - val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.2.3" + val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.36" + val slf4jnop = "org.slf4j" % "slf4j-nop" % "1.7.36" + val logbackClassic = "ch.qos.logback" % "logback-classic" % "1.2.12" val scalatest = "org.scalatest" %% "scalatest" % "3.2.9" val hdrHistogram = "org.hdrhistogram" % "HdrHistogram" % "2.1.10" val okHttp = "com.squareup.okhttp3" % "okhttp" % "4.10.0" diff --git a/project/build.properties b/project/build.properties index 875b706a8..27430827b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.2 +sbt.version=1.9.6