From ea59a08f4fa1c0df1c527d0d29bdc4d28ff78c10 Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Sun, 7 Jun 2020 17:53:06 +0200
Subject: [PATCH 1/4] JAVA-1782: Remove byte-buddy dep from the main pom.xml

---
 parent-boot-2/pom.xml | 5 -----
 pom.xml               | 6 ------
 2 files changed, 11 deletions(-)

diff --git a/parent-boot-2/pom.xml b/parent-boot-2/pom.xml
index 631d8a0581..c7bb11b1d5 100644
--- a/parent-boot-2/pom.xml
+++ b/parent-boot-2/pom.xml
@@ -32,11 +32,6 @@
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
         </dependency>
-        <dependency>
-            <groupId>net.bytebuddy</groupId>
-            <artifactId>byte-buddy</artifactId>
-            <version>${byte-buddy.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/pom.xml b/pom.xml
index f797f1bbce..20adc4bfef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,12 +69,6 @@
             <version>${hamcrest-all.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>net.bytebuddy</groupId>
-            <artifactId>byte-buddy</artifactId>
-            <version>${byte-buddy.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

From 0ad021f13402a31a27d2204dad7d4401e6bfa3ba Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Sun, 7 Jun 2020 18:17:05 +0200
Subject: [PATCH 2/4] JAVA-1782: Add byte-buddy explicitly to avoid versions
 confilict

---
 jhipster-5/bookstore-monolith/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jhipster-5/bookstore-monolith/pom.xml b/jhipster-5/bookstore-monolith/pom.xml
index 233765e0f3..4e4c82f327 100644
--- a/jhipster-5/bookstore-monolith/pom.xml
+++ b/jhipster-5/bookstore-monolith/pom.xml
@@ -225,6 +225,12 @@
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
+            <version>${byte-buddy.version}</version>
+            <scope>test</scope>
+        </dependency>
         <!-- jhipster-needle-maven-add-dependency -->
     </dependencies>
 

From a1742fc8561afa455d1de4890ecf9db4719e53c1 Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysztofwoyke@gmail.com>
Date: Sun, 7 Jun 2020 22:48:02 +0200
Subject: [PATCH 3/4] JAVA-1782: Add byte-buddy explicitly to avoid versions
 confilict

---
 libraries-data-2/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libraries-data-2/pom.xml b/libraries-data-2/pom.xml
index bdfb2c5ed6..bc2f2c77a1 100644
--- a/libraries-data-2/pom.xml
+++ b/libraries-data-2/pom.xml
@@ -153,6 +153,12 @@
             <artifactId>renjin-script-engine</artifactId>
             <version>${renjin.version}</version>
         </dependency>
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
+            <version>${byte-buddy.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <repositories>

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 4/4] 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>