From 8653b5d5ea17f193a31fd1c6f93e2ed14895f9d1 Mon Sep 17 00:00:00 2001
From: "Srivastava, Piyush" <Piyush.Srivastava@netapp.com>
Date: Sun, 12 Jul 2026 22:20:07 +0530
Subject: [PATCH] feature/CSTACKEX-217: Mockito upgrade for supporting java21

---
 plugins/storage/volume/ontap/pom.xml | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/plugins/storage/volume/ontap/pom.xml b/plugins/storage/volume/ontap/pom.xml
index ce9b8683ebaf..7af43a2325ff 100644
--- a/plugins/storage/volume/ontap/pom.xml
+++ b/plugins/storage/volume/ontap/pom.xml
@@ -37,9 +37,7 @@
         <jackson-databind.version>2.13.4</jackson-databind.version>
         <assertj.version>3.24.2</assertj.version>
         <junit-jupiter.version>5.8.1</junit-jupiter.version>
-        <mockito.version>3.12.4</mockito.version>
-        <mockito-junit-jupiter.version>5.2.0</mockito-junit-jupiter.version>
-        <byte-buddy-agent.version>1.11.13</byte-buddy-agent.version>
+        <byte-buddy-agent.version>1.15.11</byte-buddy-agent.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -105,21 +103,13 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version>
+            <version>${cs.mockito.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
-            <version>${mockito-junit-jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Mockito Inline (for static method mocking) -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <version>${mockito.version}</version>
+            <version>${cs.mockito.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -163,7 +153,6 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven-surefire-plugin.version}</version>
                 <configuration>
-                    <skipTests>false</skipTests>
                     <includes>
                         <include>**/*Test.java</include>
                     </includes>