From 2f1a36a6620c8fd44daf58bfb9099a1eff1953f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20Paksy?= <paksydavid@gmail.com>
Date: Thu, 23 Apr 2026 13:46:26 +0200
Subject: [PATCH] ZOOKEEPER-5039: Upgrade Mockito to 5.23.0 for JDK25

As of Mockito 5.x, the mockito-inline mock-maker became the default, so mockito-inline as a separate artifact is no longer needed.
---
 pom.xml                  | 8 +-------
 zookeeper-server/pom.xml | 5 -----
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2811e0dfa06..345230e0f61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -556,7 +556,7 @@
     <jmockit.version>1.48</jmockit.version>
     <junit.version>5.6.2</junit.version>
     <junit-platform.version>1.6.2</junit-platform.version>
-    <mockito.version>4.9.0</mockito.version>
+    <mockito.version>5.23.0</mockito.version>
     <hamcrest.version>2.2</hamcrest.version>
     <commons-cli.version>1.5.0</commons-cli.version>
     <netty.version>4.1.130.Final</netty.version>
@@ -704,12 +704,6 @@
         <artifactId>mockito-core</artifactId>
         <version>${mockito.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-inline</artifactId>
-        <version>${mockito.version}</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-bom</artifactId>
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index f4b76095d2e..1ad5afd34eb 100644
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -145,11 +145,6 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.jmockit</groupId>
       <artifactId>jmockit</artifactId>