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 3de3ccf4576eb085f6143fcac0181b852aeac7f8
Merge: 5b0b86b11d d4bbf96f08
Author: Albumen Kevin <jhq0...@gmail.com>
AuthorDate: Tue Dec 19 11:36:32 2023 +0800
Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
# dubbo-dependencies-bom/pom.xml
# dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
# dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
# dubbo-spring-boot/pom.xml
# pom.xml
.github/workflows/build-and-test-pr.yml | 132 ++++++++++++++++--
.github/workflows/build-and-test-scheduled-3.1.yml | 154 +++++++++++++++++----
.github/workflows/build-and-test-scheduled-3.2.yml | 130 ++++++++++++++---
...ed-3.2.yml => build-and-test-scheduled-3.3.yml} | 142 +++++++++++++++----
.github/workflows/release-test.yml | 123 ++++++++++++++--
dubbo-config/dubbo-config-spring/pom.xml | 2 +-
dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +-
dubbo-dependencies-bom/pom.xml | 10 +-
.../serialize/hessian2/Hessian2FactoryManager.java | 3 +-
.../observability/pom.xml | 4 +-
pom.xml | 6 +-
11 files changed, 603 insertions(+), 105 deletions(-)
diff --cc dubbo-config/dubbo-config-spring/pom.xml
index 983d0b0547,60a4991be7..cf91bb0a15
--- 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.20.1</version>
+ <version>1.9.21</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 ac0e86dfb6,8101a0bc26..5668551daf
--- 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.0</micrometer-core.version>
+ <micrometer-core.version>1.12.1</micrometer-core.version>
</properties>
+
<dependencyManagement>
<dependencies>
<dependency>
diff --cc dubbo-dependencies-bom/pom.xml
index 9895ab87bc,844033596b..9587c6f6d6
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@@ -93,9 -93,9 +93,9 @@@
<spring_version>5.3.25</spring_version>
<spring_security_version>5.8.8</spring_security_version>
<javassist_version>3.29.2-GA</javassist_version>
- <bytebuddy.version>1.14.10</bytebuddy.version>
+ <byte-buddy_version>1.14.10</byte-buddy_version>
<netty_version>3.2.10.Final</netty_version>
- <netty4_version>4.1.101.Final</netty4_version>
+ <netty4_version>4.1.104.Final</netty4_version>
<mina_version>2.2.1</mina_version>
<grizzly_version>2.4.4</grizzly_version>
<httpclient_version>4.5.14</httpclient_version>
@@@ -133,9 -133,8 +133,9 @@@
<protostuff_version>1.8.0</protostuff_version>
<envoy_api_version>0.1.35</envoy_api_version>
<micrometer.version>1.12.0</micrometer.version>
-
+ <opentelemetry.version>1.26.0</opentelemetry.version>
+ <zipkin-reporter.version>2.16.4</zipkin-reporter.version>
- <micrometer-tracing.version>1.2.0</micrometer-tracing.version>
+ <micrometer-tracing.version>1.2.1</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>
@@@ -154,16 -151,14 +154,16 @@@
<grpc.version>1.60.0</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.2</jcl_version>
+ <jcl_version>1.3.0</jcl_version>
<log4j_version>1.2.17</log4j_version>
<logback_version>1.2.11</logback_version>
<!-- Fix the bug of log4j
refer:https://github.com/apache/logging-log4j2/pull/608 -->
- <log4j2_version>2.20.0</log4j2_version>
+ <log4j2_version>2.22.0</log4j2_version>
<commons_io_version>2.11.0</commons_io_version>
+ <commons-codec_version>1.16.0</commons-codec_version>
<embedded_redis_version>0.13.0</embedded_redis_version>
diff --cc
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2FactoryManager.java
index aba58da02e,f397dbc4b0..8040e8d471
---
a/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2FactoryManager.java
+++
b/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2FactoryManager.java
@@@ -21,9 -21,9 +21,10 @@@ import org.apache.dubbo.common.utils.De
import org.apache.dubbo.common.utils.SerializeCheckStatus;
import org.apache.dubbo.common.utils.SerializeSecurityManager;
import org.apache.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.common.utils.SystemPropertyConfigUtils;
import org.apache.dubbo.rpc.model.FrameworkModel;
+ import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import com.alibaba.com.caucho.hessian.io.SerializerFactory;
