From b22d909a0aec6ff359b2d3e88482882f8a807044 Mon Sep 17 00:00:00 2001
From: Joe DiPol <joe.dipol@oracle.com>
Date: Tue, 10 Dec 2024 10:31:48 -0800
Subject: [PATCH] Upgrade ASM to 9.7.1 and Byte Buddy to 1.15.10 (#9572)

---
 applications/mp/pom.xml | 3 +--
 dependencies/pom.xml    | 4 ++--
 pom.xml                 | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/applications/mp/pom.xml b/applications/mp/pom.xml
index 1cb35a1258b..014eee2a6af 100644
--- a/applications/mp/pom.xml
+++ b/applications/mp/pom.xml
@@ -75,8 +75,7 @@
                     <version>${version.plugin.hibernate.enhance}</version>
                     <dependencies>
                         <dependency>
-                            <!-- Force upgrade byte-buddy for Java 21.     -->
-                            <!-- Remove after upgrading to Hibernate -->
+                            <!-- Force upgrade byte-buddy for latest Java  -->
                             <groupId>net.bytebuddy</groupId>
                             <artifactId>byte-buddy</artifactId>
                             <version>${version.lib.byte-buddy}</version>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 70e546562d3..0f0e14b1cd6 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -41,8 +41,8 @@
         <version.lib.annotation-api>1.3.5</version.lib.annotation-api>
         <version.lib.brave-opentracing>1.0.0</version.lib.brave-opentracing>
         <version.lib.reactivestreams>1.0.4</version.lib.reactivestreams>
-        <!-- Force upgrade byte-buddy for Java 23. Remove after upgrading hibernate -->
-        <version.lib.byte-buddy>1.14.18</version.lib.byte-buddy>
+        <!-- Force upgrade byte-buddy latest Java -->
+        <version.lib.byte-buddy>1.15.10</version.lib.byte-buddy>
         <version.lib.commons-logging>1.2</version.lib.commons-logging>
         <version.lib.cron-utils>9.2.1</version.lib.cron-utils>
         <version.lib.dropwizard.metrics>4.1.2</version.lib.dropwizard.metrics>
diff --git a/pom.xml b/pom.xml
index 4f846ec0593..4bd4abb5095 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
         Changing these version requires approval for a new third party dependency!
         -->
         <version.lib.arquillian>1.7.0.Alpha10</version.lib.arquillian>
-        <version.lib.asm>6.0</version.lib.asm>
+        <version.lib.asm>9.7.1</version.lib.asm>
         <version.lib.checkstyle>9.1</version.lib.checkstyle>
         <version.lib.commons-io>2.11.0</version.lib.commons-io>
         <version.lib.groovy-all>2.4.14</version.lib.groovy-all>
@@ -631,8 +631,7 @@
                     <version>${version.plugin.hibernate-enhance}</version>
                     <dependencies>
                         <dependency>
-                            <!-- Force upgrade byte-buddy for Java 21.     -->
-                            <!-- Remove after upgrading  -->
+                            <!-- Force upgrade byte-buddy for latest Java  -->
                             <groupId>net.bytebuddy</groupId>
                             <artifactId>byte-buddy</artifactId>
                             <version>${version.lib.byte-buddy}</version>