From 55ebd19d9d704db95e82b735a11f97d229eaab41 Mon Sep 17 00:00:00 2001
From: Sanne Grinovero <sanne@hibernate.org>
Date: Mon, 31 Jan 2022 16:44:59 +0000
Subject: [PATCH] Let the ByteBuddy library version be controlled by the BOM

---
 bom/application/pom.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 1f65e27974d91..48fdec3d99c7f 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -90,7 +90,8 @@
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <commons-codec.version>1.15</commons-codec.version>
         <classmate.version>1.5.1</classmate.version>
-        <hibernate-orm.version>5.6.5.Final</hibernate-orm.version>
+        <hibernate-orm.version>5.6.5.Final</hibernate-orm.version> <!-- When updating, align bytebuddy.version to Hibernate needs as well (just below): -->
+        <bytebuddy.version>1.12.7</bytebuddy.version> <!-- Version controlled by Hibernate ORM's needs -->
         <hibernate-reactive.version>1.1.2.Final</hibernate-reactive.version>
         <hibernate-validator.version>6.2.1.Final</hibernate-validator.version>
         <hibernate-search.version>6.1.0.Final</hibernate-search.version>
@@ -2677,6 +2678,15 @@
 
             <!-- External dependencies -->
 
+            <!-- Normally controlled by Hibernate ORM upstream,
+                but making the version of ByteBuddy explicit so that this BOM can control the version
+                in case of conflicts with other libraries -->
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${bytebuddy.version}</version>
+            </dependency>
+
             <!-- GRPC dependency -->
             <dependency>
                 <groupId>com.google.code.findbugs</groupId>