This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.4 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit e62d07f5596ab06ed4c6a3f21e25e4d10a5e2645 Merge: f4b0b13984 bcd3fc9277 Author: Albumen Kevin <[email protected]> AuthorDate: Mon Mar 3 10:06:10 2025 +0800 Merge branch 'apache-3.3' into apache-3.4 # Conflicts: # dubbo-dependencies-bom/pom.xml # pom.xml .../org/apache/dubbo/common/bytecode/Wrapper.java | 19 +- .../dubbo/common/deploy/ApplicationDeployer.java | 2 + .../apache/dubbo/common/deploy/ModuleDeployer.java | 2 + .../org/apache/dubbo/common/ssl/CertManager.java | 4 +- .../org/apache/dubbo/common/ssl/CertProvider.java | 10 + .../threadpool/serial/SerializingExecutor.java | 6 + .../org/apache/dubbo/common/utils/UrlUtils.java | 10 +- .../config/context/AbstractConfigManager.java | 20 +- .../support/AbortPolicyWithReportTest.java | 2 + .../support/eager/EagerThreadPoolExecutorTest.java | 8 + .../dubbo/config/context/ConfigManagerTest.java | 15 + dubbo-config/dubbo-config-api/pom.xml | 2 +- .../org/apache/dubbo/config/ServiceConfig.java | 2 + .../config/deploy/DefaultApplicationDeployer.java | 28 +- .../dubbo/config/deploy/DefaultModuleDeployer.java | 5 + .../apache/dubbo/config/ReferenceConfigTest.java | 259 +++++++++-------- .../org/apache/dubbo/config/ServiceConfigTest.java | 165 +++++++---- .../spring/annotation/AnnotationIsolationTest.java | 5 +- .../dubbo-configcenter-apollo/pom.xml | 2 +- .../apollo/ApolloDynamicConfigurationTest.java | 2 + dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 48 ++-- .../dubbo/metadata/AbstractCacheManager.java | 13 +- .../org/apache/dubbo/metadata/MetadataInfo.java | 16 +- .../dubbo/tracing/DubboObservationRegistry.java | 46 ++- .../dubbo/tracing/metrics/ObservationMeter.java | 21 +- .../tracing/utils/ObservationConventionUtils.java | 2 +- dubbo-plugin/dubbo-rest-openapi/pom.xml | 6 +- .../protocol/tri/servlet/HttpMetadataAdapter.java | 3 +- .../registry/client/AbstractServiceDiscovery.java | 64 +++-- .../client/metadata/store/MetaCacheManager.java | 10 + .../metadata/store/MetaCacheManagerTest.java | 33 ++- .../src/test/resources/test-metadata.dubbo.cache | 1 + .../registry/nacos/NacosNamingServiceWrapper.java | 7 +- .../apache/dubbo/registry/nacos/NacosRegistry.java | 12 +- .../dubbo/registry/nacos/MockNamingService.java | 3 +- .../nacos/NacosNamingServiceWrapperTest.java | 20 +- .../java/org/apache/dubbo/remoting/Constants.java | 1 + .../api/pu/AbstractPortUnificationServer.java | 22 +- .../dubbo/remoting/transport/AbstractServer.java | 5 +- .../apache/dubbo/remoting/http12/HttpUtils.java | 16 ++ .../http12/message/DefaultHttpRequest.java | 9 +- .../http12/message/DefaultHttpResponse.java | 9 +- .../http12/message/codec/HttpUtilsTest.java | 38 +++ .../netty/NettyPortUnificationServer.java | 2 +- .../remoting/transport/netty/NettyClientTest.java | 2 + .../netty4/NettyPortUnificationServer.java | 2 +- .../netty4/NettyPortUnificationServerHandler.java | 4 + .../transport/netty4/NettyServerHandler.java | 16 ++ .../transport/netty4/ssl/SslClientTlsHandler.java | 5 +- .../transport/netty4/ssl/SslServerTlsHandler.java | 4 + .../transport/netty4/ReplierDispatcherTest.java | 2 + .../transport/netty4/RpcMessageHandler.java | 20 +- .../dubbo-remoting-zookeeper-curator5/pom.xml | 7 - ....dubbo.aot.api.ReflectionTypeDescriberRegistrar | 2 +- .../Curator5ZookeeperClientManagerTest.java | 15 + .../curator5/Curator5ZookeeperClientTest.java | 310 ++++++++++++++++++--- .../support/ZookeeperClientManagerTest.java | 33 ++- dubbo-remoting/pom.xml | 8 - dubbo-rpc/dubbo-rpc-api/pom.xml | 5 + .../rpc/aot/GenericProxyDescriberRegistrar.java | 40 +++ ...rg.apache.dubbo.aot.api.ProxyDescriberRegistrar | 1 + dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 1 - .../protocol/dubbo/DecodeableRpcInvocation.java | 4 + .../managemode/WrappedChannelHandlerTest.java | 3 + .../dubbo/rpc/protocol/tri/TripleInvoker.java | 17 +- .../tri/h12/AbstractServerTransportListener.java | 3 + .../tri/stream/AbstractTripleClientStream.java | 10 + .../dubbo/rpc/protocol/tri/stream/Stream.java | 9 + .../dubbo/rpc/protocol/tri/TripleProtocolTest.java | 11 +- dubbo-rpc/pom.xml | 8 - .../fastjson2/Fastjson2ScopeModelInitializer.java | 24 +- .../META-INF/dubbo-endpoints-default.properties | 3 - pom.xml | 56 +--- 74 files changed, 1092 insertions(+), 510 deletions(-) diff --cc pom.xml index 1e049b6222,3bcfca9acf..e038fa9b51 --- a/pom.xml +++ b/pom.xml @@@ -169,10 -169,10 +169,10 @@@ <protobuf-protoc_version>3.22.3</protobuf-protoc_version> <grpc_version>1.54.0</grpc_version> - <spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version> + <spotless-maven-plugin.version>2.44.3</spotless-maven-plugin.version> <dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version> <palantirJavaFormat.version>2.38.0</palantirJavaFormat.version> - <revision>3.3.4-SNAPSHOT</revision> + <revision>3.4.0-beta.1-SNAPSHOT</revision> </properties> <dependencyManagement>
