This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.3 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 9b3073c2f482df56c1d1c636498ff43fe527dcfc Merge: 76390eed4e cfd6ebe611 Author: Albumen Kevin <[email protected]> AuthorDate: Wed Mar 6 11:11:38 2024 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-dependencies-bom/pom.xml .github/workflows/build-and-test-pr.yml | 8 ++++---- .github/workflows/build-and-test-scheduled-3.1.yml | 8 ++++---- .github/workflows/build-and-test-scheduled-3.2.yml | 8 ++++---- .github/workflows/build-and-test-scheduled-3.3.yml | 8 ++++---- .github/workflows/release-test.yml | 8 ++++---- .../dubbo/configcenter/support/nacos/MockConfigService.java | 4 ++++ dubbo-demo/dubbo-demo-native/dubbo-demo-native-consumer/pom.xml | 2 +- dubbo-demo/dubbo-demo-native/dubbo-demo-native-provider/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 4 ++-- .../org/apache/dubbo/metadata/store/nacos/MockConfigService.java | 4 ++++ 10 files changed, 32 insertions(+), 24 deletions(-) diff --cc dubbo-dependencies-bom/pom.xml index 3cee586edc,92f13e2b17..9cf94d697f --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@@ -134,13 -133,10 +134,13 @@@ <resteasy_version>3.15.6.Final</resteasy_version> <codehaus-jackson_version>1.9.13</codehaus-jackson_version> <tomcat_embed_version>8.5.99</tomcat_embed_version> - <nacos_version>2.2.4</nacos_version> + <nacos_version>2.3.1</nacos_version> + <sentinel.version>1.8.6</sentinel.version> + <seata.version>1.6.1</seata.version> - <grpc.version>1.61.1</grpc.version> + <grpc.version>1.62.2</grpc.version> <grpc_contrib_verdion>0.8.1</grpc_contrib_verdion> <jprotoc_version>1.2.2</jprotoc_version> + <mustache_version>0.9.10</mustache_version> <!-- Log libs --> <slf4j_version>1.7.36</slf4j_version> <jcl_version>1.3.0</jcl_version>
