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 2021/02/26 08:32:32 UTC
[dubbo] branch master updated (24ca37b -> 4ad2634)
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 24ca37b fix issue: start.sh can't work when dubbo.properties contain commented dubbo.protocol.port property (#6508)
add 711343e fix deserialization vulnerability
add 1373fe0 Heartbeat skip serialize and deserialize (#7077)
add e62014f check serialization id on both side
add 0c9b832 update pom version to 2.7.8.1
add 0098743 fix ut
add 86a6ec6 fix codec ut
add 77457bb check serialization type
add c4f3aa1 ignore ut
add 419d7b2 disable junit5 ut
add 8894481 fix ut
add acd0e8e check serialization not null before set, too many uts to fix
add 26e3e89 return object type
add 0c06a4a disable etcd ut
add 73264fb change pom version to 2.7.9
add 970c475 Handle scenario where serviceDiscoveryInvoker is null (#7133)
add 901a414 [dubbo-samples - 272] Improve getOptionalBean/getBeans (#7145)
add 50a7a27 Introcduce DubboBootstrap start/stop listener(#7159)
add d9703c7 update Copyright range to 2018-2021
add f0483b8 disable unstable file system ut
new b939b34 Merge branch '2.7.9-release'
new 4ad2634 Merge branch 'master' of https://github.com/apache/dubbo
The 2 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:
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(-)
create mode 100644 dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodecSupport.java
[dubbo] 02/02: Merge branch 'master' of
https://github.com/apache/dubbo
Posted by li...@apache.org.
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 4ad263422dd7304039848404f507ddca221b32d9
Merge: b939b34 24ca37b
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri Feb 26 16:31:14 2021 +0800
Merge branch 'master' of https://github.com/apache/dubbo
.../org/apache/dubbo/common/config/configcenter/Constants.java | 1 +
.../config/configcenter/TreePathDynamicConfiguration.java | 2 +-
.../main/java/org/apache/dubbo/common/extension/Wrapper.java | 4 ++++
.../dubbo/config/context/ConfigConfigurationAdapter.java | 2 +-
.../java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java | 1 -
.../config/spring/context/annotation/EnableDubboConfig.java | 5 +++--
.../support/apollo/ApolloDynamicConfiguration.java | 2 +-
.../configcenter/support/etcd/EtcdDynamicConfiguration.java | 2 +-
.../src/main/resources/META-INF/assembly/bin/start.sh | 10 +++++-----
.../apache/dubbo/metadata/report/MetadataReportInstance.java | 3 +++
.../main/java/org/apache/dubbo/remoting/exchange/Request.java | 10 ++++++++++
.../apache/dubbo/remoting/exchange/support/DefaultFuture.java | 2 +-
12 files changed, 31 insertions(+), 13 deletions(-)
[dubbo] 01/02: Merge branch '2.7.9-release'
Posted by li...@apache.org.
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 <ke...@gmail.com>
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>