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 @@ + + + + + @@ -3366,11 +3371,21 @@ + + + + + + + + + + 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}"