Update mockito to 5.1.1 (#93658)

closes #93395

client/test/build.gradle

@@ -25,9 +25,10 @@ dependencies {
   api "org.hamcrest:hamcrest:${versions.hamcrest}"
 
   // mockito
-  api 'org.mockito:mockito-core:4.4.0'
-  api 'net.bytebuddy:byte-buddy:1.12.9'
-  api 'org.objenesis:objenesis:3.2'
+  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.objenesis:objenesis:3.3'
 }
 
 tasks.named('forbiddenApisMain').configure {

gradle/verification-metadata.xml

@@ -1397,6 +1397,11 @@
             <sha256 value="1a1ac9ce65eddcea54ead958387bb0b3863d02a2ffe856ab6a57ac79737c19cf" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.bytebuddy" name="byte-buddy" version="1.12.22">
+         <artifact name="byte-buddy-1.12.22.jar">
+            <sha256 value="c866ff077d0f00f97ae91a07efcf9a3d7a815db4a91d15a8e857359dfd12b03c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.bytebuddy" name="byte-buddy" version="1.12.9">
          <artifact name="byte-buddy-1.12.9.jar">
             <sha256 value="e305b6b5bdf8602bc5012efaa50c96b0fb922a3c60308ee1af85605b74d82710" origin="Generated by Gradle"/>
@@ -3199,6 +3204,16 @@
             <sha256 value="9a5f59ad06d0bb7d0fd2d4a74eb4d66d561ee0327f0febacb7f9cfb5be4abbfb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.mockito" name="mockito-core" version="5.1.1">
+         <artifact name="mockito-core-5.1.1.jar">
+            <sha256 value="447bdedceaef4107c50db3d33e252bf030c6ae0e46454b40dbcfc0dfbf041264" 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.mortbay.jetty" name="jetty" version="6.1.26">
          <artifact name="jetty-6.1.26.jar">
             <sha256 value="21091d3a9c1349f640fdc421504a604c040ed89087ecc12afbe32353326ed4e5" origin="Generated by Gradle"/>
@@ -3234,6 +3249,11 @@
             <sha256 value="03d960bd5aef03c653eb000413ada15eb77cdd2b8e4448886edf5692805e35f3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.objenesis" name="objenesis" version="3.3">
+         <artifact name="objenesis-3.3.jar">
+            <sha256 value="02dfd0b0439a5591e35b708ed2f5474eb0948f53abf74637e959b8e4ef69bfeb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.ojalgo" name="ojalgo" version="51.2.0">
          <artifact name="ojalgo-51.2.0.jar">
             <sha256 value="da1effb89f37954abb4502be73fb042bba0a1706a179800656569b235fb2a584" origin="Generated by Gradle"/>

server/src/test/java/org/elasticsearch/reservedstate/service/FileSettingsServiceTests.java

@@ -33,6 +33,7 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
+import java.nio.file.StandardWatchEventKinds;
 import java.nio.file.WatchKey;
 import java.nio.file.attribute.FileTime;
 import java.time.Instant;
@@ -47,8 +48,10 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 
+import static org.hamcrest.Matchers.sameInstance;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
@@ -356,10 +359,15 @@ public class FileSettingsServiceTests extends ESTestCase {
         doThrow(new IOException("can't register")).doThrow(new IOException("can't register - attempt 2"))
             .doAnswer(i -> newWatchKey)
             .when(mockedPath)
-            .register(any(), any());
+            .register(
+                any(),
+                eq(StandardWatchEventKinds.ENTRY_MODIFY),
+                eq(StandardWatchEventKinds.ENTRY_CREATE),
+                eq(StandardWatchEventKinds.ENTRY_DELETE)
+            );
 
         var result = service.enableSettingsWatcher(prevWatchKey, mockedPath);
-        assertNotNull(result);
+        assertThat(result, sameInstance(newWatchKey));
         assertTrue(result != prevWatchKey);
 
         verify(service, times(2)).retryDelayMillis(anyInt());

test/framework/build.gradle

@@ -25,9 +25,10 @@ dependencies {
   api "commons-codec:commons-codec:${versions.commonscodec}"
 
   // mockito
-  api 'org.mockito:mockito-core:4.4.0'
-  api 'net.bytebuddy:byte-buddy:1.12.9'
-  api 'org.objenesis:objenesis:3.2'
+  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.objenesis:objenesis:3.3'
 
   api "org.elasticsearch:mocksocket:${versions.mocksocket}"
 }

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/RoleReferenceIntersectionTests.java

@@ -42,7 +42,6 @@ public class RoleReferenceIntersectionTests extends ESTestCase {
         assertThat(future.actionGet(), is(role));
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/93395")
     public void testBuildRoleForListOfRoleReferences() {
         final int size = randomIntBetween(2, 3);
         final List<RoleReference> roleReferences = new ArrayList<>(size);

x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/checkpoint/DefaultCheckpointProviderTests.java

@@ -301,7 +301,7 @@ public class DefaultCheckpointProviderTests extends ESTestCase {
         RemoteClusterResolver remoteClusterResolver = mock(RemoteClusterResolver.class);
 
         // local and remote share the same index name
-        when(remoteClusterResolver.resolve(any())).thenReturn(
+        when(remoteClusterResolver.resolve(any(String[].class))).thenReturn(
             new RemoteClusterResolver.ResolvedIndices(Map.of("remote-1", List.of("index-1")), List.of("index-1"))
         );
 
@@ -349,7 +349,7 @@ public class DefaultCheckpointProviderTests extends ESTestCase {
         RemoteClusterResolver remoteClusterResolver = mock(RemoteClusterResolver.class);
 
         // local and remote share the same index name
-        when(remoteClusterResolver.resolve(any())).thenReturn(
+        when(remoteClusterResolver.resolve(any(String[].class))).thenReturn(
             new RemoteClusterResolver.ResolvedIndices(
                 Map.of("remote-1", List.of("index-1"), "remote-2", List.of("index-1"), "remote-3", List.of("index-1")),
                 Collections.emptyList()