This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.3 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit da8d0cd9941353bf9d266092dbe5ce20644bc876 Merge: 27e6838c3b 133d0061a7 Author: Albumen Kevin <[email protected]> AuthorDate: Wed Jun 28 20:35:33 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 .../com/alibaba/dubbo/rpc/service/EchoService.java | 0 .../dubbo/rpc/service/GenericException.java | 34 ++--- .../alibaba/dubbo/rpc/service/GenericService.java | 2 +- .../org/apache/dubbo/config/AbstractConfig.java | 3 - .../apache/dubbo/config/AbstractMethodConfig.java | 5 +- .../java/org/apache/dubbo/config/ModuleConfig.java | 3 - .../apache/dubbo/config/ReferenceConfigBase.java | 2 +- .../apache/dubbo/rpc/service/GenericException.java | 141 ++------------------- .../java/com/alibaba/dubbo/rpc/RpcInvocation.java | 1 + dubbo-config/dubbo-config-spring/pom.xml | 2 +- dubbo-demo/dubbo-demo-annotation/pom.xml | 2 +- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- .../dubbo-demo-spring-boot-consumer/pom.xml | 2 +- .../dubbo-demo-spring-boot-provider/pom.xml | 2 +- dubbo-demo/dubbo-demo-spring-boot/pom.xml | 4 +- dubbo-demo/dubbo-demo-xml/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 8 +- .../report/identifier/MetadataIdentifier.java | 4 + .../report/support/AbstractMetadataReport.java | 2 +- .../java/org/apache/dubbo/registry/Constants.java | 4 +- .../dubbo/registry/retry/AbstractRetryTask.java | 2 +- .../apache/dubbo/registry/nacos/NacosRegistry.java | 23 +++- .../java/com/alibaba/dubbo/rpc/RpcException.java | 0 .../java/org/apache/dubbo/rpc/AppResponse.java | 7 + .../org/apache/dubbo/rpc/filter/GenericFilter.java | 4 +- .../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 4 +- dubbo-spring-boot/pom.xml | 2 +- 27 files changed, 73 insertions(+), 194 deletions(-)
