From eb6771932e93d927b741b49f6ce79d3601eb5a98 Mon Sep 17 00:00:00 2001
From: Michael Yan <rain@rainboyan.com>
Date: Mon, 20 May 2024 21:27:42 +0800
Subject: [PATCH] Gradle build: Using ByteBuddy instead of Cglib with Spock

---
 build.gradle              | 2 +-
 gradle/libs.versions.toml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 5f9a206c65..7b34a10cea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -321,7 +321,7 @@ subprojects { project ->
             testImplementation libs.slf4j.simple
             testImplementation libs.spock.core, { transitive = false }
             // Required by Spock's Mocking
-            testImplementation libs.cglib
+            testImplementation libs.bytebuddy
             testImplementation libs.objenesis
         }
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1e0010b2c0..0252f758bb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,6 +3,7 @@ ant = "1.10.13"
 asciidoctorj = "2.5.8"
 aspectj = "1.9.19"
 assertj = "3.22.0"
+bytebuddy = "1.14.5"
 caffeine = "3.1.6"
 cglib = "3.3.0"
 commons-codec = "1.15"
@@ -66,6 +67,7 @@ asciidoctorj = { module = "org.asciidoctor:asciidoctorj", version.ref = "asciido
 assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 aspectj-rt = { module = "org.aspectj:aspectjrt", version.ref = "aspectj" }
 aspectj-weaver = { module = "org.aspectj:aspectjweaver", version.ref = "aspectj" }
+bytebuddy = { module = "net.bytebuddy:byte-buddy", version.ref = "bytebuddy" }
 caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "caffeine" }
 cglib = { module = "cglib:cglib-nodep", version.ref = "cglib" }
 commons-codec = { module = "commons-codec:commons-codec", version.ref = "commons-codec" }