You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2020/02/28 08:51:02 UTC

[dubbo] branch master updated (0d88487 -> c783e55)

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/dubbo.git.


    from 0d88487  GenericException compatible with 2.6.x or lower version (#5800)
     add c783e55  mrege 2.7.5-release into master branch (#5642)

No new revisions were added by this update.

Summary of changes:
 CHANGES.md                                         |   33 +
 compiler/pom.xml                                   |   61 +-
 .../ConsumerContextClusterInterceptor.java         |    2 +-
 .../cluster/router/mock/MockInvokersSelector.java  |    4 +-
 .../dubbo/rpc/cluster/router/tag/TagRouter.java    |   10 +-
 .../cluster/support/AbstractClusterInvoker.java    |  626 ++++----
 .../rpc/cluster/directory/MockDirInvocation.java   |   55 +-
 .../support/AbstractClusterInvokerTest.java        |    7 +-
 .../cluster/support/ForkingClusterInvokerTest.java |    4 +-
 .../support/MergeableClusterInvokerTest.java       |    4 +-
 .../src/main/java/org/apache/dubbo/common/URL.java |   12 +-
 .../config/configcenter/DynamicConfiguration.java  |   38 +-
 .../dubbo/common/constants/CommonConstants.java    |    2 -
 .../common/threadpool/ThreadlessExecutor.java      |   21 +-
 .../manager/DefaultExecutorRepository.java         |   13 +
 .../test/java/org/apache/dubbo/common/URLTest.java |    6 +
 .../java/com/alibaba/dubbo/rpc/Invocation.java     |   24 +-
 .../main/java/com/alibaba/dubbo/rpc/Result.java    |   38 +-
 .../java/com/alibaba/dubbo/rpc/RpcInvocation.java  |   24 +-
 .../java/org/apache/dubbo/cache/CacheTest.java     |    6 +-
 .../org/apache/dubbo/filter/LegacyInvocation.java  |    9 +-
 .../org/apache/dubbo/service/MockInvocation.java   |   50 +-
 .../dubbo/config/bootstrap/DubboBootstrap.java     |   17 +-
 .../org/apache/dubbo/config/cache/CacheTest.java   |    2 +-
 .../support/nacos/NacosDynamicConfiguration.java   |   11 +-
 dubbo-demo/dubbo-call-sc/README.md                 |    7 -
 dubbo-demo/dubbo-call-sc/dubbo-sc-consumer/pom.xml |   92 --
 .../apache/dubbo/demo/consumer/Application.java    |   32 -
 .../dubbo/samples/microservices/sc/rest/User.java  |   73 -
 .../samples/microservices/sc/rest/UserService.java |   45 -
 .../microservices/sc/rest/UserServiceImpl.java     |   32 -
 .../src/main/resources/dubbo.properties            |    1 -
 .../src/main/resources/log4j.properties            |    7 -
 .../src/main/resources/spring/dubbo-consumer.xml   |   33 -
 dubbo-demo/dubbo-call-sc/dubbo-sc-provider/pom.xml |   89 --
 .../samples/microservices/sc/Application.java      |   31 -
 .../configuration/RestTemplateConfiguration.java   |   32 -
 .../microservices/sc/controller/MeController.java  |   39 -
 .../sc/controller/PropertyController.java          |   61 -
 .../sc/controller/TestController.java              |   71 -
 .../samples/microservices/sc/controller/User.java  |   58 -
 .../samples/microservices/sc/feign/TestFeign.java  |   29 -
 .../src/main/resources/application.yml             |   22 -
 .../src/main/resources/bootstrap.yml               |   45 -
 dubbo-demo/dubbo-call-sc/pom.xml                   |   61 -
 dubbo-demo/dubbo-call-scdubbo/README.md            |    7 -
 .../dubbo-scdubbo-consumer/pom.xml                 |   96 --
 .../apache/dubbo/demo/consumer/Application.java    |   38 -
 .../dubbo/samples/microservices/sc/rest/User.java  |   73 -
 .../samples/microservices/sc/rest/UserService.java |   45 -
 .../microservices/sc/rest/UserServiceImpl.java     |   32 -
 .../src/main/resources/dubbo.properties            |    1 -
 .../src/main/resources/log4j.properties            |    7 -
 .../src/main/resources/spring/dubbo-consumer.xml   |   39 -
 .../dubbo-scdubbo-provider/pom.xml                 |   83 --
 .../samples/microservices/sc/Application.java      |   31 -
 .../configuration/RestTemplateConfiguration.java   |   32 -
 .../microservices/sc/controller/MeController.java  |   39 -
 .../sc/controller/PropertyController.java          |   61 -
 .../sc/controller/TestController.java              |   69 -
 .../samples/microservices/sc/controller/User.java  |   58 -
 .../samples/microservices/sc/feign/TestFeign.java  |   29 -
 .../src/main/resources/application.yml             |   22 -
 .../src/main/resources/bootstrap.yml               |   42 -
 .../dubbo-scdubbo-provider2/pom.xml                |   99 --
 .../apache/dubbo/demo/provider/Application.java    |   27 -
 .../dubbo/demo/provider/DemoServiceImpl.java       |   34 -
 .../src/main/resources/dubbo.properties            |    1 -
 .../src/main/resources/log4j.properties            |    7 -
 .../src/main/resources/spring/dubbo-provider.xml   |   34 -
 dubbo-demo/dubbo-call-scdubbo/pom.xml              |   62 -
 dubbo-demo/dubbo-demo-servicediscovery-xml/pom.xml |   61 -
 .../servicediscovery-consumer/pom.xml              |   84 --
 .../apache/dubbo/demo/consumer/Application.java    |   31 -
 .../src/main/resources/dubbo.properties            |    1 -
 .../src/main/resources/log4j.properties            |    7 -
 .../src/main/resources/spring/dubbo-consumer.xml   |   30 -
 .../servicediscovery-provider/pom.xml              |   99 --
 .../apache/dubbo/demo/provider/Application.java    |   27 -
 .../dubbo/demo/provider/DemoServiceImpl.java       |   34 -
 .../src/main/resources/dubbo.properties            |    1 -
 .../src/main/resources/log4j.properties            |    7 -
 .../src/main/resources/spring/dubbo-provider.xml   |   34 -
 dubbo-demo/pom.xml                                 |    5 -
 dubbo-demo/sc-call-dubbo/pom.xml                   |   61 -
 dubbo-demo/sc-call-dubbo/sc-dubbo-consumer/pom.xml |   83 --
 .../samples/microservices/sc/Application.java      |   31 -
 .../configuration/RestTemplateConfiguration.java   |   32 -
 .../microservices/sc/controller/MeController.java  |   39 -
 .../sc/controller/PropertyController.java          |   61 -
 .../sc/controller/TestController.java              |   53 -
 .../samples/microservices/sc/controller/User.java  |   58 -
 .../samples/microservices/sc/feign/TestFeign.java  |   29 -
 .../src/main/resources/application.yml             |   22 -
 .../src/main/resources/bootstrap.yml               |   42 -
 dubbo-demo/sc-call-dubbo/sc-dubbo-provider/pom.xml |  111 --
 .../apache/dubbo/demo/provider/Application.java    |   46 -
 .../org/apache/dubbo/demo/provider/rest/User.java  |   73 -
 .../dubbo/demo/provider/rest/UserService.java      |   45 -
 .../dubbo/demo/provider/rest/UserServiceImpl.java  |   32 -
 .../src/main/resources/log4j.properties            |    7 -
 dubbo-demo/servicediscovery-transfer/pom.xml       |   62 -
 .../servicediscovery-transfer-consumer-old/pom.xml |   84 --
 .../apache/dubbo/demo/consumer/Application.java    |   34 -
 .../src/main/resources/dubbo.properties            |    1 -
 .../src/main/resources/log4j.properties            |    7 -
 .../src/main/resources/spring/dubbo-consumer.xml   |   31 -
 .../servicediscovery-transfer-consumer/pom.xml     |   84 --
 .../apache/dubbo/demo/consumer/Application.java    |   31 -
 .../src/main/resources/dubbo.properties            |    1 -
 .../src/main/resources/log4j.properties            |    7 -
 .../src/main/resources/spring/dubbo-consumer.xml   |   30 -
 .../servicediscovery-transfer-provider/pom.xml     |   99 --
 .../apache/dubbo/demo/provider/Application.java    |   27 -
 .../dubbo/demo/provider/DemoServiceImpl.java       |   34 -
 .../dubbo/demo/provider/GreetingServiceImpl.java   |   31 -
 .../src/main/resources/dubbo.properties            |    1 -
 .../src/main/resources/log4j.properties            |    7 -
 .../src/main/resources/spring/dubbo-provider.xml   |   39 -
 .../dubbo/monitor/support/MonitorFilter.java       |    4 +-
 .../dubbo/auth/filter/ProviderAuthFilterTest.java  |   19 +-
 .../remoting/exchange/support/DefaultFuture.java   |   12 +-
 .../java/org/apache/dubbo/rpc/AppResponse.java     |   60 +-
 .../java/org/apache/dubbo/rpc/AsyncRpcResult.java  |   58 +-
 .../org/apache/dubbo/rpc/AttachmentsAdapter.java   |   86 ++
 .../main/java/org/apache/dubbo/rpc/Invocation.java |   13 +-
 .../src/main/java/org/apache/dubbo/rpc/Result.java |   48 +-
 .../main/java/org/apache/dubbo/rpc/RpcContext.java | 1515 ++++++++++----------
 .../java/org/apache/dubbo/rpc/RpcInvocation.java   |  112 +-
 .../org/apache/dubbo/rpc/filter/ContextFilter.java |   10 +-
 .../org/apache/dubbo/rpc/filter/GenericFilter.java |   14 +-
 .../apache/dubbo/rpc/filter/GenericImplFilter.java |    8 +-
 .../org/apache/dubbo/rpc/filter/TokenFilter.java   |    4 +-
 .../apache/dubbo/rpc/protocol/AbstractInvoker.java |   10 +-
 .../dubbo/rpc/protocol/AsyncToSyncInvoker.java     |    5 +
 .../org/apache/dubbo/rpc/support/RpcUtils.java     |   16 +-
 .../java/org/apache/dubbo/rpc/AppResponseTest.java |   24 +
 .../java/org/apache/dubbo/rpc/RpcContextTest.java  |   32 +-
 .../org/apache/dubbo/rpc/RpcInvocationTest.java    |   46 +
 .../apache/dubbo/rpc/filter/ContextFilterTest.java |    2 +-
 .../apache/dubbo/rpc/filter/EchoFilterTest.java    |    4 +-
 .../apache/dubbo/rpc/filter/TokenFilterTest.java   |    4 +-
 .../apache/dubbo/rpc/support/MockInvocation.java   |   53 +-
 .../apache/dubbo/rpc/support/MockInvokerTest.java  |    2 +-
 .../org/apache/dubbo/rpc/support/RpcUtilsTest.java |   14 +-
 .../rpc/protocol/dubbo/CallbackServiceCodec.java   |    4 +-
 .../protocol/dubbo/DecodeableRpcInvocation.java    |   10 +-
 .../rpc/protocol/dubbo/DecodeableRpcResult.java    |    2 +-
 .../dubbo/rpc/protocol/dubbo/DubboCodec.java       |   11 +-
 .../dubbo/rpc/protocol/dubbo/DubboProtocol.java    |   17 +-
 .../dubbo/rpc/protocol/grpc/GrpcInvoker.java       |   23 +-
 .../dubbo/rpc/protocol/grpc/GrpcProtocol.java      |   47 +-
 .../grpc/ReferenceCountManagedChannel.java         |   85 ++
 .../grpc/interceptors/RpcContextInterceptor.java   |    2 +-
 .../hessian/DubboHessianURLConnectionFactory.java  |    4 +-
 .../hessian/HttpClientConnectionFactory.java       |    4 +-
 .../rpc/protocol/http/JsonRemoteInvocation.java    |    2 +-
 .../dubbo/rpc/protocol/rest/RpcContextFilter.java  |    2 +-
 .../dubbo/rpc/protocol/rest/DemoServiceImpl.java   |    2 +-
 .../rpc/protocol/rmi/RmiRemoteInvocation.java      |    6 +-
 .../dubbo/rpc/protocol/thrift/ThriftCodec.java     |    4 +-
 .../dubbo/rpc/protocol/thrift/ThriftProtocol.java  |    2 +-
 .../dubbo/rpc/protocol/thrift/ThriftCodecTest.java |    4 +-
 163 files changed, 2158 insertions(+), 5111 deletions(-)
 delete mode 100644 dubbo-demo/dubbo-call-sc/README.md
 delete mode 100644 dubbo-demo/dubbo-call-sc/dubbo-sc-consumer/pom.xml
 delete mode 100644 dubbo-demo/dubbo-call-sc/dubbo-sc-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
 delete mode 100644 dubbo-demo/dubbo-call-sc/dubbo-sc-consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/rest/User.java
 delete mode 100644 dubbo-demo/dubbo-call-sc/dubbo-sc-consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/rest/UserService.java
 delete mode 100644 dubbo-demo/dubbo-call-sc/dubbo-sc-consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/rest/UserServiceImpl.java
 delete mode 100644 dubbo-demo/dubbo-call-sc/dubbo-sc-consumer/src/main/resources/dubbo.properties
 delete mode 100644 dubbo-demo/dubbo-call-sc/dubbo-sc-consumer/src/main/resources/log4j.properties
 delete mode 100644 dubbo-demo/dubbo-call-sc/dubbo-sc-consumer/src/main/resources/spring/dubbo-consumer.xml
 delete mode 100644 dubbo-demo/dubbo-call-sc/dubbo-sc-provider/pom.xml
 delete mode 100644 dubbo-demo/dubbo-call-sc/dubbo-sc-provider/src/main/java/org/apache/dubbo/samples/microservices/sc/Application.java
 delete mode 100644 dubbo-demo/dubbo-call-sc/dubbo-sc-provider/src/main/java/org/apache/dubbo/samples/microservices/sc/configuration/RestTemplateConfiguration.java
 delete mode 100644 dubbo-demo/dubbo-call-sc/dubbo-sc-provider/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/MeController.java
 delete mode 100644 dubbo-demo/dubbo-call-sc/dubbo-sc-provider/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/PropertyController.java
 delete mode 100644 dubbo-demo/dubbo-call-sc/dubbo-sc-provider/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/TestController.java
 delete mode 100644 dubbo-demo/dubbo-call-sc/dubbo-sc-provider/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/User.java
 delete mode 100644 dubbo-demo/dubbo-call-sc/dubbo-sc-provider/src/main/java/org/apache/dubbo/samples/microservices/sc/feign/TestFeign.java
 delete mode 100644 dubbo-demo/dubbo-call-sc/dubbo-sc-provider/src/main/resources/application.yml
 delete mode 100644 dubbo-demo/dubbo-call-sc/dubbo-sc-provider/src/main/resources/bootstrap.yml
 delete mode 100644 dubbo-demo/dubbo-call-sc/pom.xml
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/README.md
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-consumer/pom.xml
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/rest/User.java
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/rest/UserService.java
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/rest/UserServiceImpl.java
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-consumer/src/main/resources/dubbo.properties
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-consumer/src/main/resources/log4j.properties
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-consumer/src/main/resources/spring/dubbo-consumer.xml
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-provider/pom.xml
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-provider/src/main/java/org/apache/dubbo/samples/microservices/sc/Application.java
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-provider/src/main/java/org/apache/dubbo/samples/microservices/sc/configuration/RestTemplateConfiguration.java
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-provider/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/MeController.java
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-provider/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/PropertyController.java
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-provider/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/TestController.java
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-provider/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/User.java
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-provider/src/main/java/org/apache/dubbo/samples/microservices/sc/feign/TestFeign.java
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-provider/src/main/resources/application.yml
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-provider/src/main/resources/bootstrap.yml
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-provider2/pom.xml
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-provider2/src/main/java/org/apache/dubbo/demo/provider/Application.java
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-provider2/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-provider2/src/main/resources/dubbo.properties
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-provider2/src/main/resources/log4j.properties
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/dubbo-scdubbo-provider2/src/main/resources/spring/dubbo-provider.xml
 delete mode 100644 dubbo-demo/dubbo-call-scdubbo/pom.xml
 delete mode 100644 dubbo-demo/dubbo-demo-servicediscovery-xml/pom.xml
 delete mode 100644 dubbo-demo/dubbo-demo-servicediscovery-xml/servicediscovery-consumer/pom.xml
 delete mode 100644 dubbo-demo/dubbo-demo-servicediscovery-xml/servicediscovery-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
 delete mode 100644 dubbo-demo/dubbo-demo-servicediscovery-xml/servicediscovery-consumer/src/main/resources/dubbo.properties
 delete mode 100644 dubbo-demo/dubbo-demo-servicediscovery-xml/servicediscovery-consumer/src/main/resources/log4j.properties
 delete mode 100644 dubbo-demo/dubbo-demo-servicediscovery-xml/servicediscovery-consumer/src/main/resources/spring/dubbo-consumer.xml
 delete mode 100644 dubbo-demo/dubbo-demo-servicediscovery-xml/servicediscovery-provider/pom.xml
 delete mode 100644 dubbo-demo/dubbo-demo-servicediscovery-xml/servicediscovery-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java
 delete mode 100644 dubbo-demo/dubbo-demo-servicediscovery-xml/servicediscovery-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java
 delete mode 100644 dubbo-demo/dubbo-demo-servicediscovery-xml/servicediscovery-provider/src/main/resources/dubbo.properties
 delete mode 100644 dubbo-demo/dubbo-demo-servicediscovery-xml/servicediscovery-provider/src/main/resources/log4j.properties
 delete mode 100644 dubbo-demo/dubbo-demo-servicediscovery-xml/servicediscovery-provider/src/main/resources/spring/dubbo-provider.xml
 delete mode 100644 dubbo-demo/sc-call-dubbo/pom.xml
 delete mode 100644 dubbo-demo/sc-call-dubbo/sc-dubbo-consumer/pom.xml
 delete mode 100644 dubbo-demo/sc-call-dubbo/sc-dubbo-consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/Application.java
 delete mode 100644 dubbo-demo/sc-call-dubbo/sc-dubbo-consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/configuration/RestTemplateConfiguration.java
 delete mode 100644 dubbo-demo/sc-call-dubbo/sc-dubbo-consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/MeController.java
 delete mode 100644 dubbo-demo/sc-call-dubbo/sc-dubbo-consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/PropertyController.java
 delete mode 100644 dubbo-demo/sc-call-dubbo/sc-dubbo-consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/TestController.java
 delete mode 100644 dubbo-demo/sc-call-dubbo/sc-dubbo-consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/controller/User.java
 delete mode 100644 dubbo-demo/sc-call-dubbo/sc-dubbo-consumer/src/main/java/org/apache/dubbo/samples/microservices/sc/feign/TestFeign.java
 delete mode 100644 dubbo-demo/sc-call-dubbo/sc-dubbo-consumer/src/main/resources/application.yml
 delete mode 100644 dubbo-demo/sc-call-dubbo/sc-dubbo-consumer/src/main/resources/bootstrap.yml
 delete mode 100644 dubbo-demo/sc-call-dubbo/sc-dubbo-provider/pom.xml
 delete mode 100644 dubbo-demo/sc-call-dubbo/sc-dubbo-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java
 delete mode 100644 dubbo-demo/sc-call-dubbo/sc-dubbo-provider/src/main/java/org/apache/dubbo/demo/provider/rest/User.java
 delete mode 100644 dubbo-demo/sc-call-dubbo/sc-dubbo-provider/src/main/java/org/apache/dubbo/demo/provider/rest/UserService.java
 delete mode 100644 dubbo-demo/sc-call-dubbo/sc-dubbo-provider/src/main/java/org/apache/dubbo/demo/provider/rest/UserServiceImpl.java
 delete mode 100644 dubbo-demo/sc-call-dubbo/sc-dubbo-provider/src/main/resources/log4j.properties
 delete mode 100644 dubbo-demo/servicediscovery-transfer/pom.xml
 delete mode 100644 dubbo-demo/servicediscovery-transfer/servicediscovery-transfer-consumer-old/pom.xml
 delete mode 100644 dubbo-demo/servicediscovery-transfer/servicediscovery-transfer-consumer-old/src/main/java/org/apache/dubbo/demo/consumer/Application.java
 delete mode 100644 dubbo-demo/servicediscovery-transfer/servicediscovery-transfer-consumer-old/src/main/resources/dubbo.properties
 delete mode 100644 dubbo-demo/servicediscovery-transfer/servicediscovery-transfer-consumer-old/src/main/resources/log4j.properties
 delete mode 100644 dubbo-demo/servicediscovery-transfer/servicediscovery-transfer-consumer-old/src/main/resources/spring/dubbo-consumer.xml
 delete mode 100644 dubbo-demo/servicediscovery-transfer/servicediscovery-transfer-consumer/pom.xml
 delete mode 100644 dubbo-demo/servicediscovery-transfer/servicediscovery-transfer-consumer/src/main/java/org/apache/dubbo/demo/consumer/Application.java
 delete mode 100644 dubbo-demo/servicediscovery-transfer/servicediscovery-transfer-consumer/src/main/resources/dubbo.properties
 delete mode 100644 dubbo-demo/servicediscovery-transfer/servicediscovery-transfer-consumer/src/main/resources/log4j.properties
 delete mode 100644 dubbo-demo/servicediscovery-transfer/servicediscovery-transfer-consumer/src/main/resources/spring/dubbo-consumer.xml
 delete mode 100644 dubbo-demo/servicediscovery-transfer/servicediscovery-transfer-provider/pom.xml
 delete mode 100644 dubbo-demo/servicediscovery-transfer/servicediscovery-transfer-provider/src/main/java/org/apache/dubbo/demo/provider/Application.java
 delete mode 100644 dubbo-demo/servicediscovery-transfer/servicediscovery-transfer-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java
 delete mode 100644 dubbo-demo/servicediscovery-transfer/servicediscovery-transfer-provider/src/main/java/org/apache/dubbo/demo/provider/GreetingServiceImpl.java
 delete mode 100644 dubbo-demo/servicediscovery-transfer/servicediscovery-transfer-provider/src/main/resources/dubbo.properties
 delete mode 100644 dubbo-demo/servicediscovery-transfer/servicediscovery-transfer-provider/src/main/resources/log4j.properties
 delete mode 100644 dubbo-demo/servicediscovery-transfer/servicediscovery-transfer-provider/src/main/resources/spring/dubbo-provider.xml
 create mode 100644 dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AttachmentsAdapter.java
 create mode 100644 dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcInvocationTest.java
 create mode 100644 dubbo-rpc/dubbo-rpc-grpc/src/main/java/org/apache/dubbo/rpc/protocol/grpc/ReferenceCountManagedChannel.java