From 69f6246962e3b30f19f0dfaa5a36f9f6c379bdce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=95=E5=9B=BE?= Date: Mon, 29 Oct 2018 19:30:49 +0800 Subject: [PATCH 1/5] release 2.6.5 --- CHANGES.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 23d4aba9a97..e8568acb207 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,29 @@ # Release Notes +## 2.6.5 + +Enhancements / Features： + +- [#2655](https://github.com/apache/incubator-dubbo/issues/2655) @Service and @Reference Optimization +- [#1641](https://github.com/apache/incubator-dubbo/issues/1641) [Enhancement] the algorithm of load issue on Windows good first issue help wanted level/easy type/bug +- [#2600](https://github.com/apache/incubator-dubbo/issues/2600) add javadoc to dubbo-all module good first issue help wanted +- [#2560](https://github.com/apache/incubator-dubbo/issues/2560) A empty directory dubbo-config/dubbo-config-spring/src/test/resources/work after package source tgz +- [#2519](https://github.com/apache/incubator-dubbo/issues/2519) Can we make the bom and all module become the child module of dubbo-parent? good first issue help wanted +- [#2235](https://github.com/apache/incubator-dubbo/issues/2235) [Enhancement] Reactor the generation rule for @Service Bean name type/enhancement + + +Bugfixes： + +- [#2063](https://github.com/apache/incubator-dubbo/issues/2063) @Service(register=false) is not work type/bug +- [#1903](https://github.com/apache/incubator-dubbo/issues/1903) Our customized serialization id exceeds the maximum limit, now it cannot work on 2.6.2 anymore. type/bug +- [#2194](https://github.com/apache/incubator-dubbo/issues/2194) Annotation @Reference can't support to export a service with a sync one and an async one type/bug +- [#2522](https://github.com/apache/incubator-dubbo/issues/2522) `org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor#generateReferenceBeanCacheKey` has a bug type/bug +- [#2256](https://github.com/apache/incubator-dubbo/issues/2256) 2.6.x Spring Event & Bugfix +- [#2621](https://github.com/apache/incubator-dubbo/issues/2621) fix #1641, support get system load on windows. +- [pr#2624](https://github.com/apache/incubator-dubbo/pull/2624) Fix incorrect descriptions for dubbo-serialization module + +Issues and Pull Requests, check [milestone-2.6.5](https://github.com/apache/incubator-dubbo/milestone/21). + ## 2.6.4 Enhancements / Features From ef123c4991d5b960937211fb4aeb46cbb1c6b3a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=95=E5=9B=BE?= Date: Mon, 29 Oct 2018 19:47:14 +0800 Subject: [PATCH 2/5] edit release note for 2.6.5 (rewrite log) --- CHANGES.md | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index e8568acb207..8d88dbd6c8f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,25 +2,31 @@ ## 2.6.5 -Enhancements / Features： +Enhancements / Features： -- [#2655](https://github.com/apache/incubator-dubbo/issues/2655) @Service and @Reference Optimization -- [#1641](https://github.com/apache/incubator-dubbo/issues/1641) [Enhancement] the algorithm of load issue on Windows good first issue help wanted level/easy type/bug -- [#2600](https://github.com/apache/incubator-dubbo/issues/2600) add javadoc to dubbo-all module good first issue help wanted -- [#2560](https://github.com/apache/incubator-dubbo/issues/2560) A empty directory dubbo-config/dubbo-config-spring/src/test/resources/work after package source tgz -- [#2519](https://github.com/apache/incubator-dubbo/issues/2519) Can we make the bom and all module become the child module of dubbo-parent? good first issue help wanted -- [#2235](https://github.com/apache/incubator-dubbo/issues/2235) [Enhancement] Reactor the generation rule for @Service Bean name type/enhancement +- Reactor the generation rule for @Service Bean name [#2235](https://github.com/apache/incubator-dubbo/issues/2235) +- Introduce a new Spring ApplicationEvent for ServiceBean exporting [#2251](https://github.com/apache/incubator-dubbo/issues/2251) +- [Enhancement] the algorithm of load issue on Windows good first issue help wanted. [#1641](https://github.com/apache/incubator-dubbo/issues/1641) +- add javadoc to dubbo-all module good first issue help wanted. [#2600](https://github.com/apache/incubator-dubbo/issues/2600) +- [Enhancement] Reactor the generation rule for @Service Bean name type/enhancement [#2235](https://github.com/apache/incubator-dubbo/issues/2235) +- Optimize LeastActiveLoadBalance and add weight test case. [#2540](https://github.com/apache/incubator-dubbo/issues/2540) +- Smooth Round Robin selection. [#2578](https://github.com/apache/incubator-dubbo/issues/2578) [#2647](https://github.com/apache/incubator-dubbo/pull/2647) +- [Enhancement] Resolve the placeholders for sub-properties. [#2297](https://github.com/apache/incubator-dubbo/issues/2297) Bugfixes： -- [#2063](https://github.com/apache/incubator-dubbo/issues/2063) @Service(register=false) is not work type/bug -- [#1903](https://github.com/apache/incubator-dubbo/issues/1903) Our customized serialization id exceeds the maximum limit, now it cannot work on 2.6.2 anymore. type/bug -- [#2194](https://github.com/apache/incubator-dubbo/issues/2194) Annotation @Reference can't support to export a service with a sync one and an async one type/bug -- [#2522](https://github.com/apache/incubator-dubbo/issues/2522) `org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor#generateReferenceBeanCacheKey` has a bug type/bug -- [#2256](https://github.com/apache/incubator-dubbo/issues/2256) 2.6.x Spring Event & Bugfix -- [#2621](https://github.com/apache/incubator-dubbo/issues/2621) fix #1641, support get system load on windows. -- [pr#2624](https://github.com/apache/incubator-dubbo/pull/2624) Fix incorrect descriptions for dubbo-serialization module +- @Service(register=false) is not work. [#2063](https://github.com/apache/incubator-dubbo/issues/2063) +- Our customized serialization id exceeds the maximum limit, now it cannot work on 2.6.2 anymore. [#1903](https://github.com/apache/incubator-dubbo/issues/1903) +- Consumer throws RpcException after RegistryDirectory notify in high QPS. [#2016](https://github.com/apache/incubator-dubbo/issues/2016) +- Annotation @Reference can't support to export a service with a sync one and an async one . [#2194](https://github.com/apache/incubator-dubbo/issues/2194) +- `org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor#generateReferenceBeanCacheKey` has a bug. [#2522](https://github.com/apache/incubator-dubbo/issues/2522) +- 2.6.x Spring Event & Bugfix. [#2256](https://github.com/apache/incubator-dubbo/issues/2256) +- Fix incorrect descriptions for dubbo-serialization module. [#2665](https://github.com/apache/incubator-dubbo/issues/2665) +- A empty directory dubbo-config/dubbo-config-spring/src/test/resources/work after package source tgz. [#2560](https://github.com/apache/incubator-dubbo/issues/2560) +- Fixed 2.6.x branch a minor issue with doConnect not using getConnectTimeout() in NettyClient. (*No issue*). [#2622](https://github.com/apache/incubator-dubbo/pull/2622) +- Bean name of @service annotated class does not resolve placeholder. [#1755](https://github.com/apache/incubator-dubbo/issues/1755) + Issues and Pull Requests, check [milestone-2.6.5](https://github.com/apache/incubator-dubbo/milestone/21). From 52c3a07817efe9bcf0e6de203cf576a96f89e299 Mon Sep 17 00:00:00 2001 From: cvictory Date: Fri, 2 Nov 2018 14:13:43 +0800 Subject: [PATCH 3/5] mmm --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f12a635924b..6e27cea90c4 100644 --- a/pom.xml +++ b/pom.xml @@ -42,9 +42,9 @@ - https://github.com/apache/incubator-dubbo - scm:git:https://github.com/apache/incubator-dubbo.git - scm:git:https://github.com/apache/incubator-dubbo.git + https://github.com/cvictory/incubator-dubbo + scm:git:https://github.com/cvictory/incubator-dubbo.git + scm:git:https://github.com/cvictory/incubator-dubbo.git HEAD From 6cd9dd0d2eb51feb825a06dc1b65d004954c6bca Mon Sep 17 00:00:00 2001 From: cvictory Date: Fri, 2 Nov 2018 16:26:58 +0800 Subject: [PATCH 4/5] edit release note to remove some unuseful word --- CHANGES.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a9b1e20cdaf..e95ea44fca5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,8 +6,8 @@ Enhancements / Features： - Reactor the generation rule for @Service Bean name [#2235](https://github.com/apache/incubator-dubbo/issues/2235) - Introduce a new Spring ApplicationEvent for ServiceBean exporting [#2251](https://github.com/apache/incubator-dubbo/issues/2251) -- [Enhancement] the algorithm of load issue on Windows good first issue help wanted. [#1641](https://github.com/apache/incubator-dubbo/issues/1641) -- add javadoc to dubbo-all module good first issue help wanted. [#2600](https://github.com/apache/incubator-dubbo/issues/2600) +- [Enhancement] the algorithm of load issue on Windows. [#1641](https://github.com/apache/incubator-dubbo/issues/1641) +- add javadoc to dubbo-all module good first issue. [#2600](https://github.com/apache/incubator-dubbo/issues/2600) - [Enhancement] Reactor the generation rule for @Service Bean name type/enhancement [#2235](https://github.com/apache/incubator-dubbo/issues/2235) - Optimize LeastActiveLoadBalance and add weight test case. [#2540](https://github.com/apache/incubator-dubbo/issues/2540) - Smooth Round Robin selection. [#2578](https://github.com/apache/incubator-dubbo/issues/2578) [#2647](https://github.com/apache/incubator-dubbo/pull/2647) @@ -114,4 +114,4 @@ Issues and Pull Requests, check [milestone-2.6.3](https://github.com/apache/incu - Waiting for registry notification on consumer side by checking channel state. 7. Simplify consumer/provider side check in RpcContext, #1444. -Issues and Pull Requests, check [milestone-2.6.2](https://github.com/apache/incubator-dubbo/milestone/15). \ No newline at end of file +Issues and Pull Requests, check [milestone-2.6.2](https://github.com/apache/incubator-dubbo/milestone/15). From 1fa6dd2a16c2d852e1140b701f93ff5d265457d5 Mon Sep 17 00:00:00 2001 From: cvictory Date: Fri, 2 Nov 2018 16:45:04 +0800 Subject: [PATCH 5/5] merge from upstream and origin --- .../main/java/com/alibaba/dubbo/demo/consumer/Consumer.java | 2 -- pom.xml | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dubbo-demo/dubbo-demo-consumer/src/main/java/com/alibaba/dubbo/demo/consumer/Consumer.java b/dubbo-demo/dubbo-demo-consumer/src/main/java/com/alibaba/dubbo/demo/consumer/Consumer.java index 9caacbc7ad7..66f72e86f36 100644 --- a/dubbo-demo/dubbo-demo-consumer/src/main/java/com/alibaba/dubbo/demo/consumer/Consumer.java +++ b/dubbo-demo/dubbo-demo-consumer/src/main/java/com/alibaba/dubbo/demo/consumer/Consumer.java @@ -38,8 +38,6 @@ public static void main(String[] args) { } catch (Throwable throwable) { throwable.printStackTrace(); } - - } } diff --git a/pom.xml b/pom.xml index 6e27cea90c4..f12a635924b 100644 --- a/pom.xml +++ b/pom.xml @@ -42,9 +42,9 @@ - https://github.com/cvictory/incubator-dubbo - scm:git:https://github.com/cvictory/incubator-dubbo.git - scm:git:https://github.com/cvictory/incubator-dubbo.git + https://github.com/apache/incubator-dubbo + scm:git:https://github.com/apache/incubator-dubbo.git + scm:git:https://github.com/apache/incubator-dubbo.git HEAD