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