Merge branch 'master' of github.com:apache/incubator-dubbo

.travis.yml

@@ -2,7 +2,9 @@ language: java
 sudo: false # faster builds
 
 jdk:
+  - openjdk11
   - oraclejdk11
+  - openjdk8
   - oraclejdk8
 
 cache:

CHANGES.md

@@ -1,5 +1,86 @@
 # Release Notes
 
+## 2.7.1
+
+### Notice
+
+'zkclient' extension for 'org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter' is removed from Dubbo 2.7.1, and 'curator' extension becomes the default extension. If you happen to config your application to use 'zkclient' explicitly, pls. switch to use 'curator' instead.
+
+### New Features
+
+- service register support on nacos [#3582](https://github.com/apache/incubator-dubbo/issues/3582)
+- support consul as registry center, config center and metadata center [#983](https://github.com/apache/incubator-dubbo/issues/983)
+- service registry support/config center support on etcd [#808](https://github.com/apache/incubator-dubbo/issues/808)
+- metrics support in dubbo 2.7.1 [#3598](https://github.com/apache/incubator-dubbo/issues/3598)
+- @Argument @Method support [#2405](https://github.com/apache/incubator-dubbo/issues/2045)
+
+### Enhancement
+
+- [Enhancement] @EnableDubboConfigBinding annotates @Repeatable [#1770](https://github.com/apache/incubator-dubbo/issues/1770)
+- [Enhancement] Change the default behavior of @EnableDubboConfig.multiple() [#3193](https://github.com/apache/incubator-dubbo/issues/3193)
+- Should make annotation easier to use in multiple items circumstance [#3039](https://github.com/apache/incubator-dubbo/issues/3039)
+- NoSuchMethodError are thrown when add custom Filter using dubbo2.6.5 and JDK1.6 and upgrade to dubbo2.7.0 [#3570](https://github.com/apache/incubator-dubbo/issues/3570)
+- introduce dubbo-dependencies-zookeeper [#3607](https://github.com/apache/incubator-dubbo/pull/3607)
+- Zookeeper ConfigCenter reuse the client abstraction and connection session [#3288](https://github.com/apache/incubator-dubbo/issues/3288)
+- [Survey] Is it necessary to continue to maintain zkclient in dubbo project? [#3569](https://github.com/apache/incubator-dubbo/issues/3569)
+- Start to use IdleStateHandler in Netty4 [#3341](https://github.com/apache/incubator-dubbo/pull/3341)
+- Support multiple shared links [#2457](https://github.com/apache/incubator-dubbo/pull/2457)
+- Optimize heartbeat [#3299](https://github.com/apache/incubator-dubbo/pull/3299)
+- AccessLogFilter simple date format reduce instance creation [#3026](https://github.com/apache/incubator-dubbo/issues/3026)
+- Support wildcard ip for tag router rule. [#3289](https://github.com/apache/incubator-dubbo/issues/3289)
+- ScriptRouter should cache CompiledScript [#390](https://github.com/apache/incubator-dubbo/issues/390)
+- Optimize compareTo in Router to guarantee consistent behaviour. [#3302](https://github.com/apache/incubator-dubbo/issues/3302)
+- RMI protocol doesn't support generic invocation [#2779](https://github.com/apache/incubator-dubbo/issues/2779)
+- a more elegant way to enhance HashedWheelTimer [#3567](https://github.com/apache/incubator-dubbo/pull/3567)
+- obtain local address incorrectly sometimes in dubbo [#538](https://github.com/apache/incubator-dubbo/issues/538)
+- implement pull request #3412 on master branch [#3418](https://github.com/apache/incubator-dubbo/pull/3418)
+- enhancement for event of response (follow up for pull request #3043) [#3244](https://github.com/apache/incubator-dubbo/issues/3244)
+- bump up hessian-lite version #3423 [#3513](https://github.com/apache/incubator-dubbo/pull/3513)
+- [Dubbo-3610]make snakeyaml transitive, should we do this? [#3659](https://github.com/apache/incubator-dubbo/pull/3659)
+
+### Bugfixes
+
+- cannot register REST service in 2.7 due to the changes in RestProtoco#getContextPath [#3445](https://github.com/apache/incubator-dubbo/issues/3445)
+- Conflict between curator client and dubbo [#3574](https://github.com/apache/incubator-dubbo/issues/3574)
+- is there a problem in NettyBackedChannelBuffer.setBytes(...)? [#2619](https://github.com/apache/incubator-dubbo/issues/2619)
+- [Dubbo - client always reconnect offline provider] Dubbo client bug [#3158](https://github.com/apache/incubator-dubbo/issues/3158)
+- fix heartbeat internal [#3579](https://github.com/apache/incubator-dubbo/pull/3579)
+- logic issue in RedisRegistry leads to services cannot be discovered. [#3291](https://github.com/apache/incubator-dubbo/pull/3291)
+- Multicast demo fails with message "Can't assign requested address" [#2423](https://github.com/apache/incubator-dubbo/issues/2423)
+- Fix thrift protocol, use path to locate exporter. [#3331](https://github.com/apache/incubator-dubbo/pull/3331)
+- cannot use override to modify provider's configuration when hessian protocol is used [#900](https://github.com/apache/incubator-dubbo/issues/900)
+- Condition is not properly used ? [#1917](https://github.com/apache/incubator-dubbo/issues/1917)
+- connectionMonitor in RestProtocol seems not work [#3237](https://github.com/apache/incubator-dubbo/issues/3237)
+- fail to parse config text with white space [#3367](https://github.com/apache/incubator-dubbo/issues/3367)
+- @Reference check=false doesn't take effect [#195](https://github.com/apache/incubator-dubbo/issues/195)
+- [Issue] SpringStatusChecker execute errors on non-XML Spring configuration [#3615](https://github.com/apache/incubator-dubbo/issues/3615)
+- monitor's cluster config is set to failsafe and set to failsafe only [#274](https://github.com/apache/incubator-dubbo/issues/274)
+- A question for ReferenceConfigCache. [#1293](https://github.com/apache/incubator-dubbo/issues/1293)
+- referenceconfig#destroy never invoke unregister [#3294](https://github.com/apache/incubator-dubbo/issues/3294)
+- Fix when qos is disable,log will print every time [#3397](https://github.com/apache/incubator-dubbo/pull/3397)
+- service group is not supported in generic direct invocation [#3555](https://github.com/apache/incubator-dubbo/issues/3555)
+- setOnreturn doesn't take effect in async generic invocation [#208](https://github.com/apache/incubator-dubbo/issues/208)
+- Fix timeout filter not work in async way [#3174](https://github.com/apache/incubator-dubbo/pull/3174)
+- java.lang.NumberFormatException: For input string: "" [#3069](https://github.com/apache/incubator-dubbo/issues/3069)
+- NPE occurred when the configuration was deleted [#3533](https://github.com/apache/incubator-dubbo/issues/3533)
+- NPE when package of interface is empty [#3556](https://github.com/apache/incubator-dubbo/issues/3556)
+- NPE when exporting rest service using a given path. [#3477](https://github.com/apache/incubator-dubbo/issues/3477)
+- NullPointerException happened when using SpringContainer.getContext() [#3476](https://github.com/apache/incubator-dubbo/issues/3476)
+- Why does not tomcat throw an exception when `server.start` failed with a socket binding error.  [#3236](https://github.com/apache/incubator-dubbo/issues/3236)
+- No such extension org.apache.dubbo.metadata.store.MetadataReportFactory by name redis [#3514](https://github.com/apache/incubator-dubbo/issues/3514)
+- dubbo 2.7.1-SNAPSHOT NoClassDefFoundError when use springboot [#3426](https://github.com/apache/incubator-dubbo/issues/3426)
+- NPE occurs when use @Reference in junit in spring boot application [#3429](https://github.com/apache/incubator-dubbo/issues/3429)
+- When refer the same service with more than one @References(with different configs) on consumer side, only one take effect [#1306](https://github.com/apache/incubator-dubbo/issues/1306)
+- consumer always catch java.lang.reflect.UndeclaredThrowableException for the exception thrown from provider [#3386](https://github.com/apache/incubator-dubbo/issues/3386)
+- dubbo2.7.0 com.alibaba.com.caucho.hessian.io.HessianProtocolException: 'com.alibaba.dubbo.common.URL' could not be instantiated [#3342](https://github.com/apache/incubator-dubbo/issues/3342)
+- Close Resources Properly [#3473](https://github.com/apache/incubator-dubbo/issues/3473)
+- SPI entires dup by 3 times. [#2842](https://github.com/apache/incubator-dubbo/issues/2842)
+- provider gets wrong interface name from attachment when use generic invocation in 2.6.3 [#2981](https://github.com/apache/incubator-dubbo/issues/2981)
+- HashedWheelTimer's queue gets full [#3449](https://github.com/apache/incubator-dubbo/issues/3449)
+- Modify MetadataReportRetry ThreadName [#3550](https://github.com/apache/incubator-dubbo/pull/3550)
+- Keep interface key in the URL in simplify mode when it's different from path. [#3478](https://github.com/apache/incubator-dubbo/issues/3478)
+- nc is not stable in dubbo's bootstrap script [#936](https://github.com/apache/incubator-dubbo/issues/936)
+
 ## 2.7.0
 
 Requirements: **Java 8+** required
@@ -20,7 +101,7 @@ Please check [here](https://github.com/apache/incubator-dubbo/blob/2.7.0-release
 
 - Simplified registry URL. With lower Registry memory use and less notification pressure from Service Directory, separates Configuration notification from Service Discovery.
 
-- Metadata Center. A totally new concept since 2.7.0,  used to store service metadata including static configuration, service definition, method signature, etc.. By default, Zookeeper and Redis are supported as the backend storage. Will work as the basis of service testing, mock and other service governance features going to be supported in OPS.
+- Metadata Center. A totally new concept since 2.7.0,  used to store service metadata including static configuration, service definition, method signature, etc.. By default, Zookeeper and Redis are supported as the backend storage. Will work as the basis of service testing, mock and other service governance features going to be supported in [Dubbo-Admin](https://github.com/apache/incubator-dubbo-admin).
 
 - Asynchronous Programming Model (only works for Dubbo protocol now)
   - Built-in support for the method with CompletableFuture<T> signature.
@@ -64,6 +145,32 @@ We have always keep compatibility in mind during the whole process of 2.7.0. We
 
 5. Configuration
 
+## 2.6.6
+
+Enhancement / New feature：
+
+* tag route.  #3065 
+* Use Netty4 as default Netty version. #3029 
+* upporting Java 8 Date/Time type when serializing with Kryo #3519 
+* supoort config telnet  #3511
+* add annotation driven in MethodConfig and ArgumentConfig #2603
+* add nacos-registry module #3296  
+* add `protocol` attribute in `@Rerefence` #3555 
+*support the hierarchical interface in @Service  #3251  
+* change the default behavior in `@EnableDubboConfig.multiple()` #3193 
+* inline source code of `spring-context-support` #3192 
+* Simplify externalized configuration of Dubbo Protocol name  #3189 
+
+BugFix：
+
+* update hessian-lite to 2.3.5, fix unnecessary class load #3538 
+* Fix unregister when client destroyed（referenceconfig#destroy) #3502 
+* SPI entires dup by 3 times #3315 
+* fix Consumer throws RpcException after RegistryDirectory notify in high QPS #2016 
+* fix NPE in @Reference when using Junit to test dubbo service #3429 
+* fix consuer always catch java.lang.reflect.UndeclaredThrowableException for any exception throws in provider  #3386 
+* fix the priority of `DubboConfigConfigurationSelector ` #2897 
+* fix `@Rerefence#parameters()` not work #2301 
 
 ## 2.6.5
 

LICENSE

@@ -220,3 +220,8 @@ This product contains a modified portion of 'Netty', an event-driven asynchronou
  * io.netty.util.Timeout
  * io.netty.util.HashedWheelTimer
 
+For the org.apache.dubbo.common.utils.CIDRUtils :
+
+This product contains a modified portion of 'edazdarevic.commons.net.CIDRUtils',
+ under a "MIT License" license, see https://github.com/edazdarevic/CIDRUtils/blob/master/CIDRUtils.java
+

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/apache/incubator-dubbo.svg?branch=master)](https://travis-ci.org/apache/incubator-dubbo)
 [![codecov](https://codecov.io/gh/apache/incubator-dubbo/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/incubator-dubbo)
-![maven](https://img.shields.io/maven-central/v/com.alibaba/dubbo.svg)
+![maven](https://img.shields.io/maven-central/v/org.apache.dubbo/dubbo.svg)
 ![license](https://img.shields.io/github/license/alibaba/dubbo.svg)
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/apache/incubator-dubbo.svg)](http://isitmaintained.com/project/apache/incubator-dubbo "Average time to resolve an issue")
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/apache/incubator-dubbo.svg)](http://isitmaintained.com/project/apache/incubator-dubbo "Percentage of issues still open")
@@ -42,30 +42,19 @@ There's a [README](https://github.com/apache/incubator-dubbo-samples/tree/master
 
 ```xml
 <properties>
-    <dubbo.version>2.7.0</dubbo.version>
+    <dubbo.version>2.7.1</dubbo.version>
 </properties>
 
-<dependencyManagement>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-dependencies-bom</artifactId>
-            <version>${dubbo.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
-    </dependencies>
-</dependencyManagement>
-
 <dependencies>
     <dependency>
         <groupId>org.apache.dubbo</groupId>
-        <artifactId>dubbo-parent</artifactId>
+        <artifactId>dubbo</artifactId>
         <version>${dubbo.version}</version>
     </dependency>
     <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-all</artifactId>
+        <groupId>org.apache.dubbo</groupId>
+        <artifactId>dubbo-dependencies-zookeeper</artifactId>
+        <version>${dubbo.version}</version>
     </dependency>
 </dependencies>
 ```
@@ -90,6 +79,7 @@ package org.apache.dubbo.samples.provider;
 import org.apache.dubbo.samples.api.GreetingService;
 
 public class GreetingServiceImpl implements GreetingService {
+    @Override
     public String sayHello(String name) {
         return "Hello " + name;
     }
@@ -173,6 +163,14 @@ The consumer will print out `Hello world` on the screen.
 * [Dubbo developer guide](http://dubbo.apache.org/en-us/docs/dev/build.html) - How to involve in Dubbo development.
 * [Dubbo admin manual](http://dubbo.apache.org/en-us/docs/admin/install/provider-demo.html) - How to admin and manage Dubbo services.
 
+## Building
+
+If you want to try out the cutting-edge features, you can built with the following commands. (Java 1.8 is required to build the master branch)
+
+```
+  mvn clean install
+```
+
 ## Contact
 
 * Mailing list: 
@@ -197,7 +195,7 @@ See [CONTRIBUTING](https://github.com/apache/incubator-dubbo/blob/master/CONTRI
   * blog post
   * translation on documentation
   * use cases about how Dubbo is being used in enterprise system.
-* Improve the [dubbo-ops/dubbo-monitor](https://github.com/apache/incubator-dubbo-ops).
+* Improve the [dubbo-admin/dubbo-monitor](https://github.com/apache/incubator-dubbo-admin).
 * Contribute to the projects listed in [ecosystem](https://github.com/dubbo).
 * Any form of contribution that is not mentioned above.
 * If you would like to contribute, please send an email to dev@dubbo.incubator.apache.org to let us know!
@@ -208,21 +206,22 @@ Please follow the [template](https://github.com/apache/incubator-dubbo/issues/ne
 
 ## Reporting a security vulnerability
 
-Please report security vulnerability to [us](security@dubbo.incubator.apache.org) privately.
+Please report security vulnerability to [us](mailto:security@dubbo.incubator.apache.org) privately.
 
 ## Dubbo ecosystem
 
 * [Dubbo Ecosystem Entry](https://github.com/dubbo) - A GitHub group `dubbo` to gather all Dubbo relevant projects not appropriate in [apache](https://github.com/apache) group yet
 * [Dubbo Website](https://github.com/apache/incubator-dubbo-website) - Apache Dubbo (incubating) official website
 * [Dubbo Samples](https://github.com/apache/incubator-dubbo-samples) - samples for Apache Dubbo (incubating)
 * [Dubbo Spring Boot](https://github.com/apache/incubator-dubbo-spring-boot-project) - Spring Boot Project for Dubbo
-* [Dubbo OPS](https://github.com/apache/incubator-dubbo-ops) - The reference implementation for Dubbo admin
+* [Dubbo Admin](https://github.com/apache/incubator-dubbo-admin) - The reference implementation for Dubbo admin
 
 #### Language
 
 * [Node.js](https://github.com/dubbo/dubbo2.js)
 * [Python](https://github.com/dubbo/dubbo-client-py)
 * [PHP](https://github.com/dubbo/dubbo-php-framework)
+* [Go](https://github.com/dubbo/dubbo-go)
 
 ## License