From d1fb82707522be3261444a7c248654ebdd2d5ea0 Mon Sep 17 00:00:00 2001
From: dondonz <13839920+dondonz@users.noreply.github.com>
Date: Fri, 24 Jan 2025 08:43:09 +1100
Subject: [PATCH 1/5] Update agent's shadow plugin to new namespace

---
 agent/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agent/build.gradle b/agent/build.gradle
index 07c3d5a15e..71f23f70a0 100644
--- a/agent/build.gradle
+++ b/agent/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'java-library'
     id 'maven-publish'
-    id "com.github.johnrengelman.shadow" version "8.1.1"
+    id "com.gradleup.shadow" version "8.3.0"
 }
 
 dependencies {

From f20c81987d8d8666730f3cfec800c7c4dc00388b Mon Sep 17 00:00:00 2001
From: dondonz <13839920+dondonz@users.noreply.github.com>
Date: Mon, 27 Jan 2025 13:33:55 +1100
Subject: [PATCH 2/5] Downgrade offending ByteBuddy version

---
 agent/build.gradle | 4 ++--
 build.gradle       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/agent/build.gradle b/agent/build.gradle
index 71f23f70a0..fff7b1ce8f 100644
--- a/agent/build.gradle
+++ b/agent/build.gradle
@@ -2,11 +2,11 @@ plugins {
     id 'java'
     id 'java-library'
     id 'maven-publish'
-    id "com.gradleup.shadow" version "8.3.0"
+    id "com.gradleup.shadow" version "8.3.5"
 }
 
 dependencies {
-    implementation("net.bytebuddy:byte-buddy:1.16.1")
+    implementation("net.bytebuddy:byte-buddy:1.15.11")
     // graphql-java itself
     implementation(rootProject)
 }
diff --git a/build.gradle b/build.gradle
index f79fa902d8..539a26b82e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id 'maven-publish'
     id 'antlr'
     id 'signing'
-    id "com.github.johnrengelman.shadow" version "8.1.1"
+    id "com.gradleup.shadow" version "8.3.5"
     id "biz.aQute.bnd.builder" version "6.4.0"
     id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
     id "groovy"

From a67882ed9172c1fb4ebf8bcd28a20cd0b6637123 Mon Sep 17 00:00:00 2001
From: dondonz <13839920+dondonz@users.noreply.github.com>
Date: Mon, 27 Jan 2025 13:37:32 +1100
Subject: [PATCH 3/5] Downgrade ByteBuddy in tests as well

---
 agent-test/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agent-test/build.gradle b/agent-test/build.gradle
index 33171353b1..8d3431908e 100644
--- a/agent-test/build.gradle
+++ b/agent-test/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     implementation(rootProject)
-    implementation("net.bytebuddy:byte-buddy-agent:1.16.1")
+    implementation("net.bytebuddy:byte-buddy-agent:1.15.11")
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

From df656a7a17f74223d6342af7c4296f3718b1b30c Mon Sep 17 00:00:00 2001
From: dondonz <13839920+dondonz@users.noreply.github.com>
Date: Mon, 27 Jan 2025 14:15:28 +1100
Subject: [PATCH 4/5] Include Java 11 files

---
 agent-test/build.gradle | 2 +-
 agent/build.gradle      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/agent-test/build.gradle b/agent-test/build.gradle
index 8d3431908e..33171353b1 100644
--- a/agent-test/build.gradle
+++ b/agent-test/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     implementation(rootProject)
-    implementation("net.bytebuddy:byte-buddy-agent:1.15.11")
+    implementation("net.bytebuddy:byte-buddy-agent:1.16.1")
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
diff --git a/agent/build.gradle b/agent/build.gradle
index fff7b1ce8f..1186c7db91 100644
--- a/agent/build.gradle
+++ b/agent/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    implementation("net.bytebuddy:byte-buddy:1.15.11")
+    implementation("net.bytebuddy:byte-buddy:1.16.1")
     // graphql-java itself
     implementation(rootProject)
 }
@@ -24,6 +24,7 @@ java {
 }
 
 shadowJar {
+    include 'META-INF/versions/11/**'
     minimize()
     archiveClassifier.set('')
     configurations = [project.configurations.compileClasspath]

From 542c6417978374547773f085f671bb7553ceb77a Mon Sep 17 00:00:00 2001
From: dondonz <13839920+dondonz@users.noreply.github.com>
Date: Mon, 27 Jan 2025 14:32:38 +1100
Subject: [PATCH 5/5] Downgrade again for tests to work

---
 agent-test/build.gradle | 2 +-
 agent/build.gradle      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/agent-test/build.gradle b/agent-test/build.gradle
index 33171353b1..8d3431908e 100644
--- a/agent-test/build.gradle
+++ b/agent-test/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     implementation(rootProject)
-    implementation("net.bytebuddy:byte-buddy-agent:1.16.1")
+    implementation("net.bytebuddy:byte-buddy-agent:1.15.11")
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
diff --git a/agent/build.gradle b/agent/build.gradle
index 1186c7db91..fff7b1ce8f 100644
--- a/agent/build.gradle
+++ b/agent/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    implementation("net.bytebuddy:byte-buddy:1.16.1")
+    implementation("net.bytebuddy:byte-buddy:1.15.11")
     // graphql-java itself
     implementation(rootProject)
 }
@@ -24,7 +24,6 @@ java {
 }
 
 shadowJar {
-    include 'META-INF/versions/11/**'
     minimize()
     archiveClassifier.set('')
     configurations = [project.configurations.compileClasspath]