This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch feature/xds in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit d0f0776d460bec4c17def790fdc636821bdde533 Merge: 03f1f65b47 bcd3fc9277 Author: Albumen Kevin <[email protected]> AuthorDate: Mon Mar 3 10:55:25 2025 +0800 Merge branch 'apache-3.3' into feature/xds # Conflicts: # dubbo-dependencies-bom/pom.xml .artifacts | 1 + .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/build-and-test-pr.yml | 108 +- .github/workflows/build-and-test-scheduled-3.1.yml | 10 +- .github/workflows/build-and-test-scheduled-3.2.yml | 10 +- .github/workflows/build-and-test-scheduled-3.3.yml | 10 +- .github/workflows/release-test.yml | 10 +- LICENSE | 8 + README.md | 71 +- codecov.yml | 14 +- dubbo-cluster/pom.xml | 18 +- .../rpc/cluster/ClusterScopeModelInitializer.java | 5 +- .../MergeableClusterScopeModelInitializer.java | 7 - .../router/mesh/MeshScopeModelInitializer.java | 7 - .../loadbalance/RoundRobinLoadBalanceTest.java | 4 +- .../cluster/router/ConfigConditionRouterTest.java | 129 -- .../common/beans/factory/ScopeBeanFactory.java | 127 +- .../org/apache/dubbo/common/bytecode/Wrapper.java | 19 +- .../dubbo/common/constants/CommonConstants.java | 9 + .../dubbo/common/deploy/ApplicationDeployer.java | 2 + .../apache/dubbo/common/deploy/ModuleDeployer.java | 2 + .../dubbo/common/resource/Initializable.java | 23 +- .../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/ClassUtils.java | 5 + .../org/apache/dubbo/common/utils/NetUtils.java | 5 + .../org/apache/dubbo/common/utils/StringUtils.java | 105 +- .../org/apache/dubbo/common/utils/UrlUtils.java | 10 +- .../org/apache/dubbo/config/AbstractConfig.java | 6 + .../config/context/AbstractConfigManager.java | 20 +- .../apache/dubbo/config/nested/OpenAPIConfig.java | 332 ++++ .../org/apache/dubbo/config/nested/RestConfig.java | 60 + .../apache/dubbo/rpc/model/MethodDescriptor.java | 4 + .../rpc/model/ReflectionMethodDescriptor.java | 44 +- .../org/apache/dubbo/rpc/model/ScopeModel.java | 12 +- .../dubbo/rpc/model/ScopeModelInitializer.java | 6 +- .../dubbo/rpc/model/StubMethodDescriptor.java | 10 + .../common/io/UnsafeByteArrayOutputStreamTest.java | 3 +- .../support/AbortPolicyWithReportTest.java | 2 + .../support/eager/EagerThreadPoolExecutorTest.java | 8 + .../dubbo/config/context/ConfigManagerTest.java | 15 + .../dubbo/serialization/SerializationTest.java | 3 + dubbo-config/dubbo-config-api/pom.xml | 2 +- .../org/apache/dubbo/config/ReferenceConfig.java | 2 +- .../org/apache/dubbo/config/ServiceConfig.java | 2 + .../builders/AbstractInterfaceBuilder.java | 2 +- .../config/deploy/DefaultApplicationDeployer.java | 28 +- .../dubbo/config/deploy/DefaultModuleDeployer.java | 5 + .../apache/dubbo/config/ReferenceConfigTest.java | 261 +-- .../org/apache/dubbo/config/ServiceConfigTest.java | 165 +- .../spring/annotation/AnnotationIsolationTest.java | 5 +- .../spring/issues/issue6000/Issue6000Test.java | 2 +- .../dubbo-configcenter-apollo/pom.xml | 2 +- .../apollo/ApolloDynamicConfigurationTest.java | 2 + .../dubbo-configcenter-zookeeper/pom.xml | 7 - dubbo-configcenter/pom.xml | 8 - .../dubbo-demo-spring-boot-idl-consumer/pom.xml | 8 - .../dubbo-demo-spring-boot-idl-provider/pom.xml | 8 - .../dubbo-demo-spring-boot-servlet/pom.xml | 27 + .../dubbo/springboot/demo/servlet/ApiConsumer.java | 19 + .../springboot/demo/servlet/GreeterService.java | 2 + .../demo/servlet/GreeterServiceImpl.java | 11 + .../src/main/resources/application.yml | 6 +- dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 110 +- dubbo-distribution/dubbo-all-shaded/pom.xml | 11 + dubbo-distribution/dubbo-all/pom.xml | 11 + dubbo-distribution/dubbo-bom/pom.xml | 5 + dubbo-distribution/dubbo-core-spi/pom.xml | 3 + dubbo-maven-plugin/pom.xml | 5 +- dubbo-metadata/dubbo-metadata-api/pom.xml | 13 + .../dubbo/metadata/AbstractCacheManager.java | 13 +- .../metadata/DubboMetadataServiceV2Triple.java | 91 +- .../org/apache/dubbo/metadata/MetadataInfo.java | 20 +- .../org/apache/dubbo/metadata/MetadataInfoV2.java | 201 ++- .../dubbo/metadata/MetadataInfoV2OrBuilder.java | 43 + .../org/apache/dubbo/metadata/MetadataRequest.java | 100 +- .../dubbo/metadata/MetadataRequestOrBuilder.java | 9 + .../org/apache/dubbo/metadata/MetadataService.java | 14 + .../apache/dubbo/metadata/MetadataServiceV2.java | 14 + .../dubbo/metadata/MetadataServiceV2Detector.java | 17 +- .../metadata/MetadataServiceV2OuterClass.java | 44 +- .../org/apache/dubbo/metadata/OpenAPIFormat.java | 158 ++ .../{MetadataRequest.java => OpenAPIInfo.java} | 303 ++-- ...estOrBuilder.java => OpenAPIInfoOrBuilder.java} | 25 +- .../org/apache/dubbo/metadata/OpenAPIRequest.java | 1746 ++++++++++++++++++++ .../dubbo/metadata/OpenAPIRequestOrBuilder.java | 228 +++ .../org/apache/dubbo/metadata/ServiceInfoV2.java | 342 +++- .../dubbo/metadata/ServiceInfoV2OrBuilder.java | 74 + .../report/MetadataScopeModelInitializer.java | 7 - .../src/main/proto/metadata_service_v2.proto | 70 +- .../metrics/MetricsScopeModelInitializer.java | 8 - .../dubbo/tracing/DubboObservationRegistry.java | 46 +- .../dubbo/tracing/metrics/ObservationMeter.java | 25 +- .../tracing/utils/ObservationConventionUtils.java | 2 +- .../resources/Dubbo3TripleInterfaceStub.mustache | 5 + .../src/main/resources/Dubbo3TripleStub.mustache | 36 +- .../resources/ReactorDubbo3TripleStub.mustache | 6 +- .../apache/dubbo/qos/QosScopeModelInitializer.java | 5 +- .../apache/dubbo/qos/command/impl/GetOpenAPI.java | 95 ++ .../internal/org.apache.dubbo.qos.api.BaseCommand | 1 + .../dubbo/qos/command/util/CommandHelperTest.java | 2 + dubbo-plugin/dubbo-rest-jaxrs/pom.xml | 7 +- .../jaxrs/AbstractJaxrsArgumentResolver.java | 4 +- .../tri/rest/support/jaxrs/BeanArgumentBinder.java | 23 +- .../support/jaxrs/BeanParamArgumentResolver.java | 6 + .../rest/support/jaxrs/BodyArgumentResolver.java | 7 + .../support/jaxrs/CookieParamArgumentResolver.java | 6 + .../support/jaxrs/FallbackArgumentResolver.java | 6 +- .../rest/support/jaxrs/FormArgumentResolver.java | 8 + .../support/jaxrs/FormParamArgumentResolver.java | 8 +- .../support/jaxrs/HeaderParamArgumentResolver.java | 6 + .../protocol/tri/rest/support/jaxrs/Helper.java | 6 +- .../support/jaxrs/JaxrsRequestMappingResolver.java | 11 +- .../tri/rest/support/jaxrs/JaxrsRestToolKit.java | 2 +- .../support/jaxrs/MatrixParamArgumentResolver.java | 6 + .../rest/support/jaxrs/ParamConverterFactory.java | 2 - .../support/jaxrs/PathParamArgumentResolver.java | 7 + .../support/jaxrs/QueryParamArgumentResolver.java | 6 + .../pom.xml | 84 +- .../protocol/tri/rest/openapi/AbstractContext.java | 70 + .../protocol/tri/rest/openapi/ConfigFactory.java | 200 +++ .../rpc/protocol/tri/rest/openapi/Constants.java | 39 + .../rpc/protocol/tri/rest/openapi/Context.java | 33 +- .../rpc/protocol/tri/rest/openapi/ContextImpl.java | 74 + .../rest/openapi/DefaultOpenAPINamingStrategy.java | 62 + .../tri/rest/openapi/DefaultOpenAPIService.java | 308 ++++ .../tri/rest/openapi/DefinitionEncoder.java | 74 + .../tri/rest/openapi/DefinitionFilter.java | 410 +++++ .../tri/rest/openapi/DefinitionMerger.java | 642 +++++++ .../tri/rest/openapi/DefinitionResolver.java | 463 ++++++ .../tri/rest/openapi/ExtensionFactory.java | 93 ++ .../rpc/protocol/tri/rest/openapi/Helper.java | 348 ++++ .../rest/openapi/OpenAPIDefinitionResolver.java | 62 + .../tri/rest/openapi/OpenAPIDocumentPublisher.java | 16 +- .../tri/rest/openapi/OpenAPIExtension.java | 12 +- .../protocol/tri/rest/openapi/OpenAPIFilter.java | 76 + .../tri/rest/openapi/OpenAPINamingStrategy.java | 22 +- .../tri/rest/openapi/OpenAPIRequestHandler.java | 24 +- .../tri/rest/openapi/OpenAPISchemaPredicate.java | 20 +- .../tri/rest/openapi/OpenAPISchemaResolver.java} | 27 +- .../rest/openapi/OpenAPIScopeModelInitializer.java | 18 +- .../protocol/tri/rest/openapi/PrimitiveSchema.java | 139 ++ .../protocol/tri/rest/openapi/ProtoEncoder.java | 18 +- .../protocol/tri/rest/openapi/SchemaResolver.java | 318 ++++ .../tri/rest/openapi/model/ApiResponse.java | 126 ++ .../tri/rest/openapi/model/Components.java | 93 ++ .../protocol/tri/rest/openapi/model/Contact.java | 64 + .../tri/rest/openapi/model/Discriminator.java | 78 + .../protocol/tri/rest/openapi/model/Encoding.java | 131 ++ .../protocol/tri/rest/openapi/model/Example.java | 75 + .../tri/rest/openapi/model/ExternalDocs.java | 43 +- .../protocol/tri/rest/openapi/model/Header.java | 195 +++ .../rpc/protocol/tri/rest/openapi/model/Info.java | 116 ++ .../protocol/tri/rest/openapi/model/License.java | 43 +- .../protocol/tri/rest/openapi/model/MediaType.java | 115 ++ .../rpc/protocol/tri/rest/openapi/model/Node.java | 197 +++ .../protocol/tri/rest/openapi/model/OAuthFlow.java | 99 ++ .../tri/rest/openapi/model/OAuthFlows.java | 85 + .../protocol/tri/rest/openapi/model/OpenAPI.java | 301 ++++ .../protocol/tri/rest/openapi/model/Operation.java | 320 ++++ .../protocol/tri/rest/openapi/model/Parameter.java | 278 ++++ .../protocol/tri/rest/openapi/model/PathItem.java | 173 ++ .../tri/rest/openapi/model/RequestBody.java | 97 ++ .../protocol/tri/rest/openapi/model/Schema.java | 639 +++++++ .../rest/openapi/model/SecurityRequirement.java | 80 + .../tri/rest/openapi/model/SecurityScheme.java | 167 ++ .../protocol/tri/rest/openapi/model/Server.java | 87 + .../tri/rest/openapi/model/ServerVariable.java | 90 + .../rpc/protocol/tri/rest/openapi/model/Tag.java | 71 + .../rpc/protocol/tri/rest/openapi/model/XML.java | 82 + .../basic/BasicOpenAPIDefinitionResolver.java | 196 +++ .../swagger/JavadocOpenAPIDefinitionResolver.java | 344 ++++ .../rest/support/swagger/RedocRequestHandler.java | 104 ++ .../swagger/SwaggerOpenAPIDefinitionResolver.java | 258 +++ .../support/swagger/SwaggerUIRequestHandler.java | 152 ++ .../tri/rest/support/swagger/WebjarHelper.java | 75 + ...rg.apache.dubbo.rpc.model.ScopeModelInitializer | 1 + ....rpc.protocol.tri.rest.openapi.OpenAPIExtension | 6 + .../resources/META-INF/resources/redoc/index.html | 20 + .../META-INF/resources/swagger-ui/index.html | 52 + dubbo-plugin/dubbo-rest-spring/pom.xml | 7 +- .../spring/AbstractSpringArgumentResolver.java | 8 +- .../rest/support/spring/BeanArgumentBinder.java | 16 +- .../support/spring/BindParamArgumentResolver.java | 10 +- .../spring/CookieValueArgumentResolver.java | 6 + .../support/spring/FallbackArgumentResolver.java | 4 +- .../spring/MatrixVariableArgumentResolver.java | 13 +- .../spring/ModelAttributeArgumentResolver.java | 16 +- .../spring/PathVariableArgumentResolver.java | 7 + .../spring/RequestAttributeArgumentResolver.java | 6 + .../spring/RequestBodyArgumentResolver.java | 14 +- .../spring/RequestHeaderArgumentResolver.java | 6 + .../spring/RequestParamArgumentResolver.java | 6 + .../spring/RequestPartArgumentResolver.java | 10 +- .../spring/SpringMvcRequestMappingResolver.java | 11 +- .../support/spring/SpringResponseRestFilter.java | 4 +- .../tri/rest/support/spring/SpringRestToolKit.java | 21 +- .../model/SecurityScopeModelInitializer.java | 8 - .../protocol/tri/servlet/HttpMetadataAdapter.java | 6 + .../rpc/protocol/tri/servlet/TripleFilter.java | 12 +- dubbo-plugin/dubbo-triple-websocket/pom.xml | 5 + .../registry/RegistryScopeModelInitializer.java | 5 +- .../registry/client/AbstractServiceDiscovery.java | 64 +- .../client/metadata/MetadataServiceDelegation.java | 19 +- .../metadata/MetadataServiceDelegationV2.java | 43 +- .../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/connection/AbstractConnectionClient.java | 5 - .../api/pu/AbstractPortUnificationServer.java | 22 +- .../dubbo/remoting/transport/AbstractClient.java | 16 +- .../dubbo/remoting/transport/AbstractEndpoint.java | 2 +- .../dubbo/remoting/transport/AbstractServer.java | 9 +- .../dubbo/remoting/codec/TelnetCodecTest.java | 5 +- dubbo-remoting/dubbo-remoting-http12/pom.xml | 10 +- .../http12/AbstractServerHttpChannelObserver.java | 11 +- .../dubbo/remoting/http12/HttpHeaderNames.java | 2 + .../apache/dubbo/remoting/http12/HttpMethods.java | 4 + .../apache/dubbo/remoting/http12/HttpUtils.java | 23 +- .../http12/message/DefaultHttpRequest.java | 13 +- .../http12/message/DefaultHttpResponse.java | 9 +- .../remoting/http12/message/DefaultHttpResult.java | 4 + .../dubbo/remoting/http12/message/MediaType.java | 50 +- .../remoting/http12/message/MethodMetadata.java | 24 +- .../http12/message/codec/BinaryCodecFactory.java | 5 + .../http12/message/codec/JsonPbCodecFactory.java | 3 +- .../remoting/http12/netty4/h1/NettyHttp1Codec.java | 17 +- .../apache/dubbo/remoting/http12/rest/OpenAPI.java | 96 ++ .../dubbo/remoting/http12/rest/OpenAPIRequest.java | 132 ++ .../rest/{ParamType.java => OpenAPIService.java} | 20 +- .../dubbo/remoting/http12/rest/Operation.java | 95 ++ .../dubbo/remoting/http12/rest/ParamType.java | 1 + .../apache/dubbo/remoting/http12/rest/Schema.java | 161 ++ ...moting.http12.message.HttpMessageEncoderFactory | 1 + .../http12/message/codec/HttpUtilsTest.java} | 33 +- .../dubbo/remoting/http3/netty4/Constants.java} | 17 +- .../http3/netty4/NettyHttp3FrameCodec.java | 21 +- .../netty4/{Helper.java => Http3Helper.java} | 2 +- .../netty4/NettyHttp3ConnectionClient.java | 26 +- .../transport/netty4/NettyHttp3Server.java | 66 +- .../remoting/transport/netty/NettyClient.java | 4 - .../remoting/transport/netty/NettyHandler.java | 2 +- .../netty/NettyPortUnificationServer.java | 7 +- .../remoting/transport/netty/NettyClientTest.java | 2 + .../netty4/AbstractNettyConnectionClient.java | 84 +- .../remoting/transport/netty4/AddressUtils.java | 62 +- .../remoting/transport/netty4/NettyChannel.java | 66 +- .../transport/netty4/NettyChannelHandler.java | 9 +- .../remoting/transport/netty4/NettyClient.java | 4 - .../transport/netty4/NettyClientHandler.java | 9 +- .../transport/netty4/NettyConnectionHandler.java | 46 +- .../netty4/NettyPortUnificationServer.java | 7 +- .../netty4/NettyPortUnificationServerHandler.java | 4 + .../remoting/transport/netty4/NettyServer.java | 3 - .../transport/netty4/NettyServerHandler.java | 24 +- .../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 + .../dubbo/rpc/AdaptiveScopeModelInitializer.java | 7 - .../main/java/org/apache/dubbo/rpc/Constants.java | 5 +- .../java/org/apache/dubbo/rpc/RpcInvocation.java | 4 + .../apache/dubbo/rpc/RpcScopeModelInitializer.java | 9 +- .../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/dubbo-rpc-triple/pom.xml | 50 +- .../dubbo/rpc/protocol/tri/ExceptionUtils.java | 18 +- .../dubbo/rpc/protocol/tri/Http3Exchanger.java | 61 +- .../rpc/protocol/tri/ReflectionPackableMethod.java | 17 +- .../dubbo/rpc/protocol/tri/TripleInvoker.java | 35 +- .../dubbo/rpc/protocol/tri/TripleProtocol.java | 21 +- .../tri/h12/AbstractServerCallListener.java | 17 +- .../tri/h12/AbstractServerTransportListener.java | 9 +- .../tri/h12/CompositeExceptionHandler.java | 11 +- .../tri/h12/ExceptionCustomizerWrapper.java | 2 +- .../tri/h12/ServerStreamServerCallListener.java | 7 + .../rpc/protocol/tri/h3/Http3ClientFrameCodec.java | 65 +- .../tri/h3/Http3TripleServerConnectionHandler.java | 50 + .../GrpcHttp3ServerTransportListenerFactory.java | 3 +- .../h3/negotiation/AutoSwitchConnectionClient.java | 23 +- .../dubbo/rpc/protocol/tri/rest/RestConstants.java | 13 - .../AbstractAnnotationBaseArgumentResolver.java | 11 +- .../rest/argument/AbstractArgumentResolver.java | 8 +- .../argument/AnnotationBaseArgumentResolver.java | 3 + .../rest/argument/CompositeArgumentConverter.java | 28 +- .../rest/argument/CompositeArgumentResolver.java | 31 +- .../tri/rest/argument/GeneralTypeConverter.java | 8 +- .../NamedValueArgumentResolverSupport.java | 20 +- .../rpc/protocol/tri/rest/cors/CorsUtils.java | 17 +- .../rest/filter/RestExtensionExecutionFilter.java | 18 +- .../tri/rest/mapping/ContentNegotiator.java | 32 +- .../mapping/DefaultRequestMappingRegistry.java | 93 +- .../rpc/protocol/tri/rest/mapping/RadixTree.java | 101 +- ...questMappingRegistry.java => Registration.java} | 44 +- .../protocol/tri/rest/mapping/RequestMapping.java | 16 + .../tri/rest/mapping/RequestMappingRegistry.java | 4 + .../tri/rest/mapping/RequestMappingResolver.java | 3 + .../rest/mapping/condition/ConsumesCondition.java | 5 + .../mapping/condition/MediaTypeExpression.java | 11 + .../tri/rest/mapping/condition/PathCondition.java | 4 +- .../tri/rest/mapping/condition/PathExpression.java | 43 +- .../tri/rest/mapping/condition/PathSegment.java | 12 +- .../rest/mapping/condition/ProducesCondition.java | 9 +- .../tri/rest/mapping/meta/AnnotationMeta.java | 9 + .../tri/rest/mapping/meta/AnnotationSupport.java | 44 +- .../protocol/tri/rest/mapping/meta/BeanMeta.java | 347 ++-- .../protocol/tri/rest/mapping/meta/MethodMeta.java | 57 +- .../tri/rest/mapping/meta/MethodParameterMeta.java | 2 +- .../tri/rest/mapping/meta/NamedValueMeta.java | 64 +- .../tri/rest/mapping/meta/ParameterMeta.java | 30 +- .../protocol/tri/rest/mapping/meta/ProtoBean.java | 45 + .../tri/rest/mapping/meta/ServiceMeta.java | 2 +- .../TypeParameterMeta.java} | 40 +- .../tri/rest/support/basic/Annotations.java | 3 + .../support/basic/BasicRequestMappingResolver.java | 22 +- .../tri/rest/support/basic/BasicRestToolKit.java | 2 +- .../tri/rest/support/basic/BeanArgumentBinder.java | 29 +- .../support/basic/FallbackArgumentResolver.java | 8 +- .../support/basic/GRequestArgumentResolver.java | 8 + .../rest/support/basic/ParamArgumentResolver.java | 31 +- .../tri/rest/util/AbstractRestToolKit.java | 33 +- .../rpc/protocol/tri/rest/util/MethodWalker.java | 2 +- .../rpc/protocol/tri/rest/util/PathUtils.java | 22 + .../rpc/protocol/tri/rest/util/RequestUtils.java | 17 + .../rpc/protocol/tri/rest/util/RestToolKit.java | 7 + .../rpc/protocol/tri/rest/util/RestUtils.java | 148 +- .../rpc/protocol/tri/rest/util/TypeUtils.java | 137 ++ .../rpc/protocol/tri/stream/AbstractStream.java | 11 +- .../tri/stream/AbstractTripleClientStream.java | 10 + .../dubbo/rpc/protocol/tri/stream/Stream.java | 9 + .../mapping/condition/PathExpressionTest.groovy | 1 + .../rpc/protocol/tri/TripleHttp3ProtocolTest.java | 4 +- .../dubbo/rpc/protocol/tri/TripleProtocolTest.java | 11 +- dubbo-rpc/pom.xml | 8 - .../SerializationScopeModelInitializer.java | 8 - .../fastjson2/Fastjson2ScopeModelInitializer.java | 32 +- .../hessian2/Hessian2ScopeModelInitializer.java | 8 - .../pom.xml | 6 - ...bboEndpointAnnotationAutoConfigurationTest.java | 77 +- .../actuate/health/DubboHealthIndicatorTest.java | 31 +- .../META-INF/dubbo-endpoints-default.properties | 3 - .../boot/actuate/endpoint/DubboEndpointTest.java | 24 +- .../dubbo-spring-boot-autoconfigure/pom.xml | 6 - .../DubboListenerAutoConfiguration.java | 9 + .../org/apache/dubbo/spring/boot/TestSuite.java | 34 - .../autoconfigure/BinderDubboConfigBinderTest.java | 18 +- .../CompatibleDubboAutoConfigurationTest.java | 21 +- ...ubboAutoConfigurationTestWithoutProperties.java | 32 +- .../DubboRelaxedBinding2AutoConfigurationTest.java | 14 +- ...DubboAutoConfigurationOnMultipleConfigTest.java | 47 +- .../DubboAutoConfigurationOnSingleConfigTest.java | 43 +- ...aultPropertiesEnvironmentPostProcessorTest.java | 26 +- .../dubbo-spring-boot-compatible/pom.xml | 14 +- .../dubbo-spring-boot/pom.xml | 18 +- .../context/event/DubboOpenAPIExportListener.java | 52 + .../org/apache/dubbo/spring/boot/TestSuite.java | 36 - .../AwaitingNonWebApplicationListenerTest.java | 28 +- ...nDefinitionConflictApplicationListenerTest.java | 29 +- .../event/WelcomeLogoApplicationListenerTest.java | 17 +- ...aultPropertiesEnvironmentPostProcessorTest.java | 32 +- .../dubbo/spring/boot/util/DubboUtilsTest.java | 45 +- dubbo-test/dubbo-dependencies-all/pom.xml | 5 + dubbo-test/dubbo-test-check/pom.xml | 2 +- dubbo-test/dubbo-test-spring3.2/pom.xml | 14 +- dubbo-test/dubbo-test-spring4.1/pom.xml | 14 +- dubbo-test/dubbo-test-spring4.2/pom.xml | 14 +- pom.xml | 122 +- 384 files changed, 16987 insertions(+), 2693 deletions(-) diff --cc dubbo-dependencies-bom/pom.xml index f07947adde,1062f5d268..124a052688 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@@ -118,14 -118,14 +118,14 @@@ <hibernate_validator_new_version>7.0.5.Final</hibernate_validator_new_version> <jel_version>3.0.1-b12</jel_version> <jcache_version>1.1.1</jcache_version> - <apollo_client_version>2.3.0</apollo_client_version> - <snakeyaml_version>2.3</snakeyaml_version> + <apollo_client_version>2.4.0</apollo_client_version> + <snakeyaml_version>2.4</snakeyaml_version> <commons_lang3_version>3.17.0</commons_lang3_version> - <envoy_api_version>0.1.35</envoy_api_version> + <envoy_api_version>1.0.45</envoy_api_version> - <micrometer.version>1.13.6</micrometer.version> - <opentelemetry.version>1.44.1</opentelemetry.version> - <zipkin-reporter.version>3.4.2</zipkin-reporter.version> - <micrometer-tracing.version>1.3.5</micrometer-tracing.version> + <micrometer.version>1.14.4</micrometer.version> + <opentelemetry.version>1.47.0</opentelemetry.version> + <zipkin-reporter.version>3.5.0</zipkin-reporter.version> + <micrometer-tracing.version>1.4.3</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>
