Skip to content

Commit 741a9d1

Browse files
authored
feat: upgrade gRPC version to 1.78 (#100)
* feat: upgrade gRPC version to 1.78 Signed-off-by: jeremyhi <fengjiachun@gmail.com> * fix: dependency redundant Signed-off-by: jeremyhi <fengjiachun@gmail.com> --------- Signed-off-by: jeremyhi <fengjiachun@gmail.com>
1 parent 0fd989e commit 741a9d1

6 files changed

Lines changed: 31 additions & 8 deletions

File tree

ingester-bulk-protocol/pom.xml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</dependency>
3939
<dependency>
4040
<groupId>${project.groupId}</groupId>
41-
<artifactId>ingester-grpc</artifactId>
41+
<artifactId>ingester-rpc</artifactId>
4242
</dependency>
4343
<dependency>
4444
<groupId>org.apache.arrow</groupId>
@@ -61,12 +61,35 @@
6161
<groupId>io.grpc</groupId>
6262
<artifactId>grpc-protobuf</artifactId>
6363
</exclusion>
64+
<exclusion>
65+
<groupId>io.grpc</groupId>
66+
<artifactId>grpc-api</artifactId>
67+
</exclusion>
68+
<exclusion>
69+
<groupId>io.grpc</groupId>
70+
<artifactId>grpc-netty</artifactId>
71+
</exclusion>
6472
<exclusion>
6573
<groupId>com.google.protobuf</groupId>
6674
<artifactId>protobuf-java</artifactId>
6775
</exclusion>
6876
</exclusions>
6977
</dependency>
78+
<dependency>
79+
<groupId>io.grpc</groupId>
80+
<artifactId>grpc-netty</artifactId>
81+
<version>${io.grpc.version}</version>
82+
</dependency>
83+
<dependency>
84+
<groupId>io.grpc</groupId>
85+
<artifactId>grpc-protobuf</artifactId>
86+
<version>${io.grpc.version}</version>
87+
</dependency>
88+
<dependency>
89+
<groupId>io.grpc</groupId>
90+
<artifactId>grpc-stub</artifactId>
91+
<version>${io.grpc.version}</version>
92+
</dependency>
7093
<dependency>
7194
<groupId>org.apache.arrow</groupId>
7295
<artifactId>arrow-compression</artifactId>
@@ -91,7 +114,7 @@
91114
</dependency>
92115
<dependency>
93116
<groupId>org.mockito</groupId>
94-
<artifactId>mockito-all</artifactId>
117+
<artifactId>mockito-core</artifactId>
95118
<scope>test</scope>
96119
</dependency>
97120
</dependencies>

ingester-grpc/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<name>${project.groupId}:${project.artifactId}</name>
2929

3030
<properties>
31-
<io.grpc.version>1.56.1</io.grpc.version>
3231
<limits.version>0.3.6</limits.version>
3332
<zstd-jni.version>1.5.7-1</zstd-jni.version>
3433
</properties>

ingester-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
</dependency>
6868
<dependency>
6969
<groupId>org.mockito</groupId>
70-
<artifactId>mockito-all</artifactId>
70+
<artifactId>mockito-core</artifactId>
7171
<scope>test</scope>
7272
</dependency>
7373
</dependencies>

ingester-protocol/src/test/java/io/greptime/WriteClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.junit.runner.RunWith;
3939
import org.mockito.Mock;
4040
import org.mockito.Mockito;
41-
import org.mockito.runners.MockitoJUnitRunner;
41+
import org.mockito.junit.MockitoJUnitRunner;
4242

4343
/**
4444
*

ingester-rpc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</dependency>
4242
<dependency>
4343
<groupId>org.mockito</groupId>
44-
<artifactId>mockito-all</artifactId>
44+
<artifactId>mockito-core</artifactId>
4545
<scope>test</scope>
4646
</dependency>
4747
</dependencies>

pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,12 @@
7878
<!-- libs -->
7979
<gson.version>2.9.1</gson.version>
8080
<guava.version>32.0.1-jre</guava.version>
81+
<io.grpc.version>1.78.0</io.grpc.version>
8182
<protobuf.version>3.25.1</protobuf.version>
8283
<slf4j.version>1.7.36</slf4j.version>
8384

8485
<!-- tests -->
85-
<mockito.version>1.9.5</mockito.version>
86+
<mockito.version>4.11.0</mockito.version>
8687
<jmh.version>1.20</jmh.version>
8788
<junit.dep.version>4.8.2</junit.dep.version>
8889
<junit.version>4.13.1</junit.version>
@@ -191,7 +192,7 @@
191192
</dependency>
192193
<dependency>
193194
<groupId>org.mockito</groupId>
194-
<artifactId>mockito-all</artifactId>
195+
<artifactId>mockito-core</artifactId>
195196
<version>${mockito.version}</version>
196197
<scope>test</scope>
197198
</dependency>

0 commit comments

Comments
 (0)