This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch 3.0 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 7702fcfa1b7dd62e947e9275a8cb3942640948a2 Merge: 7645134 d41bfab Author: ken.lj <[email protected]> AuthorDate: Wed Jul 22 14:16:49 2020 +0800 Merge branch 'master' of https://github.com/apache/dubbo .../configcenter/TreePathDynamicConfiguration.java | 25 ++++-- .../dubbo/common/constants/CommonConstants.java | 5 ++ .../org/apache/dubbo/common/utils/PojoUtils.java | 22 ++++- .../org/apache/dubbo/config/RegistryConfig.java | 34 ++++---- .../dubbo/common/extension/ExtensionFactory.java | 3 + .../org/apache/dubbo/config/ReferenceConfig.java | 34 ++++++-- .../org/apache/dubbo/config/ServiceConfig.java | 16 ++++ .../dubbo/config/bootstrap/DubboBootstrap.java | 97 +++++++++++++++++++--- .../config/bootstrap/builders/RegistryBuilder.java | 2 +- .../PublishingServiceDefinitionListener.java | 74 ----------------- .../internal/org.apache.dubbo.event.EventListener | 4 +- .../NacosDubboServiceProviderBootstrap.java | 6 +- .../ZookeeperDubboServiceProviderBootstrap.java | 6 +- .../src/test/resources/META-INF/config.properties | 2 + .../resources/META-INF/issue-6252-test.properties | 6 +- dubbo-dependencies-bom/pom.xml | 6 +- .../dubbo-dependencies-zookeeper/pom.xml | 2 +- .../identifier/BaseServiceMetadataIdentifier.java | 2 +- .../ConfigCenterBasedMetadataReportFactory.java | 28 ++++--- .../nacos/util/NacosNamingServiceUtils.java | 45 ++-------- .../remoting/http/tomcat/TomcatHttpServer.java | 7 +- .../protocol/webservice/WebServiceProtocol.java | 9 +- .../dubbo/internal/org.apache.dubbo.rpc.Protocol | 2 +- .../webservice/WebserviceProtocolTest.java | 90 ++++++++++++++++++++ .../hessian2/Hessian2SerializerFactory.java | 2 +- pom.xml | 2 +- 26 files changed, 342 insertions(+), 189 deletions(-)
