This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit b939b34da857c9576bfa84e29290ae8249719ec3 Merge: 15fc5b4 f0483b8 Author: ken.lj <[email protected]> AuthorDate: Fri Feb 26 15:57:21 2021 +0800 Merge branch '2.7.9-release' # Conflicts: # dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml # dubbo-dependencies-bom/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml # dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/InterfaceCompatibleRegistryProtocol.java # dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/codec/ExchangeCodec.java # dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/CodecSupport.java # dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodec.java # pom.xml dubbo-cluster/pom.xml | 6 ++ .../apache/dubbo/common/BaseServiceMetadata.java | 4 +- .../dubbo/common/constants/CommonConstants.java | 2 + .../dubbo/common/BaseServiceMetadataTest.java | 3 +- .../file/FileSystemDynamicConfigurationTest.java | 5 +- .../AbstractAnnotationConfigBeanBuilder.java | 9 +-- .../AnnotatedInterfaceConfigBeanBuilder.java | 9 +-- .../factory/annotation/ReferenceBeanBuilder.java | 3 +- .../spring/extension/SpringExtensionFactory.java | 7 +- .../dubbo/config/spring/util/DubboBeanUtils.java | 87 +++++++++++++++++++++- .../annotation/ReferenceBeanBuilderTest.java | 2 +- .../dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml | 5 +- .../dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml | 4 + .../store/etcd/EtcdMetadataReportTest.java | 2 + .../remoting/exchange/codec/ExchangeCodec.java | 28 ++++--- .../dubbo/remoting/transport/AbstractCodec.java | 20 +++-- .../dubbo/remoting/transport/CodecSupport.java | 47 ++++++++---- .../dubbo/remoting/codec/ExchangeCodecTest.java | 20 ++++- .../dubbo/remoting/etcd/jetcd/LeaseTest.java | 2 + .../java/org/apache/dubbo/rpc/AppResponse.java | 16 ++++ .../java/org/apache/dubbo/rpc/AsyncRpcResult.java | 6 +- .../main/java/org/apache/dubbo/rpc/Constants.java | 4 + .../apache/dubbo/rpc/protocol/AbstractInvoker.java | 10 +++ .../dubbo/rpc/proxy/AbstractProxyInvoker.java | 4 +- .../protocol/dubbo/DecodeableRpcInvocation.java | 14 +++- .../rpc/protocol/dubbo/DecodeableRpcResult.java | 12 +++ .../dubbo/rpc/protocol/dubbo/DubboCodec.java | 23 +++++- .../rpc/protocol/dubbo/DubboCodecSupport.java | 53 +++++++++++++ .../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 3 +- .../rpc/protocol/dubbo/DubboProtocolTest.java | 1 + 30 files changed, 342 insertions(+), 69 deletions(-) diff --cc dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml index f8bb0e1,6a03ac7..1e5a7d5 --- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml @@@ -87,13 -83,9 +87,16 @@@ <groupId>org.apache.dubbo</groupId> <artifactId>dubbo-serialization-hessian2</artifactId> </dependency> - + <dependency> + <groupId>org.apache.dubbo</groupId> + <artifactId>dubbo-serialization-jdk</artifactId> + </dependency> + <!-- The metadata center cannot be initialized without this dependency --> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + <version>1.9.12</version> + </dependency> + </dependencies> </project>
