This is an automated email from the ASF dual-hosted git repository.

liujun pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.


    from 73d9cd3  further enhancement for pull request #3297, also fix an issue 
introduced in this pull request (#3303)
     new b9a03a9  remove @Async from core framework.
     new 612ba39  Merge branch 'master' of 
https://github.com/apache/incubator-dubbo
     new ee53c0a  Merge branch 'master' of 
https://github.com/apache/incubator-dubbo
     new 93a72ac  refactor method name to isReturnFuture
     new 4ad3c91  Add DubboBuilder
     new 58efafe  Add DubboBuilder
     new 66fbb3c  Config optimization. 1. add ConfigManager 2. 
Reference/Service hold reference of ConfigCenterConfig 3. change from-spring to 
include-spring-env
     new c509f1b  Check config instance in ConfigManager before create a new 
one.
     new 427e2d2  polish code
     new ac5afe3  support multiple default registries and protocols
     new 8056746  weird demo changes
     new e981dca  Merge branch 'master' into ConfigCenter-optimization
     new b6f437d  weird demo changes
     new 3d7f7f5  move init() method from ConfigCenterConfig
     new 83b54a8  fix #3124 . move RegistryDataConfig configuration into 
RegistryConfig and remove RegistryDataConfig (#3129)
     new f081421  Merge branch '2.7.0-release' into ConfigCenter-optimization
     new daab283  optimize ConfigManager
     new de76413  fix #3123.  support metadata xml config and support 
dubbo.properties format 'dubbo.metadata-report.address=XXx' (#3138)
     new 5c971c1  Merge pull request #3143 from beiwei30:prefix, fix prefix, 
use hypher case instead of camel case.
     new e6b340d  Merge branch '2.7.0-release' into ConfigCenter-optimization
     new ec8a5b9  Merge pull request #3135 from beiwei30:registry-refresh-redo, 
avoid dup refresh for registry config.
     new 90030e7  resolve conflicts
     new 9c9f7f1  fix bug of read config
     new 9111b3c  fix UT
     new ff5d2ff  fix UT
     new 0fba21c  avoid duplicated refresh for application (#3157)
     new b9c8bb8  override equals of Config
     new 824aaf9  move refresh() into setter to avoid duplicate refresh during 
check.
     new a66784a  fix UT
     new d4532c6  add empty check at the start of setter.
     new b399df7  fix UT
     new bcf474d  fix UT
     new d1aa4da  give router rule a more layered extensiable ZK path: * 
../routers/condition * ../routers/tag * ../routers/otherRouter
     new fb5f1af  Fix UT
     new 5a87918  Adjust ZK to handle layered routers path
     new 176a86b  Remove BlackWhiteListRule
     new 1b6bbf1  Adjust code to avoid possible ConcurrentModificationException
     new a02f7a6  refresh only once
     new c4e9b9d  revert router from layered path to flat path: 
/router/condition -> router-codition
     new 1eebe74  refresh configCenter before start
     new 21e0227  modify metadata node path in zookeeper (#3166)
     new c679d0b  Routers zookeeper path (#3173)
     new 39583d4  resolve merge conflicts
     new 178282c  fetch from ConfigManager if ConfigCenter is not set
     new db0c0a8  put checkRegistry() inside refer() not before refer()
     new 41c8ae4  Fix DynamicConfiguration SPI config
     new c89807e  Keep parameters in registry url.
     new 1f2122e  Fix wrong reference
     new 1db53cf  Fix mock in UT
     new b725826  set literal 'protocol' for ReferenceBean
     new 747b804  Fix UT
     new 031c011  [Dubbo-3169]Check future status before get(), return default 
value if not completed yet. (#3185)
     new a8af5ce  Fix metadata report configuration error (#3183)
     new 347f154  Async enhancement (#3184)
     new 8e838d5  Merge pull request #3224, support jax-rs annotation on 
interface as well as on impl.
     new 2f74354  fix #3179. Make registry, configcenter, matadata-report share 
a zooke… (#3182)
     new 5caa422  just for modify comments and imports (#3227)
     new a151262  add 2.7.0 release notes
     new a93e96c  [Dubbo-3226] guarantee interoperability with 2.6.x and lower 
versions (#3229)
     new f73e8cc  refactor method name
     new 1e1a5ec  refactor method name
     new 3c38f20  Remove deprecated AnnotationBean, please refer #1485 for the 
new method to replace. (#3232)
     new 5acb4bf  [Dubbo-3231]keep TagRouter consistent with 2.6.x (#3233)
     new 8c2fbc8  Merge pull request #3246 from cvictory:2.7.0-release remove 
gson from dubbo.jar in shading mode , and change to dependency way.
     new e24e568  Extract compareTo impl to Router interface and concrete 
Router only responsible for provide priority. (#3240)
     new a8e1d26  Protocol compatibility (#3254)
     new 78accf7  Merge 2.6.6 source code into 2.7 (#3241)
     new e73624c  Add activation for the release profile
     new de3014d  Update the Java SE link to Java 8.
     new d98b24c  Move the doclint configuration to correct position.
     new 9f6b8c8  Deactivate maven release profile.
     new 6675c82  Fix final name.
     new 44b4e42  Optimize the Apollo extension of Config-Center SPI
     new 477ef97  Update 2.7.0 release notes
     new 1c78148  Igonre .patch file.
     new e4f39a3  [maven-release-plugin] prepare release dubbo-2.7.0
     new de4f91b  [maven-release-plugin] prepare for next development iteration
     new 5f62633  [maven-release-plugin] prepare release dubbo-2.7.0
     new 2134b89  [maven-release-plugin] prepare for next development iteration
     new e18ec0d  Merge branch '2.7.0-release' of 
https://github.com/apache/incubator-dubbo into 2.7.0-release
     new dbc1f79  Ignore mvn wrapper binary files.
     new 614bceb  [maven-release-plugin] prepare release dubbo-2.7.0
     new d2b62d3  [maven-release-plugin] prepare for next development iteration
     new 9f3ac61  Fix typo (#3293)
     new d75ce73  Merge branch '2.7.0-release' of 
https://github.com/apache/incubator-dubbo into 2.7.0-release
     new 68fa9c1  Merge branch '2.7.0-release'
     new 04bcfe2  Fix UT conflicts of merging 2.7.0-release

The 3102 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES.md                                         |  169 +-
 dubbo-all/pom.xml                                  |   14 +-
 dubbo-bom/pom.xml                                  |    4 +-
 dubbo-cluster/pom.xml                              |    2 +-
 .../java/org/apache/dubbo/rpc/cluster/Router.java  |   18 +
 .../rpc/cluster/directory/AbstractDirectory.java   |    2 +-
 .../rpc/cluster/directory/StaticDirectory.java     |    1 -
 .../dubbo/rpc/cluster/router/AbstractRouter.java   |    9 -
 .../cluster/router/condition/config/AppRouter.java |    2 +-
 .../router/condition/config/ListenableRouter.java  |   35 +-
 .../router/condition/config/ServiceRouter.java     |    2 +-
 .../condition/config/model/BlackWhiteListRule.java |   36 -
 .../config/model/ConditionRouterRule.java          |    9 -
 .../config/model/ConditionRuleParser.java          |    4 -
 .../cluster/router/mock/MockInvokersSelector.java  |   11 +-
 .../rpc/cluster/router/script/ScriptRouter.java    |   10 +
 .../dubbo/rpc/cluster/router/tag/TagRouter.java    |   45 +-
 .../dubbo/rpc/cluster/support/ClusterUtils.java    |    7 +
 .../cluster/router/ConfigConditionRouterTest.java  |   13 +-
 .../dubbo/rpc/cluster/router/TagRouterTest.java    |    7 +-
 .../support/AbstractClusterInvokerTest.java        |    2 +-
 dubbo-common/pom.xml                               |    2 +-
 .../java/org/apache/dubbo/common/Constants.java    |   35 +-
 .../src/main/java/org/apache/dubbo/common/URL.java |   10 +
 .../main/java/org/apache/dubbo/common/Version.java |   38 +-
 .../dubbo/common/config/ConfigurationUtils.java    |   25 +
 .../apache/dubbo/common/config/Environment.java    |    2 +
 .../apache/dubbo/common/version/VersionTest.java   |   28 +
 dubbo-compatible/pom.xml                           |   20 +-
 .../main/java/com/alibaba/dubbo/rpc/Protocol.java  |   14 +
 .../java/com/alibaba/dubbo/rpc/cluster/Router.java |   12 +-
 .../annotation/CompatibleReferenceBeanBuilder.java |   54 +-
 .../CompatibleAnnotationBeanDefinitionParser.java  |    4 +-
 .../java/org/apache/dubbo/config/ConfigTest.java   |   20 +-
 .../apache/dubbo/config/ReferenceConfigTest.java   |   19 +-
 .../apache/dubbo/rpc/cluster/CompatibleRouter.java |    1 +
 ...ompatibleRouter.java => CompatibleRouter2.java} |    2 +-
 .../{CompatibleRouter.java => NewRouter.java}      |   23 +-
 .../org/apache/dubbo/rpc/cluster/RouterTest.java   |   44 +-
 dubbo-config/dubbo-config-api/pom.xml              |    2 +-
 .../org/apache/dubbo/config/AbstractConfig.java    |   29 +-
 .../dubbo/config/AbstractInterfaceConfig.java      | 1588 +++++++--------
 .../apache/dubbo/config/AbstractServiceConfig.java |    6 +-
 .../apache/dubbo/config/ConfigCenterConfig.java    |  108 +-
 .../apache/dubbo/config/MetadataReportConfig.java  |   41 +-
 .../org/apache/dubbo/config/ProtocolConfig.java    |   12 +
 .../org/apache/dubbo/config/ReferenceConfig.java   |   86 +-
 .../org/apache/dubbo/config/RegistryConfig.java    |   37 +-
 .../apache/dubbo/config/RegistryDataConfig.java    |   62 -
 .../org/apache/dubbo/config/ServiceConfig.java     |  152 +-
 .../apache/dubbo/config/context/ConfigManager.java |  331 ++++
 .../apache/dubbo/config/AbstractConfigTest.java    |   16 +-
 .../dubbo/config/AbstractInterfaceConfigTest.java  |    8 +
 .../dubbo/config/ConfigCenterConfigTest.java       |   24 +-
 .../apache/dubbo/config/ReferenceConfigTest.java   |   11 +
 .../org/apache/dubbo/config/ServiceConfigTest.java |    8 +
 .../org/apache/dubbo/config/cache/CacheTest.java   |   30 +-
 .../config/url/ExporterSideConfigUrlTest.java      |    3 +
 .../dubbo/config/url/InvokerSideConfigUrlTest.java |   14 +-
 .../org/apache/dubbo/config/url/UrlTestBase.java   |   12 +-
 dubbo-config/dubbo-config-spring/pom.xml           |    2 +-
 .../apache/dubbo/config/spring/AnnotationBean.java |  323 ----
 .../dubbo/config/spring/ConfigCenterBean.java      |   56 +-
 .../apache/dubbo/config/spring/ReferenceBean.java  |   23 +-
 .../apache/dubbo/config/spring/ServiceBean.java    |  667 ++++---
 .../AbstractAnnotationConfigBeanBuilder.java       |    4 +-
 .../AnnotationInjectedBeanPostProcessor.java       |  529 +++++
 .../DubboConfigBindingBeanPostProcessor.java       |    2 +-
 .../ReferenceAnnotationBeanPostProcessor.java      |  589 ++----
 .../factory/annotation/ReferenceBeanBuilder.java   |   46 +-
 .../ServiceAnnotationBeanPostProcessor.java        |   43 +-
 .../factory/annotation/ServiceBeanNameBuilder.java |  113 ++
 .../annotation/DubboConfigBindingRegistrar.java    |    8 +-
 .../annotation/DubboConfigConfiguration.java       |    5 +-
 ...java => DubboConfigConfigurationRegistrar.java} |   26 +-
 .../context/annotation/EnableDubboConfig.java      |    2 +-
 .../annotation/EnableDubboConfigBinding.java       |    2 +
 .../context/event/ServiceBeanExportedEvent.java    |   36 +-
 .../properties/DefaultDubboConfigBinder.java       |    3 +-
 .../converter/StringArrayToMapConverter.java       |   39 -
 .../converter/StringArrayToStringConverter.java    |   37 -
 .../schema/AnnotationBeanDefinitionParser.java     |    4 +-
 .../spring/schema/DubboBeanDefinitionParser.java   |    2 +-
 .../spring/schema/DubboNamespaceHandler.java       |    2 +
 .../util/AnnotatedBeanDefinitionRegistryUtils.java |   62 +
 .../dubbo/config/spring/util/AnnotationUtils.java  |  223 ++-
 .../dubbo/config/spring/util/BeanFactoryUtils.java |   59 +-
 .../util/{ObjectUtils.java => ClassUtils.java}     |   26 +-
 .../dubbo/config/spring/util/ObjectUtils.java      |   14 +-
 .../config/spring/util/PropertySourcesUtils.java   |   60 +-
 .../src/main/resources/META-INF/compat/dubbo.xsd   |   75 +-
 .../src/main/resources/META-INF/dubbo.xsd          |   50 +-
 .../org/apache/dubbo/config/spring/ConfigTest.java | 2044 ++++++++++----------
 .../spring/action/DemoActionByAnnotation.java      |   67 +-
 .../annotation/consumer/AnnotationAction.java      |   71 +-
 .../AnnotationPropertyValuesAdapterTest.java       |    4 +-
 .../ReferenceAnnotationBeanPostProcessorTest.java  |  224 +--
 .../annotation/ReferenceBeanBuilderTest.java       |  126 ++
 .../ServiceAnnotationBeanPostProcessorTest.java    |   50 +-
 .../ServiceAnnotationTestConfiguration.java}       |   32 +-
 .../annotation/ServiceBeanNameBuilderTest.java     |   75 +
 .../factory/config/YamlPropertySourceFactory.java  |   76 +
 .../config/YamlPropertySourceFactoryTest.java      |   71 +
 .../DubboComponentScanRegistrarTest.java           |   14 +
 .../annotation/DubboConfigConfigurationTest.java   |    2 +
 .../context/annotation/EnableDubboConfigTest.java  |    2 +
 .../spring/context/annotation/EnableDubboTest.java |   63 +-
 .../annotation/consumer/ConsumerConfiguration.java |    7 +-
 .../consumer/test/TestConsumerConfiguration.java   |   11 +-
 .../annotation/provider/DefaultHelloService.java   |    1 +
 .../annotation/provider/DemoServiceImpl.java       |    1 +
 .../annotation/provider/ProviderConfiguration.java |    9 +-
 .../DubboComponentScanRegistrarTest.java           |   28 +-
 .../DubboConfigBindingRegistrarTest.java           |   17 +-
 .../DubboConfigBindingsRegistrarTest.java          |   14 +-
 .../annotation/DubboConfigConfigurationTest.java   |    4 +-
 .../annotation/EnableDubboConfigTest.java          |   30 +-
 .../{ => context}/annotation/EnableDubboTest.java  |   74 +-
 .../annotation/consumer/ConsumerConfiguration.java |    9 +-
 .../consumer/test/TestConsumerConfiguration.java   |   11 +-
 .../annotation/provider/DefaultHelloService.java   |    3 +-
 .../annotation/provider/DemoServiceImpl.java       |    5 +-
 .../annotation/provider/HelloServiceImpl.java      |    2 +-
 .../annotation/provider/ProviderConfiguration.java |    9 +-
 .../properties/DefaultDubboConfigBinderTest.java   |   94 +
 .../properties/DefaultDubboConfigBinderTest.java   |    1 +
 .../converter/StringArrayToMapConverterTest.java   |   52 -
 .../StringArrayToStringConverterTest.java          |   46 -
 .../extension/SpringExtensionFactoryTest.java      |    2 +-
 .../spring/schema/DubboNamespaceHandlerTest.java   |   12 +
 .../spring/status/SpringStatusCheckerTest.java     |    2 +
 .../spring/util/PropertySourcesUtilsTest.java      |   37 +-
 .../src/test/resources/META-INF/default.properties |    2 +-
 .../resources/META-INF/dubbb-consumer.properties   |    7 +-
 .../resources/META-INF/dubbb-provider.properties   |    8 +-
 ...nsumer.properties => dubbo-consumer.properties} |    8 +-
 ...ovider.properties => dubbo-provider.properties} |    8 +-
 .../src/test/resources/META-INF/dubbo.yml          |    8 +
 .../META-INF/spring/dubbo-annotation-consumer.xml  |    2 +-
 .../META-INF/spring/dubbo-annotation-provider.xml  |    2 +-
 .../resources/META-INF/spring/dubbo-consumer.xml   |    2 +-
 .../resources/META-INF/spring/dubbo-provider.xml   |    2 +-
 dubbo-config/pom.xml                               |    2 +-
 dubbo-configcenter/dubbo-configcenter-api/pom.xml  |    5 +-
 ....dubbo.configcenter.DynamicConfigurationFactory |    0
 .../dubbo-configcenter-apollo/pom.xml              |    5 +-
 .../support/apollo/ApolloDynamicConfiguration.java |   32 +-
 .../dubbo-configcenter-zookeeper/pom.xml           |    5 +-
 .../support/zookeeper/CacheListener.java           |    2 +-
 .../zookeeper/ZookeeperDynamicConfiguration.java   |   13 +-
 dubbo-configcenter/pom.xml                         |    5 +-
 dubbo-container/dubbo-container-api/pom.xml        |    2 +-
 dubbo-container/dubbo-container-log4j/pom.xml      |    2 +-
 dubbo-container/dubbo-container-logback/pom.xml    |    2 +-
 dubbo-container/dubbo-container-spring/pom.xml     |   84 +-
 dubbo-container/pom.xml                            |    2 +-
 .../dubbo-demo-annotation-consumer/pom.xml         |    6 +-
 .../dubbo-demo-annotation-provider/pom.xml         |    6 +-
 dubbo-demo/dubbo-demo-annotation/pom.xml           |    6 +-
 .../dubbo-demo-api/dubbo-demo-api-consumer/pom.xml |    6 +-
 .../dubbo-demo-api/dubbo-demo-api-provider/pom.xml |    6 +-
 .../dubbo/demo/provider/DemoServiceImpl.java       |   68 +-
 dubbo-demo/dubbo-demo-api/pom.xml                  |    6 +-
 dubbo-demo/dubbo-demo-interface/pom.xml            |    2 +-
 .../dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml |    2 +-
 .../dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml |    2 +-
 dubbo-demo/dubbo-demo-xml/pom.xml                  |    6 +-
 dubbo-demo/pom.xml                                 |    2 +-
 dubbo-dependencies-bom/pom.xml                     |    2 +-
 dubbo-distribution/pom.xml                         |    4 +-
 dubbo-distribution/src/assembly/source-release.xml |    4 +
 dubbo-filter/dubbo-filter-cache/pom.xml            |   94 +-
 dubbo-filter/dubbo-filter-validation/pom.xml       |  142 +-
 dubbo-filter/pom.xml                               |    2 +-
 .../dubbo-metadata-definition/pom.xml              |    6 +-
 .../dubbo-metadata-report-api/pom.xml              |    6 +-
 .../metadata/identifier/MetadataIdentifier.java    |    4 +-
 .../metadata/support/AbstractMetadataReport.java   |    1 +
 .../support/AbstractMetadataReportFactory.java     |    1 -
 .../identifier/MetadataIdentifierTest.java         |   42 +
 .../dubbo-metadata-report-redis/pom.xml            |    6 +-
 .../dubbo-metadata-report-zookeeper/pom.xml        |    6 +-
 .../zookeeper/ZookeeperMetadataReportTest.java     |   14 +
 dubbo-metadata-report/pom.xml                      |    6 +-
 dubbo-metrics/dubbo-metrics-api/pom.xml            |    6 +-
 dubbo-metrics/pom.xml                              |    6 +-
 dubbo-monitor/dubbo-monitor-api/pom.xml            |    2 +-
 dubbo-monitor/dubbo-monitor-default/pom.xml        |    2 +-
 dubbo-monitor/pom.xml                              |    2 +-
 dubbo-plugin/dubbo-qos/pom.xml                     |    2 +-
 dubbo-plugin/pom.xml                               |    2 +-
 dubbo-registry/dubbo-registry-api/pom.xml          |    2 +-
 .../registry/integration/RegistryProtocol.java     |   17 +-
 .../java/org/apache/dubbo/registry/ZKTools.java    |    2 +-
 dubbo-registry/dubbo-registry-default/pom.xml      |    2 +-
 dubbo-registry/dubbo-registry-multicast/pom.xml    |    2 +-
 dubbo-registry/dubbo-registry-redis/pom.xml        |    2 +-
 dubbo-registry/dubbo-registry-zookeeper/pom.xml    |    2 +-
 dubbo-registry/pom.xml                             |    2 +-
 dubbo-remoting/dubbo-remoting-api/pom.xml          |    2 +-
 dubbo-remoting/dubbo-remoting-grizzly/pom.xml      |    2 +-
 dubbo-remoting/dubbo-remoting-http/pom.xml         |    2 +-
 dubbo-remoting/dubbo-remoting-mina/pom.xml         |    2 +-
 dubbo-remoting/dubbo-remoting-netty/pom.xml        |    2 +-
 dubbo-remoting/dubbo-remoting-netty4/pom.xml       |    2 +-
 dubbo-remoting/dubbo-remoting-p2p/pom.xml          |    5 +-
 dubbo-remoting/dubbo-remoting-zookeeper/pom.xml    |    2 +-
 .../zookeeper/curator/CuratorZookeeperClient.java  |   22 +-
 .../curator/CuratorZookeeperTransporter.java       |    8 +-
 .../support/AbstractZookeeperTransporter.java      |  155 ++
 .../zookeeper/zkclient/ZkClientWrapper.java        |    7 +-
 .../zkclient/ZkclientZookeeperClient.java          |   11 +-
 .../zkclient/ZkclientZookeeperTransporter.java     |    7 +-
 .../curator/CuratorZookeeperTransporterTest.java   |    8 +-
 .../support/AbstractZookeeperTransporterTest.java  |  238 +++
 dubbo-remoting/pom.xml                             |    2 +-
 dubbo-rpc/dubbo-rpc-api/pom.xml                    |   94 +-
 .../java/org/apache/dubbo/rpc/AsyncContext.java    |   10 -
 .../org/apache/dubbo/rpc/AsyncContextImpl.java     |   11 +-
 .../java/org/apache/dubbo/rpc/AsyncRpcResult.java  |   38 +-
 .../main/java/org/apache/dubbo/rpc/RpcContext.java |   13 +-
 .../org/apache/dubbo/rpc/SimpleAsyncRpcResult.java |   11 +
 .../org/apache/dubbo/rpc/filter/ContextFilter.java |    5 +-
 .../dubbo/rpc/proxy/AbstractProxyInvoker.java      |    3 +-
 .../java/org/apache/dubbo/rpc/RpcContextTest.java  |   13 +-
 dubbo-rpc/dubbo-rpc-dubbo/pom.xml                  |    2 +-
 .../dubbo/rpc/protocol/dubbo/DubboProtocol.java    |    6 -
 .../dubbo/rpc/validation/ValidationTest.java       |   38 +-
 dubbo-rpc/dubbo-rpc-hessian/pom.xml                |    2 +-
 dubbo-rpc/dubbo-rpc-http/pom.xml                   |  112 +-
 .../rpc/protocol/http/HttpRemoteInvocation.java    |   15 +-
 .../dubbo/rpc/protocol/http/HttpProtocol.java      |   23 +-
 .../dubbo/rpc/protocol/http/HttpProtocolTest.java  |   16 +-
 dubbo-rpc/dubbo-rpc-injvm/pom.xml                  |    2 +-
 dubbo-rpc/dubbo-rpc-memcached/pom.xml              |    2 +-
 dubbo-rpc/dubbo-rpc-redis/pom.xml                  |  104 +-
 dubbo-rpc/dubbo-rpc-rest/pom.xml                   |    2 +-
 .../dubbo/rpc/protocol/rest/RestProtocol.java      |    2 +-
 dubbo-rpc/dubbo-rpc-rmi/pom.xml                    |    2 +-
 .../rpc/protocol/rmi/RmiRemoteInvocation.java      |   66 +-
 .../apache/dubbo/rpc/protocol/rmi/RmiProtocol.java |   19 +-
 dubbo-rpc/dubbo-rpc-thrift/pom.xml                 |    2 +-
 dubbo-rpc/dubbo-rpc-webservice/pom.xml             |  150 +-
 dubbo-rpc/pom.xml                                  |    2 +-
 .../dubbo-serialization-api/pom.xml                |    2 +-
 .../dubbo-serialization-fastjson/pom.xml           |    2 +-
 .../dubbo-serialization-fst/pom.xml                |    2 +-
 .../dubbo-serialization-hessian2/pom.xml           |    2 +-
 .../dubbo-serialization-jdk/pom.xml                |    2 +-
 .../dubbo-serialization-kryo/pom.xml               |    2 +-
 .../dubbo-serialization-protostuff/pom.xml         |    6 +-
 .../dubbo-serialization-test/pom.xml               |    6 +-
 dubbo-serialization/pom.xml                        |    2 +-
 .../dubbo-test-spring3/pom.xml                     |    2 +-
 dubbo-test/dubbo-test-compatibility/pom.xml        |    2 +-
 dubbo-test/dubbo-test-integration/pom.xml          |    2 +-
 dubbo-test/pom.xml                                 |  430 ++--
 pom.xml                                            |    8 +-
 258 files changed, 7017 insertions(+), 5285 deletions(-)
 delete mode 100644 
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/config/model/BlackWhiteListRule.java
 copy 
dubbo-compatible/src/test/java/org/apache/dubbo/rpc/cluster/{CompatibleRouter.java
 => CompatibleRouter2.java} (96%)
 copy 
dubbo-compatible/src/test/java/org/apache/dubbo/rpc/cluster/{CompatibleRouter.java
 => NewRouter.java} (75%)
 copy 
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/ListMerger.java 
=> dubbo-compatible/src/test/java/org/apache/dubbo/rpc/cluster/RouterTest.java 
(53%)
 delete mode 100644 
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryDataConfig.java
 create mode 100644 
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
 copy 
dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/service/DemoService.java
 => 
dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java
 (72%)
 delete mode 100644 
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/AnnotationBean.java
 create mode 100644 
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationInjectedBeanPostProcessor.java
 create mode 100644 
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceBeanNameBuilder.java
 rename 
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/{DubboConfigConfigurationSelector.java
 => DubboConfigConfigurationRegistrar.java} (66%)
 copy dubbo-common/src/main/java/org/apache/dubbo/common/utils/ArrayUtils.java 
=> 
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/event/ServiceBeanExportedEvent.java
 (51%)
 delete mode 100644 
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/convert/converter/StringArrayToMapConverter.java
 delete mode 100644 
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/convert/converter/StringArrayToStringConverter.java
 create mode 100644 
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/util/AnnotatedBeanDefinitionRegistryUtils.java
 copy 
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/util/{ObjectUtils.java
 => ClassUtils.java} (58%)
 create mode 100644 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilderTest.java
 copy 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/{context/annotation/provider/ProviderConfiguration.java
 => beans/factory/annotation/ServiceAnnotationTestConfiguration.java} (81%)
 create mode 100644 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceBeanNameBuilderTest.java
 create mode 100644 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactory.java
 create mode 100644 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactoryTest.java
 copy 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/{
 => context}/annotation/DubboComponentScanRegistrarTest.java (80%)
 copy 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/{
 => context}/annotation/DubboConfigBindingRegistrarTest.java (79%)
 copy 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/{
 => context}/annotation/DubboConfigBindingsRegistrarTest.java (77%)
 copy 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/{
 => context}/annotation/DubboConfigConfigurationTest.java (96%)
 copy 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/{
 => context}/annotation/EnableDubboConfigTest.java (74%)
 copy 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/{
 => context}/annotation/EnableDubboTest.java (70%)
 copy 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/{
 => context}/annotation/consumer/ConsumerConfiguration.java (94%)
 copy 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/{
 => context}/annotation/consumer/test/TestConsumerConfiguration.java (92%)
 copy 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/{
 => context}/annotation/provider/DefaultHelloService.java (94%)
 copy 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/{
 => context}/annotation/provider/DemoServiceImpl.java (93%)
 copy 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/{
 => context}/annotation/provider/HelloServiceImpl.java (94%)
 copy 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/{
 => context}/annotation/provider/ProviderConfiguration.java (93%)
 create mode 100644 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/context/properties/DefaultDubboConfigBinderTest.java
 delete mode 100644 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/convert/converter/StringArrayToMapConverterTest.java
 delete mode 100644 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/convert/converter/StringArrayToStringConverterTest.java
 copy 
dubbo-config/dubbo-config-spring/src/test/resources/META-INF/{dubbb-consumer.properties
 => dubbo-consumer.properties} (50%)
 copy 
dubbo-config/dubbo-config-spring/src/test/resources/META-INF/{dubbb-provider.properties
 => dubbo-provider.properties} (71%)
 create mode 100644 
dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo.yml
 rename 
dubbo-configcenter/dubbo-configcenter-api/src/main/resources/META-INF/dubbo/{ 
=> internal}/org.apache.dubbo.configcenter.DynamicConfigurationFactory (100%)
 create mode 100644 
dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/identifier/MetadataIdentifierTest.java
 create mode 100644 
dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperTransporter.java
 create mode 100644 
dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperTransporterTest.java
 copy 
dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/model/BizException.java
 => 
dubbo-rpc/dubbo-rpc-http/src/main/java/com/alibaba/dubbo/rpc/protocol/http/HttpRemoteInvocation.java
 (73%)
 copy 
dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/action/DemoInterceptor.java
 => 
dubbo-rpc/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiRemoteInvocation.java
 (68%)

Reply via email to