From dcf543775494d51a6e46ff458ad7f81a8bad5663 Mon Sep 17 00:00:00 2001
From: jeremyhi <fengjiachun@gmail.com>
Date: Thu, 5 Feb 2026 16:57:58 +0800
Subject: [PATCH 1/2] feat: upgrade gRPC version to 1.78

Signed-off-by: jeremyhi <fengjiachun@gmail.com>
---
 ingester-bulk-protocol/pom.xml                   | 16 +++++++++++++++-
 ingester-grpc/pom.xml                            |  1 -
 ingester-protocol/pom.xml                        |  2 +-
 .../test/java/io/greptime/WriteClientTest.java   |  2 +-
 ingester-rpc/pom.xml                             |  2 +-
 pom.xml                                          |  5 +++--
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ingester-bulk-protocol/pom.xml b/ingester-bulk-protocol/pom.xml
index f7304ae..e3381cc 100644
--- a/ingester-bulk-protocol/pom.xml
+++ b/ingester-bulk-protocol/pom.xml
@@ -61,12 +61,26 @@
                     <groupId>io.grpc</groupId>
                     <artifactId>grpc-protobuf</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.grpc</groupId>
+                    <artifactId>grpc-api</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>com.google.protobuf</groupId>
                     <artifactId>protobuf-java</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-api</artifactId>
+            <version>${io.grpc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-netty</artifactId>
+            <version>${io.grpc.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.arrow</groupId>
             <artifactId>arrow-compression</artifactId>
@@ -91,7 +105,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/ingester-grpc/pom.xml b/ingester-grpc/pom.xml
index 4d3e0d7..2e7e8a3 100644
--- a/ingester-grpc/pom.xml
+++ b/ingester-grpc/pom.xml
@@ -28,7 +28,6 @@
     <name>${project.groupId}:${project.artifactId}</name>
 
     <properties>
-        <io.grpc.version>1.56.1</io.grpc.version>
         <limits.version>0.3.6</limits.version>
         <zstd-jni.version>1.5.7-1</zstd-jni.version>
     </properties>
diff --git a/ingester-protocol/pom.xml b/ingester-protocol/pom.xml
index cabe709..05c3f38 100644
--- a/ingester-protocol/pom.xml
+++ b/ingester-protocol/pom.xml
@@ -67,7 +67,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/ingester-protocol/src/test/java/io/greptime/WriteClientTest.java b/ingester-protocol/src/test/java/io/greptime/WriteClientTest.java
index 24ece2c..0c4bea6 100644
--- a/ingester-protocol/src/test/java/io/greptime/WriteClientTest.java
+++ b/ingester-protocol/src/test/java/io/greptime/WriteClientTest.java
@@ -38,7 +38,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  *
diff --git a/ingester-rpc/pom.xml b/ingester-rpc/pom.xml
index 5bef2ed..d8f16cc 100644
--- a/ingester-rpc/pom.xml
+++ b/ingester-rpc/pom.xml
@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index 3441aff..4714f05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,11 +78,12 @@
         <!-- libs -->
         <gson.version>2.9.1</gson.version>
         <guava.version>32.0.1-jre</guava.version>
+        <io.grpc.version>1.78.0</io.grpc.version>
         <protobuf.version>3.25.1</protobuf.version>
         <slf4j.version>1.7.36</slf4j.version>
 
         <!-- tests -->
-        <mockito.version>1.9.5</mockito.version>
+        <mockito.version>4.11.0</mockito.version>
         <jmh.version>1.20</jmh.version>
         <junit.dep.version>4.8.2</junit.dep.version>
         <junit.version>4.13.1</junit.version>
@@ -191,7 +192,7 @@
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
-                <artifactId>mockito-all</artifactId>
+                <artifactId>mockito-core</artifactId>
                 <version>${mockito.version}</version>
                 <scope>test</scope>
             </dependency>

From ab8134aa2774916c6557e4ba1e10908b85cb5879 Mon Sep 17 00:00:00 2001
From: jeremyhi <fengjiachun@gmail.com>
Date: Fri, 20 Mar 2026 22:57:20 -0700
Subject: [PATCH 2/2] fix: dependency redundant

Signed-off-by: jeremyhi <fengjiachun@gmail.com>
---
 ingester-bulk-protocol/pom.xml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/ingester-bulk-protocol/pom.xml b/ingester-bulk-protocol/pom.xml
index e3381cc..2746261 100644
--- a/ingester-bulk-protocol/pom.xml
+++ b/ingester-bulk-protocol/pom.xml
@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>ingester-grpc</artifactId>
+            <artifactId>ingester-rpc</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.arrow</groupId>
@@ -65,6 +65,10 @@
                     <groupId>io.grpc</groupId>
                     <artifactId>grpc-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.grpc</groupId>
+                    <artifactId>grpc-netty</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>com.google.protobuf</groupId>
                     <artifactId>protobuf-java</artifactId>
@@ -73,12 +77,17 @@
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
-            <artifactId>grpc-api</artifactId>
+            <artifactId>grpc-netty</artifactId>
             <version>${io.grpc.version}</version>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
-            <artifactId>grpc-netty</artifactId>
+            <artifactId>grpc-protobuf</artifactId>
+            <version>${io.grpc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-stub</artifactId>
             <version>${io.grpc.version}</version>
         </dependency>
         <dependency>