Mocito upgrade to support JDK 23 (opensearch-project#3547)

rithin-pullela-aws · web-flow · commit 1b8b014dcc59 · 2025-02-13T16:05:23.000-08:00
Signed-off-by: rithin-pullela-aws &lt;rithinp@amazon.com&gt;
diff --git a/client/build.gradle b/client/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     implementation project(path: ":${rootProject.name}-common", configuration: 'shadow')
     compileOnly group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.15.2'
 
 }
 
diff --git a/common/build.gradle b/common/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
     compileOnly "org.opensearch.client:opensearch-rest-client:${opensearch_version}"
     compileOnly "org.opensearch:common-utils:${common_utils_version}"
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.15.2'
     testImplementation "org.opensearch.test:framework:${opensearch_version}"
 
     compileOnly group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
diff --git a/memory/build.gradle b/memory/build.gradle
@@ -35,7 +35,7 @@ dependencies {
         exclude module : 'hamcrest'
         exclude module : 'hamcrest-core'
     }
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.15.2'
     testImplementation "org.opensearch.test:framework:${opensearch_version}"
     testImplementation "org.opensearch.client:opensearch-rest-client:${opensearch_version}"
     testImplementation group: 'com.google.code.gson', name: 'gson', version: '2.11.0'
diff --git a/ml-algorithms/build.gradle b/ml-algorithms/build.gradle
@@ -40,7 +40,7 @@ dependencies {
     implementation group: 'io.protostuff', name: 'protostuff-api', version: '1.8.0'
     implementation group: 'io.protostuff', name: 'protostuff-collectionschema', version: '1.8.0'
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.15.2'
     implementation (group: 'com.google.guava', name: 'guava', version: '32.1.3-jre') {
 	exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
     }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ dependencies {`
`18`	`18`	`implementation project(path: ":${rootProject.name}-common", configuration: 'shadow')`
`19`	`19`	`compileOnly group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"`
`20`	`20`	`testImplementation group: 'junit', name: 'junit', version: '4.13.2'`
`21`		`- testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'`
	`21`	`+ testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.15.2'`
`22`	`22`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ dependencies {`
`35`	`35`	`exclude module : 'hamcrest'`
`36`	`36`	`exclude module : 'hamcrest-core'`
`37`	`37`	`}`
`38`		`- testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'`
	`38`	`+ testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.15.2'`
`39`	`39`	`testImplementation "org.opensearch.test:framework:${opensearch_version}"`
`40`	`40`	`testImplementation "org.opensearch.client:opensearch-rest-client:${opensearch_version}"`
`41`	`41`	`testImplementation group: 'com.google.code.gson', name: 'gson', version: '2.11.0'`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ dependencies {`
`40`	`40`	`implementation group: 'io.protostuff', name: 'protostuff-api', version: '1.8.0'`
`41`	`41`	`implementation group: 'io.protostuff', name: 'protostuff-collectionschema', version: '1.8.0'`
`42`	`42`	`testImplementation group: 'junit', name: 'junit', version: '4.13.2'`
`43`		`- testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.7.0'`
	`43`	`+ testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.15.2'`
`44`	`44`	`implementation (group: 'com.google.guava', name: 'guava', version: '32.1.3-jre') {`
`45`	`45`	`exclude group: 'com.google.errorprone', module: 'error_prone_annotations'`
`46`	`46`	`}`