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 944be946acd50ac430854a3e197fe056a5cbde18
Merge: 0cce4c8afe 164aebf6ed
Author: Albumen Kevin <jhq0...@gmail.com>
AuthorDate: Fri Mar 22 10:22:35 2024 +0800
Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
# dubbo-dependencies-bom/pom.xml
# pom.xml
dubbo-config/dubbo-config-spring/pom.xml | 2 +-
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-demo/dubbo-demo-spring-boot/pom.xml | 2 +-
dubbo-dependencies-bom/pom.xml | 8 ++++----
dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +-
.../dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java | 6 ++++++
.../dubbo/remoting/transport/netty4/NettyConnectionClient.java | 5 ++++-
.../dubbo/common/serialize/fastjson2/FastJson2ObjectInput.java | 2 +-
.../dubbo/common/serialize/fastjson2/FastJson2ObjectOutput.java | 4 ++--
.../dubbo-zookeeper-curator5-spring-boot-starter/pom.xml | 2 +-
.../dubbo-spring-boot-starters/observability/pom.xml | 4 ++--
12 files changed, 25 insertions(+), 16 deletions(-)
diff --cc dubbo-config/dubbo-config-spring/pom.xml
index 78316e6243,d12920b529..a09bb6ab89
--- a/dubbo-config/dubbo-config-spring/pom.xml
+++ b/dubbo-config/dubbo-config-spring/pom.xml
@@@ -74,9 -74,15 +74,9 @@@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.9.21.1</version>
+ <version>1.9.21.2</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-monitor-default</artifactId>
- <version>${project.parent.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-rpc-dubbo</artifactId>
diff --cc dubbo-demo/dubbo-demo-spring-boot/pom.xml
index 2e8d489301,41a7d8a2cb..1075039282
--- a/dubbo-demo/dubbo-demo-spring-boot/pom.xml
+++ b/dubbo-demo/dubbo-demo-spring-boot/pom.xml
@@@ -35,9 -35,10 +35,9 @@@
<skip_maven_deploy>true</skip_maven_deploy>
<spring-boot.version>2.7.18</spring-boot.version>
<spring-boot-maven-plugin.version>2.7.18</spring-boot-maven-plugin.version>
- <micrometer-core.version>1.12.3</micrometer-core.version>
+ <micrometer-core.version>1.12.4</micrometer-core.version>
</properties>
+
<dependencyManagement>
<dependencies>
<dependency>
diff --cc dubbo-dependencies-bom/pom.xml
index 63cc1f9e50,a58a6f4a7b..496c7ce9b4
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@@ -119,10 -119,9 +119,10 @@@
<snakeyaml_version>2.2</snakeyaml_version>
<commons_lang3_version>3.14.0</commons_lang3_version>
<envoy_api_version>0.1.35</envoy_api_version>
- <micrometer.version>1.12.3</micrometer.version>
+ <micrometer.version>1.12.4</micrometer.version>
-
+ <opentelemetry.version>1.26.0</opentelemetry.version>
+ <zipkin-reporter.version>2.16.4</zipkin-reporter.version>
- <micrometer-tracing.version>1.2.3</micrometer-tracing.version>
+ <micrometer-tracing.version>1.2.4</micrometer-tracing.version>
<t_digest.version>3.3</t_digest.version>
<prometheus_client.version>0.16.0</prometheus_client.version>
<reactive.version>1.0.4</reactive.version>
@@@ -172,10 -159,9 +172,10 @@@
<snappy_java_version>1.1.10.5</snappy_java_version>
<bouncycastle-bcprov_version>1.70</bouncycastle-bcprov_version>
+ <sofa_registry_version>5.4.3</sofa_registry_version>
<metrics_version>2.0.6</metrics_version>
<gson_version>2.10.1</gson_version>
- <jackson_version>2.16.2</jackson_version>
+ <jackson_version>2.17.0</jackson_version>
<mortbay_jetty_version>6.1.26</mortbay_jetty_version>
<portlet_version>2.0</portlet_version>
<maven_flatten_version>1.6.0</maven_flatten_version>
diff --cc dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
index fab9f50a09,99b0c92b14..1fc649f2f9
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
@@@ -31,11 -31,10 +31,11 @@@
<packaging>pom</packaging>
<properties>
- <revision>3.2.12-SNAPSHOT</revision>
+ <revision>3.3.0-beta.2-SNAPSHOT</revision>
<maven_flatten_version>1.6.0</maven_flatten_version>
+ <slf4j_version>1.7.36</slf4j_version>
<curator5_version>5.1.0</curator5_version>
- <zookeeper_version>3.8.3</zookeeper_version>
+ <zookeeper_version>3.8.4</zookeeper_version>
<spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>
<spotless.action>check</spotless.action>
<dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
diff --cc
dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter/pom.xml
index 7fd88c8338,3ce640cd72..0695539be3
---
a/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter/pom.xml
+++
b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter/pom.xml
@@@ -31,9 -31,21 +31,9 @@@
<properties>
<curator5_version>5.1.0</curator5_version>
- <zookeeper_version>3.8.3</zookeeper_version>
+ <zookeeper_version>3.8.4</zookeeper_version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>parent</artifactId>
- <version>${zookeeper_version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.curator</groupId>
