From 33e7afea2c1974ec93febe78720a2443d8f44fa0 Mon Sep 17 00:00:00 2001 From: SweetWuXiaoMei Date: Sun, 17 Nov 2024 19:14:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?build:=E5=8D=87=E7=BA=A7=20Protobuf?= =?UTF-8?q?=E5=88=B0=204.28.3=20=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 protobuf.version 从 3.23.4 升级到 4.28.3 - 更新 protostuff-parser.version 从2.2.27 到 3.1.40- 移除多个模块中的 com.google.protobuf 依赖 - 在默认依赖中添加 protobuf-java-util 依赖 - 更新 protoc3-maven-plugin 版本到 4.28.3 - 移除 jetcd-core 依赖中的 protobuf-java --- demo/demo-etcd/consumer/pom.xml | 6 ------ demo/demo-etcd/gateway/pom.xml | 6 ------ demo/demo-etcd/provider/pom.xml | 12 ++++++------ demo/demo-etcd/test-client/pom.xml | 6 ------ dependencies/default/pom.xml | 11 ++++++++--- dynamic-config/config-etcd/pom.xml | 10 ++++++++++ pom.xml | 2 +- service-registry/registry-etcd/pom.xml | 10 ++++++++++ 8 files changed, 35 insertions(+), 28 deletions(-) diff --git a/demo/demo-etcd/consumer/pom.xml b/demo/demo-etcd/consumer/pom.xml index 5f79529d65c..c066d3e58b3 100644 --- a/demo/demo-etcd/consumer/pom.xml +++ b/demo/demo-etcd/consumer/pom.xml @@ -34,12 +34,6 @@ org.apache.servicecomb java-chassis-spring-boot-starter-standalone - - com.google.protobuf - protobuf-java - 3.25.5 - runtime - org.apache.servicecomb registry-etcd diff --git a/demo/demo-etcd/gateway/pom.xml b/demo/demo-etcd/gateway/pom.xml index 9bed75de856..760a4478d57 100644 --- a/demo/demo-etcd/gateway/pom.xml +++ b/demo/demo-etcd/gateway/pom.xml @@ -38,12 +38,6 @@ org.apache.servicecomb edge-core - - com.google.protobuf - protobuf-java - 3.25.5 - runtime - org.apache.servicecomb registry-etcd diff --git a/demo/demo-etcd/provider/pom.xml b/demo/demo-etcd/provider/pom.xml index cc926bda1ce..45597f0ed21 100644 --- a/demo/demo-etcd/provider/pom.xml +++ b/demo/demo-etcd/provider/pom.xml @@ -38,12 +38,12 @@ org.apache.servicecomb java-chassis-spring-boot-starter-standalone - - com.google.protobuf - protobuf-java - 3.25.5 - runtime - + + + + + + org.apache.servicecomb registry-etcd diff --git a/demo/demo-etcd/test-client/pom.xml b/demo/demo-etcd/test-client/pom.xml index d14d1b1c45f..795fbf84ed1 100644 --- a/demo/demo-etcd/test-client/pom.xml +++ b/demo/demo-etcd/test-client/pom.xml @@ -50,12 +50,6 @@ io.etcd jetcd-core - - com.google.protobuf - protobuf-java - 3.25.5 - runtime - diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index e45e92a2260..e1351d04d84 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -74,9 +74,9 @@ 4.1.113.Final 4.12.0 0.16.0 - 3.23.4 + 4.28.3 1.8.0 - 2.2.27 + 3.1.40 1.0.4 1.7.0 2.7.18 @@ -190,7 +190,12 @@ com.google.protobuf protobuf-java ${protobuf.version} - test + + + + com.google.protobuf + protobuf-java-util + ${protobuf.version} diff --git a/dynamic-config/config-etcd/pom.xml b/dynamic-config/config-etcd/pom.xml index a1c35d9872f..5a9a0e11cff 100644 --- a/dynamic-config/config-etcd/pom.xml +++ b/dynamic-config/config-etcd/pom.xml @@ -39,6 +39,16 @@ io.etcd jetcd-core + + + protobuf-java + com.google.protobuf + + + + + com.google.protobuf + protobuf-java diff --git a/pom.xml b/pom.xml index f30bbabd117..29e168c89a7 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 3.2.0 1.7.1 0.6.1 - 3.19.2 + 4.28.3 1.47.0 10.20.0 3.1.1 diff --git a/service-registry/registry-etcd/pom.xml b/service-registry/registry-etcd/pom.xml index cf48811d342..511d13c3820 100644 --- a/service-registry/registry-etcd/pom.xml +++ b/service-registry/registry-etcd/pom.xml @@ -34,6 +34,12 @@ io.etcd jetcd-core + + + protobuf-java + com.google.protobuf + + org.apache.servicecomb @@ -47,6 +53,10 @@ org.apache.servicecomb java-chassis-core + + com.google.protobuf + protobuf-java + From ec6da0d89eee5c927e2ac8599914f1feff0bf8ea Mon Sep 17 00:00:00 2001 From: SweetWuXiaoMei Date: Fri, 22 Nov 2024 10:43:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?build:=E9=99=8D=E7=BA=A7=20protobuf=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=87=B3=204.27.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 protobuf 版本从 4.28.3 降级到 4.27.5 - 此更改可能解决与 protobuf 相关的兼容性问题 --- dependencies/default/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index e1351d04d84..3d618889e51 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -74,7 +74,7 @@ 4.1.113.Final 4.12.0 0.16.0 - 4.28.3 + 4.27.5 1.8.0 3.1.40 1.0.4 From 1e5823b9ae34a573a52bd30636c2195d6f1a0591 Mon Sep 17 00:00:00 2001 From: SweetWuXiaoMei Date: Fri, 22 Nov 2024 11:58:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?build:=E5=8D=87=E7=BA=A7=20protobuf=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=87=B3=204.28.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 protobuf 版本从 4.27.5 升级到 4.28.3 - 此次升级可能涉及一些 API 变更，请注意检查相关代码 --- dependencies/default/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index 3d618889e51..e1351d04d84 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -74,7 +74,7 @@ 4.1.113.Final 4.12.0 0.16.0 - 4.27.5 + 4.28.3 1.8.0 3.1.40 1.0.4 From 061b45c899e188921e3fcca81fa42fe129f30b98 Mon Sep 17 00:00:00 2001 From: SweetWuXiaoMei Date: Fri, 22 Nov 2024 12:38:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?build:=E9=99=8D=E7=BA=A7=20protobuf=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=87=B3=204.27.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 dependencies/default/pom.xml 中将 protobuf 版本从 4.28.3降级到 4.27.5 - 在 pom.xml 中将 protoc3-maven-plugin版本从 4.28.3 降级到 4.27.5 --- dependencies/default/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index e1351d04d84..3d618889e51 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -74,7 +74,7 @@ 4.1.113.Final 4.12.0 0.16.0 - 4.28.3 + 4.27.5 1.8.0 3.1.40 1.0.4 diff --git a/pom.xml b/pom.xml index 29e168c89a7..555de41732f 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 3.2.0 1.7.1 0.6.1 - 4.28.3 + 4.27.5 1.47.0 10.20.0 3.1.1