|
@@ -20,6 +20,7 @@
|
|
|
<java.version>1.8</java.version>
|
|
|
<fastjson.version>1.2.45</fastjson.version>
|
|
|
<guava.version>29.0-jre</guava.version>
|
|
|
+ <grpc.version>1.30.0</grpc.version>
|
|
|
|
|
|
<maven.compiler.source>8</maven.compiler.source>
|
|
|
<maven.compiler.target>8</maven.compiler.target>
|
|
@@ -212,13 +213,17 @@
|
|
|
<groupId>io.grpc</groupId>
|
|
|
</exclusion>
|
|
|
<exclusion>
|
|
|
- <artifactId>grpc-stub</artifactId>
|
|
|
+ <artifactId>grpc-core</artifactId>
|
|
|
<groupId>io.grpc</groupId>
|
|
|
</exclusion>
|
|
|
<exclusion>
|
|
|
- <artifactId>grpc-core</artifactId>
|
|
|
+ <artifactId>grpc-stub</artifactId>
|
|
|
<groupId>io.grpc</groupId>
|
|
|
</exclusion>
|
|
|
+ <exclusion>
|
|
|
+ <artifactId>protobuf-java</artifactId>
|
|
|
+ <groupId>com.google.protobuf</groupId>
|
|
|
+ </exclusion>
|
|
|
</exclusions>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
@@ -255,7 +260,7 @@
|
|
|
<dependency>
|
|
|
<groupId>io.grpc</groupId>
|
|
|
<artifactId>grpc-core</artifactId>
|
|
|
- <version>1.30.0</version>
|
|
|
+ <version>${grpc.version}</version>
|
|
|
<exclusions>
|
|
|
<exclusion>
|
|
|
<artifactId>guava</artifactId>
|
|
@@ -263,11 +268,32 @@
|
|
|
</exclusion>
|
|
|
</exclusions>
|
|
|
</dependency>
|
|
|
-<!-- <dependency>-->
|
|
|
-<!-- <groupId>com.google.protobuf</groupId>-->
|
|
|
-<!-- <artifactId>protobuf-java</artifactId>-->
|
|
|
-<!-- <version>3.24.0</version>-->
|
|
|
-<!-- </dependency>-->
|
|
|
+ <dependency>
|
|
|
+ <groupId>io.grpc</groupId>
|
|
|
+ <artifactId>grpc-protobuf</artifactId>
|
|
|
+ <version>${grpc.version}</version>
|
|
|
+ <exclusions>
|
|
|
+ <exclusion>
|
|
|
+ <artifactId>protobuf-java</artifactId>
|
|
|
+ <groupId>com.google.protobuf</groupId>
|
|
|
+ </exclusion>
|
|
|
+ </exclusions>
|
|
|
+ </dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>io.grpc</groupId>
|
|
|
+ <artifactId>grpc-stub</artifactId>
|
|
|
+ <version>${grpc.version}</version>
|
|
|
+ </dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>io.grpc</groupId>
|
|
|
+ <artifactId>grpc-netty-shaded</artifactId>
|
|
|
+ <version>${grpc.version}</version>
|
|
|
+ </dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>com.google.protobuf</groupId>
|
|
|
+ <artifactId>protobuf-java</artifactId>
|
|
|
+ <version>3.24.0</version>
|
|
|
+ </dependency>
|
|
|
</dependencies>
|
|
|
<build>
|
|
|
<plugins>
|
|
@@ -294,6 +320,10 @@
|
|
|
<pattern>com.google.common</pattern>
|
|
|
<shadedPattern>shade.com.google.common</shadedPattern>
|
|
|
</relocation>
|
|
|
+ <relocation>
|
|
|
+ <pattern>com.google.protobuf</pattern>
|
|
|
+ <shadedPattern>shade.com.google.protobuf</shadedPattern>
|
|
|
+ </relocation>
|
|
|
</relocations>
|
|
|
<filters>
|
|
|
<filter>
|