From c3652d9090ad0dea67a1819dbb5bb32298280d9b Mon Sep 17 00:00:00 2001
From: Laird Nelson <laird.nelson@oracle.com>
Date: Mon, 9 Oct 2023 09:18:30 -0700
Subject: [PATCH] Squashable commit; removes version management of Byte Buddy
 per PR feedback

Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
---
 applications/mp/pom.xml | 14 --------------
 dependencies/pom.xml    |  2 --
 pom.xml                 |  9 ---------
 3 files changed, 25 deletions(-)

diff --git a/applications/mp/pom.xml b/applications/mp/pom.xml
index 6992b460379..daf10d30252 100644
--- a/applications/mp/pom.xml
+++ b/applications/mp/pom.xml
@@ -69,20 +69,6 @@
                         </dependency>
                     </dependencies>
                 </plugin>
-                <plugin>
-                    <groupId>org.hibernate.orm.tooling</groupId>
-                    <artifactId>hibernate-enhance-maven-plugin</artifactId>
-                    <version>${version.plugin.hibernate.enhance}</version>
-                    <dependencies>
-                        <dependency>
-                            <!-- Force upgrade byte-buddy for Java 21.     -->
-                            <!-- Remove after upgrading to Hibernate 6.2.7 -->
-                            <groupId>net.bytebuddy</groupId>
-                            <artifactId>byte-buddy</artifactId>
-                            <version>${version.lib.byte-buddy}</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
             </plugins>
         </pluginManagement>
     </build>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 8fa2a12d531..de28284fdb9 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -40,8 +40,6 @@
         <version.lib.animal-sniffer>1.18</version.lib.animal-sniffer>
         <version.lib.annotation-api>1.3.5</version.lib.annotation-api>
         <version.lib.brave-opentracing>1.0.0</version.lib.brave-opentracing>
-        <!-- Force upgrade byte-buddy for Java 21. Remove after upgrading hibernate to 6.2.7 -->
-        <version.lib.byte-buddy>1.14.6</version.lib.byte-buddy>
         <version.lib.commons-logging>1.2</version.lib.commons-logging>
         <version.lib.cron-utils>9.1.6</version.lib.cron-utils>
         <version.lib.database.messaging>19.3.0.0</version.lib.database.messaging>
diff --git a/pom.xml b/pom.xml
index 7e73d8f5736..0e2d86c5dc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -635,15 +635,6 @@
                     <groupId>org.hibernate.orm.tooling</groupId>
                     <artifactId>hibernate-enhance-maven-plugin</artifactId>
                     <version>${version.plugin.hibernate-enhance}</version>
-                    <dependencies>
-                        <dependency>
-                            <!-- Force upgrade byte-buddy for Java 21.     -->
-                            <!-- Remove after upgrading to Hibernate 6.2.7 -->
-                            <groupId>net.bytebuddy</groupId>
-                            <artifactId>byte-buddy</artifactId>
-                            <version>${version.lib.byte-buddy}</version>
-                        </dependency>
-                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>