From a2b480e6e5295b32ba9abd7f48bd1990446c0eb0 Mon Sep 17 00:00:00 2001
From: Mark Vieira <portugee@gmail.com>
Date: Thu, 6 Feb 2025 09:36:04 -0800
Subject: [PATCH] Upgrade mockito (#121849)

---
 client/test/build.gradle                       |  6 +++---
 gradle/build.versions.toml                     |  2 +-
 gradle/verification-metadata.xml               | 18 +++++++++---------
 .../bootstrap/test-framework.policy            |  7 +++++++
 test/framework/build.gradle                    |  7 ++++---
 5 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/client/test/build.gradle b/client/test/build.gradle
index e39b7587b69d5..3b7f62fd8ef58 100644
--- a/client/test/build.gradle
+++ b/client/test/build.gradle
@@ -28,9 +28,9 @@ dependencies {
   api "org.hamcrest:hamcrest:${versions.hamcrest}"
 
   // mockito
-  api 'org.mockito:mockito-core:5.11.0'
-  api 'org.mockito:mockito-subclass:5.11.0'
-  api 'net.bytebuddy:byte-buddy:1.14.12'
+  api 'org.mockito:mockito-core:5.15.2'
+  api 'org.mockito:mockito-subclass:5.15.2'
+  api 'net.bytebuddy:byte-buddy:1.15.11'
   api 'org.objenesis:objenesis:3.3'
 }
 
diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml
index 05fda8e0244de..1aed327c45796 100644
--- a/gradle/build.versions.toml
+++ b/gradle/build.versions.toml
@@ -11,7 +11,7 @@ apache-compress = "org.apache.commons:commons-compress:1.26.1"
 apache-rat = "org.apache.rat:apache-rat:0.11"
 asm = { group = "org.ow2.asm", name="asm", version.ref="asm" }
 asm-tree = { group = "org.ow2.asm", name="asm-tree", version.ref="asm" }
-bytebuddy = "net.bytebuddy:byte-buddy:1.14.12"
+bytebuddy = "net.bytebuddy:byte-buddy:1.15.11"
 checkstyle = "com.puppycrawl.tools:checkstyle:10.3"
 commons-codec = "commons-codec:commons-codec:1.11"
 commmons-io = "commons-io:commons-io:2.2"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 7270f12515b67..5a1aec7325d78 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -1719,9 +1719,9 @@
             <sha256 value="1d31696445697720527091754369082a6651bd49781b6005deb94e56753406f9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="net.bytebuddy" name="byte-buddy" version="1.14.12">
-         <artifact name="byte-buddy-1.14.12.jar">
-            <sha256 value="970636134d61c183b19f8f58fa631e30d2f2abca344b37848a393cac7863dd70" origin="Generated by Gradle"/>
+      <component group="net.bytebuddy" name="byte-buddy" version="1.15.11">
+         <artifact name="byte-buddy-1.15.11.jar">
+            <sha256 value="fa08998aae1e7bdae83bde0712c50e8444d71c0e0c196bb2247ade8d4ad0eb90" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="net.java.dev.jets3t" name="jets3t" version="0.9.0">
@@ -4063,14 +4063,14 @@
             <sha256 value="f97483ba0944b9fa133aa29638764ddbeadb51ec3dbc02074c58fa2caecd07fa" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.mockito" name="mockito-core" version="5.11.0">
-         <artifact name="mockito-core-5.11.0.jar">
-            <sha256 value="f076c96b1f49b8d9bc42e46b0969aaf5684c40c8b5b679d400e5d880073a0e00" origin="Generated by Gradle"/>
+      <component group="org.mockito" name="mockito-core" version="5.15.2">
+         <artifact name="mockito-core-5.15.2.jar">
+            <sha256 value="bf48b7372d9491d5ec8aebb4cdd187d15663931599c0fbe7410166ce0e1e58ff" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.mockito" name="mockito-subclass" version="5.11.0">
-         <artifact name="mockito-subclass-5.11.0.jar">
-            <sha256 value="61e65116bf6178cd3a5f1cecc0d73d68395e7c175d07a7f9478650f55b36fb1d" origin="Generated by Gradle"/>
+      <component group="org.mockito" name="mockito-subclass" version="5.15.2">
+         <artifact name="mockito-subclass-5.15.2.jar">
+            <sha256 value="bf332f658d5437446525911449da3474be170053735bf870ac2caaeaffc2fd34" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.mortbay.jetty" name="jetty" version="6.1.26">
diff --git a/server/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy b/server/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
index 77aae99907dfc..ada61c118ec3c 100644
--- a/server/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
+++ b/server/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
@@ -23,6 +23,13 @@ grant codeBase "${codebase.mockito-core}" {
   permission java.lang.RuntimePermission "accessDeclaredMembers";
   permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
   permission java.lang.RuntimePermission "getClassLoader";
+  // needed when calling bytebuddy
+  permission java.lang.RuntimePermission "createClassLoader";
+  permission java.lang.RuntimePermission "net.bytebuddy.createJavaDispatcher";
+  permission java.lang.reflect.ReflectPermission "newProxyInPackage.net.bytebuddy.utility";
+  permission java.lang.reflect.ReflectPermission "newProxyInPackage.net.bytebuddy.dynamic.loading";
+  permission java.lang.reflect.ReflectPermission "newProxyInPackage.net.bytebuddy.description.type";
+  permission java.lang.reflect.ReflectPermission "newProxyInPackage.net.bytebuddy.description.method";
 };
 
 grant codeBase "${codebase.byte-buddy}" {
diff --git a/test/framework/build.gradle b/test/framework/build.gradle
index 88c5b69cc0c03..d006ad05a2d18 100644
--- a/test/framework/build.gradle
+++ b/test/framework/build.gradle
@@ -26,9 +26,9 @@ dependencies {
   api "commons-codec:commons-codec:${versions.commonscodec}"
 
   // mockito
-  api 'org.mockito:mockito-core:5.11.0'
-  api 'org.mockito:mockito-subclass:5.11.0'
-  api 'net.bytebuddy:byte-buddy:1.14.12'
+  api 'org.mockito:mockito-core:5.15.2'
+  api 'org.mockito:mockito-subclass:5.15.2'
+  api 'net.bytebuddy:byte-buddy:1.15.11'
   api 'org.objenesis:objenesis:3.3'
 
   api "org.elasticsearch:mocksocket:${versions.mocksocket}"
@@ -66,6 +66,7 @@ tasks.named("thirdPartyAudit").configure {
           'org.apache.log4j.Priority',
 
           // mockito
+          'net.bytebuddy.agent.Installer',
           'net.bytebuddy.agent.ByteBuddyAgent',
           'org.mockito.internal.creation.bytebuddy.inject.MockMethodDispatcher',
           'org.opentest4j.AssertionFailedError',