From 0ee8f3dca04b378487de737e378495a84db70dfb Mon Sep 17 00:00:00 2001 From: SimunKaracic Date: Sun, 8 Nov 2020 11:51:10 +0100 Subject: [PATCH 1/2] Properly shade kamon-annotation dependencies --- build.sbt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 37f675bb9..5f7d254b5 100644 --- a/build.sbt +++ b/build.sbt @@ -356,11 +356,13 @@ lazy val `kamon-annotation` = (project in file("instrumentation/kamon-annotation assemblyShadeRules in assembly := Seq( ShadeRule.rename("javax.el.**" -> "kamon.lib.@0").inAll, ShadeRule.rename("com.sun.el.**" -> "kamon.lib.@0").inAll, - ShadeRule.rename("com.github.ben-manes.**" -> "kamon.lib.@0").inAll, + ShadeRule.rename("com.github.benmanes.**" -> "kamon.lib.@0").inAll, + ShadeRule.rename("com.google.errorprone.**" -> "kamon.lib.@0").inAll, + ShadeRule.rename("org.checkerframework.**" -> "kamon.lib.@0").inAll, ), libraryDependencies ++= Seq( kanelaAgent % "provided", - "com.github.ben-manes.caffeine" % "caffeine" % "2.8.5" % "provided,shaded", // provided? no? + "com.github.ben-manes.caffeine" % "caffeine" % "2.8.5" % "provided,shaded", "org.glassfish" % "javax.el" % "3.0.1-b11" % "provided,shaded", scalatest % "test", logbackClassic % "test", From 4aa58686ac09010f9b9dba40e45274bb4b693917 Mon Sep 17 00:00:00 2001 From: SimunKaracic Date: Sun, 8 Nov 2020 12:05:54 +0100 Subject: [PATCH 2/2] Update oshi-core to 5.3.4 --- project/Build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index eda0d8c51..03e05a065 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -35,7 +35,7 @@ object BaseProject extends AutoPlugin { val hdrHistogram = "org.hdrhistogram" % "HdrHistogram" % "2.1.10" val okHttp = "com.squareup.okhttp3" % "okhttp" % "3.14.7" val okHttpMockServer = "com.squareup.okhttp3" % "mockwebserver" % "3.10.0" - val oshiCore = "com.github.oshi" % "oshi-core" % "5.2.5" + val oshiCore = "com.github.oshi" % "oshi-core" % "5.3.4" val kanelaAgentVersion = settingKey[String]("Kanela Agent version")