From e2c7164164fc9f0978df62e5286efd77513f3041 Mon Sep 17 00:00:00 2001
From: Jonas Kunz <jonas.kunz@elastic.co>
Date: Wed, 20 Sep 2023 13:52:03 +0200
Subject: [PATCH 1/4] Fixes ByteBuddy AbstractMethodError which could occur
 when running tests from the IDE

---
 pom.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 18c1518289..236e168cf9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -721,12 +721,24 @@
             <artifactId>assertj-core</artifactId>
             <version>3.24.2</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.bytebuddy</groupId>
+                    <artifactId>byte-buddy</artifactId> <!-- conflicts with byte-buddy-dep -->
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <version>${version.mockito}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.bytebuddy</groupId>
+                    <artifactId>byte-buddy</artifactId> <!-- conflicts with byte-buddy-dep -->
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <!-- adding this to classpath allows to keep default behavior of mockito 4.x where mock subclassing is used.  -->
@@ -756,7 +768,7 @@
         <dependency>
             <groupId>net.javacrumbs.json-unit</groupId>
             <artifactId>json-unit-assertj</artifactId>
-            <version>2.37.0</version>
+            <version>3.2.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

From 903e6a0de469f5f15c05f7b655126cb9c5f3059a Mon Sep 17 00:00:00 2001
From: Jonas Kunz <jonas.kunz@elastic.co>
Date: Wed, 20 Sep 2023 14:32:18 +0200
Subject: [PATCH 2/4] Add bytebuddy-dep as explicit dependency

---
 pom.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 236e168cf9..cb06857816 100644
--- a/pom.xml
+++ b/pom.xml
@@ -650,11 +650,6 @@
             </dependency>
 
             <!-- ensures that we always rely on a single bytebuddy version -->
-            <dependency>
-                <groupId>net.bytebuddy</groupId>
-                <artifactId>byte-buddy</artifactId>
-                <version>${version.byte-buddy}</version>
-            </dependency>
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy-agent</artifactId>
@@ -740,6 +735,13 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <!-- explicitly include byte-buddy-dep to replace byte-buddy dependency in tests for mockito and assertj-->
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy-dep</artifactId>
+            <version>${version.byte-buddy}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <!-- adding this to classpath allows to keep default behavior of mockito 4.x where mock subclassing is used.  -->
             <groupId>org.mockito</groupId>

From 7d0099ff1c0a609f905ce4720af3ba571c6ee769 Mon Sep 17 00:00:00 2001
From: Jonas Kunz <jonas.kunz@elastic.co>
Date: Wed, 20 Sep 2023 15:53:28 +0200
Subject: [PATCH 3/4] Revert "Add bytebuddy-dep as explicit dependency"

This reverts commit 903e6a0de469f5f15c05f7b655126cb9c5f3059a.
---
 pom.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index cb06857816..236e168cf9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -650,6 +650,11 @@
             </dependency>
 
             <!-- ensures that we always rely on a single bytebuddy version -->
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${version.byte-buddy}</version>
+            </dependency>
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy-agent</artifactId>
@@ -735,13 +740,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <!-- explicitly include byte-buddy-dep to replace byte-buddy dependency in tests for mockito and assertj-->
-            <groupId>net.bytebuddy</groupId>
-            <artifactId>byte-buddy-dep</artifactId>
-            <version>${version.byte-buddy}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <!-- adding this to classpath allows to keep default behavior of mockito 4.x where mock subclassing is used.  -->
             <groupId>org.mockito</groupId>

From e897e88cadac5ad99b5c5efc04c3ff5284cbadcf Mon Sep 17 00:00:00 2001
From: Jonas Kunz <jonas.kunz@elastic.co>
Date: Wed, 20 Sep 2023 16:29:20 +0200
Subject: [PATCH 4/4] Fix remaining dependenceis for tests

---
 apm-agent-attach-cli/pom.xml                               | 7 +++++++
 .../apm-hibernate-search-plugin-5_x/pom.xml                | 6 ++++++
 .../apm-hibernate-search-plugin-6_x/pom.xml                | 6 ++++++
 apm-agent-tracer/pom.xml                                   | 7 +++++++
 elastic-apm-agent-premain/pom.xml                          | 7 +++++++
 5 files changed, 33 insertions(+)

diff --git a/apm-agent-attach-cli/pom.xml b/apm-agent-attach-cli/pom.xml
index 1585b0077c..51c8790aa7 100644
--- a/apm-agent-attach-cli/pom.xml
+++ b/apm-agent-attach-cli/pom.xml
@@ -56,6 +56,13 @@
             <version>${version.bouncy-castle.bc-fips}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <!-- required for the inherited assertJ and Mockito dependencies-->
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy-dep</artifactId>
+            <version>${version.byte-buddy}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-5_x/pom.xml b/apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-5_x/pom.xml
index 9f3c555397..ded65e6b9a 100644
--- a/apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-5_x/pom.xml
+++ b/apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-5_x/pom.xml
@@ -26,6 +26,12 @@
             <artifactId>hibernate-search-orm</artifactId>
             <version>5.11.1.Final</version>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.bytebuddy</groupId>
+                    <artifactId>byte-buddy</artifactId> <!-- conflicts with byte-buddy-dep -->
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-6_x/pom.xml b/apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-6_x/pom.xml
index 5af7282348..e0c1a7c514 100644
--- a/apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-6_x/pom.xml
+++ b/apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-6_x/pom.xml
@@ -28,6 +28,12 @@
             <artifactId>hibernate-search-mapper-orm</artifactId>
             <version>${version.hibernate.search}</version>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.bytebuddy</groupId>
+                    <artifactId>byte-buddy</artifactId> <!-- conflicts with byte-buddy-dep -->
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/apm-agent-tracer/pom.xml b/apm-agent-tracer/pom.xml
index 88745af8bc..be90975ca4 100644
--- a/apm-agent-tracer/pom.xml
+++ b/apm-agent-tracer/pom.xml
@@ -24,6 +24,13 @@
             <artifactId>apm-agent-common</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <!-- required for the inherited assertJ and Mockito dependencies-->
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy-dep</artifactId>
+            <version>${version.byte-buddy}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/elastic-apm-agent-premain/pom.xml b/elastic-apm-agent-premain/pom.xml
index 9e6a043a54..6d66209366 100644
--- a/elastic-apm-agent-premain/pom.xml
+++ b/elastic-apm-agent-premain/pom.xml
@@ -21,6 +21,13 @@
             <artifactId>apm-agent-common</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <!-- required for the inherited assertJ and Mockito dependencies-->
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy-dep</artifactId>
+            <version>${version.byte-buddy}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>