[incubator-dubbo] Diff for: [GitHub] chickenlj merged pull request #3246: remove gson from dubbo.jar in shading mode , and change to dependency way

2019-01-16 Thread GitBox
diff --git a/dubbo-all/pom.xml b/dubbo-all/pom.xml index 0c67ab9b58..8594921446 100644 --- a/dubbo-all/pom.xml +++ b/dubbo-all/pom.xml @@ -395,6 +395,10 @@ io.netty netty-all + +com.google.code.gson +gson +

[incubator-dubbo] Diff for: [GitHub] beiwei30 merged pull request #3170: Qos heart

2019-01-15 Thread GitBox
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ExecutorUtil.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ExecutorUtil.java index d33af36424..14408dacf6 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ExecutorUtil.java +++

[incubator-dubbo] Diff for: [GitHub] beiwei30 merged pull request #3230: call the util method

2019-01-15 Thread GitBox
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/ConfigParser.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/parser/ConfigParser.java index bffa1d628a..76d6f2db3a 100644 ---

[incubator-dubbo] Diff for: [GitHub] beiwei30 merged pull request #3043: wrong event setting

2019-01-15 Thread GitBox
diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Request.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Request.java index abd058294b..e5d233aa9c 100644 ---

[incubator-dubbo] Diff for: [GitHub] kexianjun closed pull request #3213: [Dubbo 3151] Optimize heartbeat mechanism

2019-01-15 Thread GitBox
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java index f799358afe..5bc290c64f 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java +++

[incubator-dubbo-website] Diff for: [GitHub] ralf0131 merged pull request #246: 修复一些中文语法不通顺的问题

2019-01-15 Thread GitBox
diff --git a/docs/zh-cn/dev/checklist.md b/docs/zh-cn/dev/checklist.md index c92fcfb0..c1658119 100644 --- a/docs/zh-cn/dev/checklist.md +++ b/docs/zh-cn/dev/checklist.md @@ -23,5 +23,5 @@ ## Partner Check * Partner 以用户的方式运行一下功能 -* Partner 发现问题、添加测试(集成测试)复现总是;Owner 完成实现。(保证两方的时间投入

[incubator-dubbo-website] Diff for: [GitHub] Jock-Ho closed pull request #246: 修复一些中文语法不通顺的问题

2019-01-15 Thread GitBox
diff --git a/docs/zh-cn/dev/checklist.md b/docs/zh-cn/dev/checklist.md index c92fcfb0..c1658119 100644 --- a/docs/zh-cn/dev/checklist.md +++ b/docs/zh-cn/dev/checklist.md @@ -23,5 +23,5 @@ ## Partner Check * Partner 以用户的方式运行一下功能 -* Partner 发现问题、添加测试(集成测试)复现总是;Owner 完成实现。(保证两方的时间投入

[incubator-dubbo-ops] Diff for: [GitHub] lovepoem closed pull request #246: handle travis by language

2019-01-15 Thread GitBox
diff --git a/.travis.yml b/dubbo-admin-backend/.travis.yml similarity index 100% rename from .travis.yml rename to dubbo-admin-backend/.travis.yml With regards, Apache Git Services

[incubator-dubbo] Diff for: [GitHub] ralf0131 merged pull request #3003: Modified to lower camel case

2019-01-15 Thread GitBox
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/compiler/support/ClassUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/compiler/support/ClassUtils.java index 1c55208601..133ece552b 100644 ---

[incubator-dubbo] Diff for: [GitHub] CrazyHZM closed pull request #3003: Modified to lower camel case

2019-01-15 Thread GitBox
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/compiler/support/ClassUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/compiler/support/ClassUtils.java index 1c55208601..133ece552b 100644 ---

[incubator-dubbo] Diff for: [GitHub] CrazyHZM closed pull request #3093: [Dubbo-3069]Use regular expressions to judge fix #3069

2019-01-15 Thread GitBox
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java index f799358afe..d49259a734 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java +++

[incubator-dubbo] Diff for: [GitHub] cvictory merged pull request #3233: [Dubbo-3231]keep TagRouter consistent with 2.6.x

2019-01-15 Thread GitBox
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/tag/TagRouter.java index 6c4e94e5c5..6eac1fc115 100644 ---

[incubator-dubbo] Diff for: [GitHub] chickenlj closed pull request #3078: import a pojo ServiceMeta which is used as service level info and a addressListener to extends

2019-01-15 Thread GitBox
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/ServiceMetada.java b/dubbo-common/src/main/java/org/apache/dubbo/common/ServiceMetada.java new file mode 100644 index 00..eeaddc8d3d --- /dev/null +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/ServiceMetada.java

[incubator-dubbo] Diff for: [GitHub] CrazyHZM closed pull request #3170: Qos heart

2019-01-15 Thread GitBox
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ExecutorUtil.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ExecutorUtil.java index d33af36424..14408dacf6 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ExecutorUtil.java +++

[incubator-dubbo] Diff for: [GitHub] mercyblitz merged pull request #3232: [Dubbo-1485] Remove deprecated annotationbean

2019-01-14 Thread GitBox
diff --git a/dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/schema/CompatibleAnnotationBeanDefinitionParser.java b/dubbo-compatible/src/main/java/org/apache/dubbo/config/spring/schema/CompatibleAnnotationBeanDefinitionParser.java index 66d6ac2dcc..1172591190 100644 ---

[incubator-dubbo] Diff for: [GitHub] cvictory merged pull request #3229: [Dubbo-3226] guarantee interoperability with 2.6.x and lower versions

2019-01-14 Thread GitBox
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ClusterUtils.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ClusterUtils.java index da5e04d13d..8901e4cace 100644 ---

[incubator-dubbo] Diff for: [GitHub] beiwei30 merged pull request #3210: Refactor telnet invoke command

2019-01-14 Thread GitBox
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java index 61e9902296..2047642f24 100644 ---

[incubator-dubbo] Diff for: [GitHub] mengqingbao closed pull request #3228: Org pull

2019-01-14 Thread GitBox
diff --git a/dubbo-admin/pom.xml b/dubbo-admin/pom.xml index 44ce306a69..4e5a7b7039 100644 --- a/dubbo-admin/pom.xml +++ b/dubbo-admin/pom.xml @@ -1,25 +1,18 @@ - + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;

[incubator-dubbo] Diff for: [GitHub] ralf0131 merged pull request #3199: Optimize the code: fix CallbackServiceCodec.java exportOrunexportCallbackService method issue.

2019-01-14 Thread GitBox
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java index aa5c02b4a9..4d2f3c6756 100644 ---

[incubator-dubbo] Diff for: [GitHub] ralf0131 merged pull request #3196: Optimize code: remove unnecessary judgment code.

2019-01-14 Thread GitBox
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/CompatibleTypeUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/CompatibleTypeUtils.java index de96eebda1..efc570fe92 100644 ---

[incubator-dubbo] Diff for: [GitHub] ralf0131 merged pull request #3202: Optimize the code: some printStackTrace() forgot use logger to replace

2019-01-14 Thread GitBox
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/PojoUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/PojoUtils.java index e9a9c63201..2198709fb7 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/PojoUtils.java +++

[incubator-dubbo] Diff for: [GitHub] ralf0131 merged pull request #3222: fix provicer --> provider

2019-01-14 Thread GitBox
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java index c7f62f7ba8..3dbf40ceff 100644 ---

[incubator-dubbo] Diff for: [GitHub] beiwei30 merged pull request #3227: 2.7.0 , just rename some method and modify commments, import order

2019-01-14 Thread GitBox
diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperTransporter.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperTransporter.java index

[incubator-dubbo-spring-boot-project] Diff for: [GitHub] mercyblitz merged pull request #388: 0.1.x

2019-01-14 Thread GitBox
diff --git a/DISCLAIMER b/DISCLAIMER new file mode 100644 index ..bed312a0 --- /dev/null +++ b/DISCLAIMER @@ -0,0 +1 @@ +Apache Dubbo is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted

[incubator-dubbo-spring-boot-project] Diff for: [GitHub] mercyblitz merged pull request #386: 0.2.1

2019-01-14 Thread GitBox
diff --git a/DISCLAIMER b/DISCLAIMER new file mode 100644 index ..bed312a0 --- /dev/null +++ b/DISCLAIMER @@ -0,0 +1 @@ +Apache Dubbo is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted

[incubator-dubbo] Diff for: [GitHub] chickenlj merged pull request #3224: prefer jax-rs annotation on impl and compatible with old version

2019-01-14 Thread GitBox
diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java index 6c24ca575e..7f8bc79f40 100644 ---

[incubator-dubbo-website] Diff for: [GitHub] ralf0131 closed pull request #241: fix typo

2019-01-13 Thread GitBox
diff --git a/docs/zh-cn/user/references/xml/dubbo-registry.md b/docs/zh-cn/user/references/xml/dubbo-registry.md index 8da17c0c..8fdc1a7f 100644 --- a/docs/zh-cn/user/references/xml/dubbo-registry.md +++ b/docs/zh-cn/user/references/xml/dubbo-registry.md @@ -62,5 +62,5 @@ table tr:hover { |

[incubator-dubbo-website] Diff for: [GitHub] ralf0131 closed pull request #242: fix wrong grammar

2019-01-13 Thread GitBox
diff --git a/docs/zh-cn/user/references/xml/dubbo-protocol.md b/docs/zh-cn/user/references/xml/dubbo-protocol.md index 084676a9..fe792eb8 100644 --- a/docs/zh-cn/user/references/xml/dubbo-protocol.md +++ b/docs/zh-cn/user/references/xml/dubbo-protocol.md @@ -65,7 +65,7 @@ table tr:hover { |

[incubator-dubbo] Diff for: [GitHub] L-Angel closed pull request #3220: user can set the classloader for load interface #3219

2019-01-13 Thread GitBox
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java index 4b30bfe101..f19d4e1f25 100644 ---