From a9f9c64896e207940b26e703166ba94563388024 Mon Sep 17 00:00:00 2001
From: Hugh Simpson <hsimpson@rzsoftware.com>
Date: Mon, 4 Mar 2024 09:34:51 +0000
Subject: [PATCH] bump packaged oshi, newrelic, zipkin, nanojson, guava and
 slf4j-api dependencies; also bump scala 2.12 and scala 2.13 dependencies (was
 hitting a compilation error with 2.12.12 and it seemed prudent...)

---
 build.sbt           | 16 ++++++++--------
 project/Build.scala |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build.sbt b/build.sbt
index f520304a3..6a100ecfe 100644
--- a/build.sbt
+++ b/build.sbt
@@ -58,8 +58,8 @@ lazy val `kamon-core` = (project in file("core/kamon-core"))
       ).inAll
     ),
     libraryDependencies ++= Seq(
-      "com.typesafe"      %  "config"       % "1.4.1",
-      "org.slf4j"         %  "slf4j-api"    % "1.7.36",
+      "com.typesafe"      %  "config"       % "1.4.3",
+      "org.slf4j"         %  "slf4j-api"    % "2.0.12",
       "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"
@@ -188,7 +188,7 @@ lazy val `kamon-executors-bench` = (project in file("instrumentation/kamon-execu
   .settings(noPublishing: _*)
   .settings(
     libraryDependencies ++= Seq(
-      "com.google.guava" % "guava" % "24.1-jre",
+      "com.google.guava" % "guava" % "33.0.0-jre",
       kanelaAgent % "provided",
     )
   ).dependsOn(`kamon-core`, `kamon-instrumentation-common`)
@@ -856,7 +856,7 @@ lazy val `kamon-datadog` = (project in file("reporters/kamon-datadog"))
     ),
     libraryDependencies ++= Seq(
       okHttp % "shaded,provided",
-      "com.grack" % "nanojson" % "1.6",
+      "com.grack" % "nanojson" % "1.8",
 
       ("com.typesafe.play" %% "play-json" % "2.7.4" % "test").cross(CrossVersion.for3Use2_13),
       scalatest % "test",
@@ -910,8 +910,8 @@ lazy val `kamon-zipkin` = (project in file("reporters/kamon-zipkin"))
   .disablePlugins(AssemblyPlugin)
   .settings(
     libraryDependencies ++= Seq(
-      "io.zipkin.reporter2" % "zipkin-reporter" % "2.7.15",
-      "io.zipkin.reporter2" % "zipkin-sender-okhttp3" % "2.7.15",
+      "io.zipkin.reporter2" % "zipkin-reporter" % "3.3.0",
+      "io.zipkin.reporter2" % "zipkin-sender-okhttp3" % "3.3.0",
       scalatest % "test"
     )
   ).dependsOn(`kamon-core`)
@@ -952,8 +952,8 @@ lazy val `kamon-newrelic` = (project in file("reporters/kamon-newrelic"))
   .disablePlugins(AssemblyPlugin)
   .settings(
     libraryDependencies ++= Seq(
-      "com.newrelic.telemetry" % "telemetry-core" % "0.15.0",
-      "com.newrelic.telemetry" % "telemetry-http-okhttp" % "0.15.0",
+      "com.newrelic.telemetry" % "telemetry-core" % "0.16.0",
+      "com.newrelic.telemetry" % "telemetry-http-okhttp" % "0.16.0",
       scalatest % "test",
       "org.mockito" % "mockito-core" % "3.12.4" % "test"
     )
diff --git a/project/Build.scala b/project/Build.scala
index a2b6bb105..7f9077f2c 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -35,7 +35,7 @@ object BaseProject extends AutoPlugin {
     val okHttp            = "com.squareup.okhttp3"  %  "okhttp"          % "4.12.0"
     val okHttpMockServer  = "com.squareup.okhttp3"  %  "mockwebserver"   % "4.10.0"
     val jsqlparser        = "com.github.jsqlparser" % "jsqlparser"       % "4.1"
-    val oshiCore          = "com.github.oshi"       %  "oshi-core"       % "5.7.5"
+    val oshiCore          = "com.github.oshi"       %  "oshi-core"       % "6.4.13"
 
 
     val kanelaAgentVersion = settingKey[String]("Kanela Agent version")
@@ -57,8 +57,8 @@ object BaseProject extends AutoPlugin {
     )
 
     val `scala_2.11_version` = "2.11.12"
-    val `scala_2.12_version` = "2.12.15"
-    val `scala_2.13_version` = "2.13.8"
+    val `scala_2.12_version` = "2.12.19"
+    val `scala_2.13_version` = "2.13.13"
     val scala_3_version = "3.3.1"
 
     // This installs the GPG signing key from the