From 7435d77ef55e4fd40f690afaccb936e457549dc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Onuki?= <aonuki@newrelic.com>
Date: Fri, 20 Oct 2023 18:35:13 -0400
Subject: [PATCH] Upgrading JFR daemon (#1561)

---
 build.gradle                                    | 2 +-
 instrumentation/apache-struts-2.0/build.gradle  | 2 +-
 instrumentation/spring-3.0.0/build.gradle       | 2 +-
 instrumentation/spring-4.0.0/build.gradle       | 2 +-
 instrumentation/spring-4.2.0/build.gradle       | 2 +-
 instrumentation/spring-4.3.0/build.gradle       | 2 +-
 instrumentation/spring-cache-3.1.0/build.gradle | 2 +-
 newrelic-agent/build.gradle                     | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 447ac376eb..e2db23477a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'com.github.prokod.gradle-crossbuild' version '0.14.1' apply false
-    id "org.jetbrains.kotlin.jvm" version "1.6.20" apply false
+    id "org.jetbrains.kotlin.jvm" version "1.8.21" apply false
     id "com.newrelic.gradle-verify-instrumentation-plugin" version "4.0" apply false
     id "com.newrelic.gradle-compatibility-doc-plugin" version "1.1" apply false
     id "com.github.spotbugs" version "5.0.14" apply false
diff --git a/instrumentation/apache-struts-2.0/build.gradle b/instrumentation/apache-struts-2.0/build.gradle
index cf7d237c0a..751a13f97e 100644
--- a/instrumentation/apache-struts-2.0/build.gradle
+++ b/instrumentation/apache-struts-2.0/build.gradle
@@ -5,7 +5,7 @@ plugins {
 dependencies {
     implementation(project(":agent-bridge"))
     implementation("org.apache.struts:struts2-core:2.5")
-    testImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.20")
+    testImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.21")
 }
 
 jar {
diff --git a/instrumentation/spring-3.0.0/build.gradle b/instrumentation/spring-3.0.0/build.gradle
index 8e3d942161..e8f845effc 100644
--- a/instrumentation/spring-3.0.0/build.gradle
+++ b/instrumentation/spring-3.0.0/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     implementation(project(":agent-bridge"))
     implementation("org.springframework:spring-context:3.0.0.RELEASE")
     implementation("org.springframework:spring-web:3.0.0.RELEASE")
-    testImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.20")
+    testImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.21")
 }
 
 jar {
diff --git a/instrumentation/spring-4.0.0/build.gradle b/instrumentation/spring-4.0.0/build.gradle
index 4c3c1cdb35..7302da31e8 100644
--- a/instrumentation/spring-4.0.0/build.gradle
+++ b/instrumentation/spring-4.0.0/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     implementation(project(":agent-bridge"))
     implementation("org.springframework:spring-context:4.0.0.RELEASE")
     implementation("org.springframework:spring-web:4.0.0.RELEASE")
-    testImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.20")
+    testImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.21")
 }
 
 jar {
diff --git a/instrumentation/spring-4.2.0/build.gradle b/instrumentation/spring-4.2.0/build.gradle
index 2f2d300e7e..6d100a8874 100644
--- a/instrumentation/spring-4.2.0/build.gradle
+++ b/instrumentation/spring-4.2.0/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     implementation(project(":agent-bridge"))
     implementation("org.springframework:spring-context:4.2.0.RELEASE")
     implementation("org.springframework:spring-web:4.2.0.RELEASE")
-    testImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.20")
+    testImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.21")
 }
 
 jar {
diff --git a/instrumentation/spring-4.3.0/build.gradle b/instrumentation/spring-4.3.0/build.gradle
index 10c397c57d..fcc89e61bc 100644
--- a/instrumentation/spring-4.3.0/build.gradle
+++ b/instrumentation/spring-4.3.0/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     implementation(project(":agent-bridge"))
     implementation("org.springframework:spring-context:4.3.0.RELEASE")
     implementation("org.springframework:spring-web:4.3.0.RELEASE")
-    testImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.20")
+    testImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.21")
 }
 
 jar {
diff --git a/instrumentation/spring-cache-3.1.0/build.gradle b/instrumentation/spring-cache-3.1.0/build.gradle
index 71aede5312..70849dd5f5 100644
--- a/instrumentation/spring-cache-3.1.0/build.gradle
+++ b/instrumentation/spring-cache-3.1.0/build.gradle
@@ -5,7 +5,7 @@ plugins {
 dependencies {
     implementation(project(":agent-bridge"))
     implementation("org.springframework:spring-context:3.1.0.RELEASE")
-    testImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.20")
+    testImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.21")
 }
 
 jar {
diff --git a/newrelic-agent/build.gradle b/newrelic-agent/build.gradle
index a19e3204b5..8f38bc4359 100644
--- a/newrelic-agent/build.gradle
+++ b/newrelic-agent/build.gradle
@@ -73,7 +73,7 @@ dependencies {
         transitive = false
     }
     shadowIntoJar("com.newrelic.agent.java:newrelic-module-util-java:2.1")
-    shadowIntoJar("com.newrelic:jfr-daemon:1.9.1")
+    shadowIntoJar("com.newrelic:jfr-daemon:1.11.0")
     shadowIntoJar "org.ow2.asm:asm:$asmVersion"
     shadowIntoJar "org.ow2.asm:asm-tree:$asmVersion"
     shadowIntoJar "org.ow2.asm:asm-commons:$asmVersion"