From 03903e9ee50b9eabc084e8884465966a9e28a514 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Mon, 8 Jun 2020 10:35:11 +0200
Subject: [PATCH] JAVA-1782: Add byte-buddy explicitly to avoid versions
 confilict

---
 libraries-testing/pom.xml                                  | 7 +++++++
 persistence-modules/hibernate-enterprise/pom.xml           | 6 ++++++
 .../data-flow-server/pom.xml                               | 6 ++++++
 3 files changed, 19 insertions(+)

diff --git a/libraries-testing/pom.xml b/libraries-testing/pom.xml
index 89cb0bd494..5a5cb99238 100644
--- a/libraries-testing/pom.xml
+++ b/libraries-testing/pom.xml
@@ -151,6 +151,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
+            <version>${byte-buddy.version}</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/persistence-modules/hibernate-enterprise/pom.xml b/persistence-modules/hibernate-enterprise/pom.xml
index 060cb4c904..ae58e409c4 100644
--- a/persistence-modules/hibernate-enterprise/pom.xml
+++ b/persistence-modules/hibernate-enterprise/pom.xml
@@ -55,6 +55,12 @@
             <artifactId>hibernate-testing</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
+            <version>${byte-buddy.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <repositories>
diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml
index ba108dc5c7..34da489cd1 100644
--- a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml
+++ b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml
@@ -50,6 +50,12 @@
             <artifactId>hibernate-entitymanager</artifactId>
             <version>${hibernate.compatible.version}</version>
         </dependency>
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
+            <version>${byte-buddy.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <properties>