This is an automated email from the ASF dual-hosted git repository.
earthchen pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.1 by this push:
new 3d64f1192d Update protobuf-java version in both dependency and plugin
(#11261)
3d64f1192d is described below
commit 3d64f1192dee1a96e166609776cdb50e9ddd923b
Author: Albumen Kevin <[email protected]>
AuthorDate: Tue Jan 10 14:13:12 2023 +0800
Update protobuf-java version in both dependency and plugin (#11261)
---
dubbo-demo/dubbo-demo-triple/pom.xml | 4 +++-
dubbo-dependencies-bom/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-triple/pom.xml | 4 +++-
dubbo-xds/pom.xml | 16 ++++++++++++++--
4 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/dubbo-demo/dubbo-demo-triple/pom.xml
b/dubbo-demo/dubbo-demo-triple/pom.xml
index 6597e0c011..63979e1494 100644
--- a/dubbo-demo/dubbo-demo-triple/pom.xml
+++ b/dubbo-demo/dubbo-demo-triple/pom.xml
@@ -34,6 +34,7 @@
<skip_maven_deploy>true</skip_maven_deploy>
<source.level>1.8</source.level>
<target.level>1.8</target.level>
+ <protobuf-java.version>3.18.3</protobuf-java.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
</properties>
@@ -118,6 +119,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
+ <version>${protobuf-java.version}</version>
</dependency>
</dependencies>
@@ -141,7 +143,7 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.6.1</version>
<configuration>
-
<protocArtifact>com.google.protobuf:protoc:3.7.1:exe:${os.detected.classifier}</protocArtifact>
+
<protocArtifact>com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>triple-java</pluginId>
<outputDirectory>build/generated/source/proto/main/java</outputDirectory>
</configuration>
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index cf8eb3088d..d726d7a7b7 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -112,7 +112,7 @@
<cxf_version>3.1.15</cxf_version>
<thrift_version>0.15.0</thrift_version>
<hessian_version>4.0.38</hessian_version>
- <protobuf-java_version>3.16.3</protobuf-java_version>
+ <protobuf-java_version>3.18.3</protobuf-java_version>
<javax_annotation-api_version>1.3.2</javax_annotation-api_version>
<servlet_version>3.1.0</servlet_version>
<jetty_version>9.4.43.v20210629</jetty_version>
diff --git a/dubbo-rpc/dubbo-rpc-triple/pom.xml
b/dubbo-rpc/dubbo-rpc-triple/pom.xml
index eeca0e6937..d024a20a5e 100644
--- a/dubbo-rpc/dubbo-rpc-triple/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-triple/pom.xml
@@ -32,6 +32,7 @@
<dubbo.compiler.version>0.0.4.1-SNAPSHOT</dubbo.compiler.version>
<reactive.version>1.0.4</reactive.version>
<reactor.version>3.4.19</reactor.version>
+ <protobuf-java.version>3.18.3</protobuf-java.version>
</properties>
<dependencies>
<dependency>
@@ -52,6 +53,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
+ <version>${protobuf-java.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -112,7 +114,7 @@
<version>0.6.1</version>
<configuration>
<protocArtifact>
-
com.google.protobuf:protoc:3.11.0:exe:${os.detected.classifier}
+
com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}
</protocArtifact>
<protocPlugins>
<protocPlugin>
diff --git a/dubbo-xds/pom.xml b/dubbo-xds/pom.xml
index d162c2e163..913fe84187 100644
--- a/dubbo-xds/pom.xml
+++ b/dubbo-xds/pom.xml
@@ -31,6 +31,8 @@
<description>The xDS Integration</description>
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
+ <protobuf-java.version>3.18.3</protobuf-java.version>
+ <grpc.version>1.41.0</grpc.version>
</properties>
<dependencies>
@@ -50,16 +52,19 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
+ <version>${grpc.version}</version>
</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>
@@ -67,9 +72,16 @@
<artifactId>api</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>${protobuf-java.version}</version>
+ </dependency>
+
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
+ <version>${protobuf-java.version}</version>
</dependency>
<dependency>
@@ -101,9 +113,9 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.6.1</version>
<configuration>
-
<protocArtifact>com.google.protobuf:protoc:3.12.0:exe:${os.detected.classifier}</protocArtifact>
+
<protocArtifact>com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.31.1:exe:${os.detected.classifier}</pluginArtifact>
+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
<executions>
<execution>
