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 70b1ecb6627c1150a5746a62de0627b2b5bbc374 Merge: e2ea0046d2 caed64b2a6 Author: Albumen Kevin <[email protected]> AuthorDate: Tue Feb 20 11:27:00 2024 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-dependencies-bom/pom.xml .../loadbalance/ConsistentHashLoadBalance.java | 8 ++---- .../loadbalance/ConsistentHashLoadBalanceTest.java | 33 ++++++++++++++++++++++ dubbo-config/dubbo-config-api/pom.xml | 2 +- .../dubbo-demo-native-consumer/pom.xml | 2 +- .../dubbo-demo-native-provider/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 6 ++-- 6 files changed, 42 insertions(+), 11 deletions(-) diff --cc dubbo-dependencies-bom/pom.xml index f1d4d55526,66694e28aa..c69bae2fd6 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@@ -99,8 -99,8 +99,8 @@@ <httpclient_version>4.5.14</httpclient_version> <httpcore_version>4.4.16</httpcore_version> <fastjson_version>1.2.83</fastjson_version> - <fastjson2_version>2.0.45</fastjson2_version> + <fastjson2_version>2.0.46</fastjson2_version> - <zookeeper_version>3.7.0</zookeeper_version> + <zookeeper_version>3.7.2</zookeeper_version> <curator_version>5.1.0</curator_version> <curator_test_version>2.12.0</curator_test_version> <jedis_version>3.10.0</jedis_version> @@@ -135,12 -134,9 +135,12 @@@ <codehaus-jackson_version>1.9.13</codehaus-jackson_version> <tomcat_embed_version>8.5.98</tomcat_embed_version> <nacos_version>2.2.4</nacos_version> + <sentinel.version>1.8.6</sentinel.version> + <seata.version>1.6.1</seata.version> - <grpc.version>1.61.0</grpc.version> + <grpc.version>1.61.1</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> @@@ -156,17 -151,9 +156,17 @@@ <!-- Alibaba --> <alibaba_spring_context_support_version>1.0.11</alibaba_spring_context_support_version> + <!-- Test libs --> + <junit_jupiter_version>5.9.3</junit_jupiter_version> + <junit_version>4.13.2</junit_version> + <awaitility_version>4.2.0</awaitility_version> + <hamcrest_version>2.2</hamcrest_version> + <cglib_version>2.2.2</cglib_version> + <mockito_version>4.11.0</mockito_version> + <jaxb_version>2.2.7</jaxb_version> <activation_version>1.2.0</activation_version> - <test_container_version>1.19.4</test_container_version> + <test_container_version>1.19.5</test_container_version> <hessian_lite_version>3.2.13</hessian_lite_version> <swagger_version>1.6.13</swagger_version>
