From ccd9efb807b6b663d6719f5d3f5b52f197dcf4f7 Mon Sep 17 00:00:00 2001
From: Chris Hegarty <62058229+ChrisHegarty@users.noreply.github.com>
Date: Fri, 30 Jun 2023 18:27:47 +0100
Subject: [PATCH] Update to Mockito 5.4.0 (#97285)

---
 client/test/build.gradle                          |  6 +++---
 gradle/verification-metadata.xml                  | 15 +++++++++++++++
 ...eservedComposableIndexTemplateActionTests.java |  6 ++----
 test/framework/build.gradle                       |  6 +++---
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/client/test/build.gradle b/client/test/build.gradle
index de8c5eb8285b..9484b2bcf348 100644
--- a/client/test/build.gradle
+++ b/client/test/build.gradle
@@ -25,9 +25,9 @@ dependencies {
   api "org.hamcrest:hamcrest:${versions.hamcrest}"
 
   // mockito
-  api 'org.mockito:mockito-core:5.1.1'
-  api 'org.mockito:mockito-subclass:5.1.1'
-  api 'net.bytebuddy:byte-buddy:1.12.22'
+  api 'org.mockito:mockito-core:5.4.0'
+  api 'org.mockito:mockito-subclass:5.4.0'
+  api 'net.bytebuddy:byte-buddy:1.14.5'
   api 'org.objenesis:objenesis:3.3'
 }
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 7d0b05a39278..6c9e46fd205d 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -1469,6 +1469,11 @@
             <sha256 value="e305b6b5bdf8602bc5012efaa50c96b0fb922a3c60308ee1af85605b74d82710" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.bytebuddy" name="byte-buddy" version="1.14.5">
+         <artifact name="byte-buddy-1.14.5.jar">
+            <sha256 value="e99761a526df0fefbbd3fe14436b0f953000cdfa5151dc63c0b18d37d9c46f1c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.java.dev.jets3t" name="jets3t" version="0.9.0">
          <artifact name="jets3t-0.9.0.jar">
             <sha256 value="e89893fc754b252af717d7d14accda946f7dfcfc1e293fd3e04725163d661bd7" origin="Generated by Gradle"/>
@@ -3366,11 +3371,21 @@
             <sha256 value="447bdedceaef4107c50db3d33e252bf030c6ae0e46454b40dbcfc0dfbf041264" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.mockito" name="mockito-core" version="5.4.0">
+         <artifact name="mockito-core-5.4.0.jar">
+            <sha256 value="b1689b06617ea01fd777bfaedbdde512faf083d639a049f79b388d5a4e96d2e5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.mockito" name="mockito-subclass" version="5.1.1">
          <artifact name="mockito-subclass-5.1.1.jar">
             <sha256 value="7e1c4c7220fc3bcf62e07e40abcae7dc31d017c45cfea88ac6c83695f2e5184a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.mockito" name="mockito-subclass" version="5.4.0">
+         <artifact name="mockito-subclass-5.4.0.jar">
+            <sha256 value="7e1c4c7220fc3bcf62e07e40abcae7dc31d017c45cfea88ac6c83695f2e5184a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.mortbay.jetty" name="jetty" version="6.1.26">
          <artifact name="jetty-6.1.26.jar">
             <sha256 value="21091d3a9c1349f640fdc421504a604c040ed89087ecc12afbe32353326ed4e5" origin="Generated by Gradle"/>
diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/template/reservedstate/ReservedComposableIndexTemplateActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/template/reservedstate/ReservedComposableIndexTemplateActionTests.java
index 89e4bd59f0c3..f9d455057ff9 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/indices/template/reservedstate/ReservedComposableIndexTemplateActionTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/indices/template/reservedstate/ReservedComposableIndexTemplateActionTests.java
@@ -64,7 +64,6 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 
 /**
  * A unit test class that tests {@link ReservedComposableIndexTemplateAction}
@@ -877,9 +876,8 @@ public class ReservedComposableIndexTemplateActionTests extends ESTestCase {
             )
             .build();
 
-        ClusterService mockedClusterService = spy(clusterService);
         MetadataIndexTemplateService mockedTemplateService = new MetadataIndexTemplateService(
-            mockedClusterService,
+            clusterService,
             mock(MetadataCreateIndexService.class),
             indicesService,
             indexScopedSettings,
@@ -889,7 +887,7 @@ public class ReservedComposableIndexTemplateActionTests extends ESTestCase {
         );
 
         ClusterState state = ClusterState.builder(new ClusterName("elasticsearch")).metadata(metadata).build();
-        doReturn(state).when(mockedClusterService).state();
+        doReturn(state).when(clusterService).state();
 
         // we should see the weird composable name prefixed 'validate_template'
         assertThat(state.metadata().templatesV2(), allOf(aMapWithSize(1), hasKey(reservedComposableIndexName(conflictingTemplateName))));
diff --git a/test/framework/build.gradle b/test/framework/build.gradle
index 7d3b0d1bd2b4..2cdd6994bd2e 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.1.1'
-  api 'org.mockito:mockito-subclass:5.1.1'
-  api 'net.bytebuddy:byte-buddy:1.12.22'
+  api 'org.mockito:mockito-core:5.4.0'
+  api 'org.mockito:mockito-subclass:5.4.0'
+  api 'net.bytebuddy:byte-buddy:1.14.5'
   api 'org.objenesis:objenesis:3.3'
 
   api "org.elasticsearch:mocksocket:${versions.mocksocket}"