Revert "Merge master branch to 3.x dev branch (#3718)"

This reverts commit 897b80d.
apache · Mar 26, 2019 · 5f641a9 · 5f641a9
1 parent 897b80d
commit 5f641a9
Show file tree

Hide file tree

Showing 876 changed files with 13,907 additions and 29,913 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,7 @@ language: java
 sudo: false # faster builds
 
 jdk:
-  - openjdk11
   - oraclejdk11
-  - openjdk8
   - oraclejdk8
 
 cache:
@@ -18,6 +16,3 @@ script:
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
-
-after_failure:
-  - if [ -f dubbo.log ]; then echo "------TAIL of dubbo.log------"; tail -n 1000 dubbo.log; echo "------END of dubbo.log------"; fi
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,68 +1,61 @@
 # Release Notes
 
 ## 2.7.0
+环境要求：需要Java 8及以上版本支持
 
-Requirements: **Java 8+** required
+请在[这里]()了解关于升级2.7.x版本的注意事项和兼容性问题
 
-Please check [here](https://github.com/apache/incubator-dubbo/blob/2.7.0-release/CHANGES.md#upgrading-and-compatibility-notifications) for notes and possible compatibility issues for upgrading from 2.6.x or lower to 2.7.0.
+## New Features
 
-### New Features
+- 服务治理规则增强。
+  - 更丰富的服务治理规则，新增应用级别条件路由、Tag路由等
+  - 治理规则与注册中心解耦，增加对Apollo等第三方专业配置中心的支持，更易于扩展
+  -  新增应用级别的动态配置规则
+  -  规则体使用更易读、易用YAML格式
 
-- Enhancement of service governance rules.
-  - Enriched Routing Rules.
-    1. Conditional Routing. Supports both application-level and service-level conditions.
-    2. Tag Routing. Newly introduced to better support traffic isolation, such as grey deployment.
-  - Decoupling governance rules with the registry, making it easier to extend. Apollo and Zookeeper are available in this version. Nacos support is on the way...
-  - Application-level Dynamic Configuration support.
-  - Use YAML as the configuration language, which is more friendly to read and use.
+- 外部化配置。支持读取托管在远程的集中式配置中心的dubbo.properties，实现应用配置的集中式管控。
 
-- Externalized Configuration. Supports reading `dubbo.properties` hosted in remote centralized configuration center - centralized configuration.
+- 更精炼的注册中心URL，进一步减轻注册中心存储和同步压力，初步实现地址和配置的职责分离。
 
-- Simplified registry URL. With lower Registry memory use and less notification pressure from Service Directory, separates Configuration notification from Service Discovery.
+- 新增服务元数据中心，负责存储包括服务静态化配置、服务定义（如方法签名）等数据，默认提供Zookeeper, Redis支持。此功能也是OPS实现服务测试、Mock等治理能力的基础。
 
-- 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).
+- 异步编程模式增强（限定于Dubbo协议）
+  - 原生CompletableFuture<T>签名接口支持
+  - 服务端异步支持
+  - 异步Filter链
 
-- Asynchronous Programming Model (only works for Dubbo protocol now)
-  - Built-in support for the method with CompletableFuture<T> signature.
-  - Server-side asynchronous support, with an AsyncContext API works like Servlet 3.0.
-  - Asynchronous filter chain callback.
+- 新增Protobuf序列化协议扩展
 
-- Serialization Extension: Protobuf.
+- 新增ExpiringCache缓存策略扩展
 
-- Caching Policy Extension: Expiring Cache.
+## Enhancements / Bugfixes
 
-### Enhancements / Bugfixes
+- 负载均衡策略优化，包括ConsitentHash(#2190) 、LeastActive(#2171)、Random(#2597) 、RoundRobin(#2586) (#2650)
 
-- Load Balancing strategy enhancement: ConsitentHash #2190, LeastActive #2171, Random #2597, RoundRobin #2650.
+- 升级第三方依赖：默认通信框架为netty 4、默认ZK客户端为Curator、Jetty 9k
 
-- Third-party dependency upgrading.
-  - Switch default remoting to Netty 4.
-  - Switch default Zookeeper client to Curator.
-  - Upgrade Jetty to 9.x.
+- 增加地址读取时对IPV6的支持(#2079)
 
-- IPV6 support #2079.
+- 性能优化，链接关闭的情况下使得Consumer快速返回  (#2185)
 
-- Performance tuning, check hanging requests on a closed channel, make them return directly #2185.
+- 修复Jdk原生类型在kryo中的序列化问题 (#2178)
 
-- Fixed the serialization problem of JDK primitive types in Kryo #2178.
+- 修复Provider端反序列化失败后，没有及早通知Consumer端的问题 (#1903)
 
-- Fixed the problem of failing to notify Consumer as early as possible after the Provider side deserialization failed #1903.
 
-### Upgrading and Compatibility Notifications
+## 升级与兼容性
 
-We have always keep compatibility in mind during the whole process of 2.7.0. We even want old users to upgrade with only on pom version upgrade, but it's hard to achieve that, especially when considering that we have the package renamed in this version, so we had some tradeoffs. If you only used the Dubbo's most basic features, you may have little problems of upgrading, but if you have used some advanced features or have some SPI extensions inside, you'd better read the upgrade notifications carefully. The compatibility issues can be classified into the following 5 categories, for each part, there will have detailed dos and don'ts published later in the official website.
+此次版本发布我们遵循了保持和老版本兼容的原则，尤其是在一些可能会破坏2.7版本与低版本互操作性的问题上，我们增加了一些兼容性代码，典型如服务治理规则、Package重命名、注册URL简化等。
 
-1. Interoperability between 2.7.0 and lower versions
+1. Package重命名
 
-2. Package renaming
+com.alibaba.dubbo -> org.apache.dubbo
 
-   com.alibaba.dubbo -> org.apache.dubbo
+2. 注册URL简化
 
-3. Simplification of registered URLs
+3. 服务治理规则
 
-4. Service Governance Rules
-
-5. Configuration
+4. 配置
 
 
 ## 2.6.5

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -13,7 +13,7 @@ The mailing list is the recommended way for discussing almost anything that rela
 
 - [dev@dubbo.incubator.apache.org](mailto:dev-subscribe@dubbo.incubator.apache.org): the develop mailing list, you can ask question here if you have encountered any problem when using or developing Dubbo.
 - [commits@dubbo.incubator.apache.org](mailto:commits-subscribe@dubbo.incubator.apache.org): all the commits will be sent to this mailing list. You can subscribe to it if you are interested in Dubbo's development.
-- [notifications@dubbo.incubator.apache.org](mailto:notifications-subscribe@dubbo.incubator.apache.org): all the Github [issue](https://github.com/apache/incubator-dubbo/issues) updates and [pull request](https://github.com/apache/incubator-dubbo/pulls) updates will be sent to this mailing list.
+- [notification@dubbo.incubator.apache.org](mailto:notification-subscribe@dubbo.incubator.apache.org): all the Github [issue](https://github.com/apache/incubator-dubbo/issues) updates and [pull request](https://github.com/apache/incubator-dubbo/pulls) updates will be sent to this mailing list.
 
 ### Reporting issue
 

diff --git a/LICENSE b/LICENSE
@@ -208,6 +208,15 @@ Apache Dubbo includes a number of submodules with separate copyright notices
 and license terms. Your use of these submodules is subject to the terms and
 conditions of the following licenses.
 
+For the org.apache.dubbo.common.concurrent package:
+
+This product bundles and repackages the following code in Google Guava 16.0.1, which is available under a
+"Apache License 2.0" license. For details, see https://github.com/google/guava/blob/v16.0.1/COPYING.
+
+ * com.google.common.util.concurrent.ExecutionList
+ * com.google.common.util.concurrent.ListenableFuture
+ * com.google.common.util.concurrent.ListenableFutureTask
+
 For the package org.apache.dubbo.common.threadlocal and org.apache.dubbo.common.timer:
 
 This product contains a modified portion of 'Netty', an event-driven asynchronous network application framework also
@@ -220,8 +229,3 @@ 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
-
diff --git a/README.md b/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/org.apache.dubbo/dubbo.svg)
+![maven](https://img.shields.io/maven-central/v/com.alibaba/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")
@@ -29,26 +29,26 @@ We are now collecting dubbo user info in order to help us to improve Dubbo bette
 
 ## Getting started
 
-The following code snippet comes from [Dubbo Samples](https://github.com/apache/incubator-dubbo-samples/tree/master/dubbo-samples-api). You may clone the sample project and step into `dubbo-samples-api` sub directory before read on.
+The following code snippet comes from [Dubbo Samples](https://github.com/dubbo/dubbo-samples/tree/master/dubbo-samples-api). You may clone the sample project and step into `dubbo-samples-api` sub directory before read on.
 
 ```bash
-# git clone https://github.com/apache/incubator-dubbo-samples.git
-# cd incubator-dubbo-samples/dubbo-samples-api
+# git clone https://github.com/dubbo/dubbo-samples.git
+# cd dubbo-samples/dubbo-samples-api
 ```
 
-There's a [README](https://github.com/apache/incubator-dubbo-samples/tree/master/dubbo-samples-api/README.md) file under `dubbo-samples-api` directory. Read it and try this sample out by following the instructions.
+There's a [README](https://github.com/dubbo/dubbo-samples/blob/master/dubbo-samples-api/README.md) file under `dubbo-samples-api` directory. Read it and try this sample out by following the instructions.
 
 ### Maven dependency
 
 ```xml
 <properties>
-    <dubbo.version>2.7.0</dubbo.version>
+    <dubbo.version>2.6.5</dubbo.version>
 </properties>
 
 <dependencyManagement>
     <dependencies>
         <dependency>
-            <groupId>org.apache.dubbo</groupId>
+            <groupId>com.alibaba</groupId>
             <artifactId>dubbo-dependencies-bom</artifactId>
             <version>${dubbo.version}</version>
             <type>pom</type>
@@ -59,47 +59,35 @@ There's a [README](https://github.com/apache/incubator-dubbo-samples/tree/master
 
 <dependencies>
     <dependency>
-        <groupId>org.apache.dubbo</groupId>
+        <groupId>com.alibaba</groupId>
         <artifactId>dubbo</artifactId>
         <version>${dubbo.version}</version>
     </dependency>
     <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-all</artifactId>
     </dependency>
-    <dependency>
-        <groupId>org.apache.curator</groupId>
-        <artifactId>curator-framework</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.curator</groupId>
-        <artifactId>curator-recipes</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.zookeeper</groupId>
-        <artifactId>zookeeper</artifactId>
-    </dependency>
 </dependencies>
 ```
 
 ### Define service interfaces
 
 ```java
-package org.apache.dubbo.samples.api;
+package org.apache.dubbo.demo.api;
 
 public interface GreetingService {
     String sayHello(String name);
 }
 ```
 
-*See [api/GreetingService.java](https://github.com/apache/incubator-dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/api/GreetingsService.java) on GitHub.*
+*See [api/GreetingService.java](https://github.com/dubbo/dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/api/GreetingsService.java) on GitHub.*
 
 ### Implement service interface for the provider
 
 ```java
-package org.apache.dubbo.samples.provider;
+package org.apache.dubbo.demo.provider;
 
-import org.apache.dubbo.samples.api.GreetingService;
+import org.apache.dubbo.demo.GreetingService;
 
 public class GreetingServiceImpl implements GreetingService {
     public String sayHello(String name) {
@@ -108,17 +96,17 @@ public class GreetingServiceImpl implements GreetingService {
 }
 ```
 
-*See [provider/GreetingServiceImpl.java](https://github.com/apache/incubator-dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/provider/GreetingsServiceImpl.java) on GitHub.*
+*See [provider/GreetingServiceImpl.java](https://github.com/dubbo/dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/provider/GreetingsServiceImpl.java) on GitHub.*
 
 ### Start service provider
 
 ```java
 package org.apache.dubbo.demo.provider;
 
-import org.apache.dubbo.config.ApplicationConfig;
-import org.apache.dubbo.config.RegistryConfig;
-import org.apache.dubbo.config.ServiceConfig;
-import org.apache.dubbo.samples.api.GreetingService;
+import com.alibaba.dubbo.config.ApplicationConfig;
+import com.alibaba.dubbo.config.RegistryConfig;
+import com.alibaba.dubbo.config.ServiceConfig;
+import org.apache.dubbo.demo.GreetingService;
 
 import java.io.IOException;
 
@@ -136,7 +124,7 @@ public class Application {
 }
 ```
 
-*See [provider/Application.java](https://github.com/apache/incubator-dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/provider/Application.java) on GitHub.*
+*See [provider/Application.java](https://github.com/dubbo/dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/provider/Application.java) on GitHub.*
 
 ### Build and run the provider
 
@@ -150,10 +138,10 @@ public class Application {
 ```java
 package org.apache.dubbo.demo.consumer;
 
-import org.apache.dubbo.config.ApplicationConfig;
-import org.apache.dubbo.config.ReferenceConfig;
-import org.apache.dubbo.config.RegistryConfig;
-import org.apache.dubbo.samples.api.GreetingService;
+import com.alibaba.dubbo.config.ApplicationConfig;
+import com.alibaba.dubbo.config.ReferenceConfig;
+import com.alibaba.dubbo.config.RegistryConfig;
+import org.apache.dubbo.demo.GreetingService;
 
 public class Application {
     public static void main(String[] args) {
@@ -176,7 +164,7 @@ public class Application {
 
 The consumer will print out `Hello world` on the screen.
 
-*See [consumer/Application.java](https://github.com/apache/incubator-dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/consumer/Application.java) on GitHub.*
+*See [consumer/Application.java](https://github.com/dubbo/dubbo-samples/blob/master/dubbo-samples-api/src/main/java/org/apache/dubbo/samples/consumer/Application.java) on GitHub.*
 
 ### Next steps
 
@@ -209,7 +197,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-admin/dubbo-monitor](https://github.com/apache/incubator-dubbo-admin).
+* Improve the [dubbo-ops/dubbo-monitor](https://github.com/apache/incubator-dubbo-ops).
 * 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!
@@ -220,22 +208,21 @@ Please follow the [template](https://github.com/apache/incubator-dubbo/issues/ne
 
 ## Reporting a security vulnerability
 
-Please report security vulnerability to [us](mailto:security@dubbo.incubator.apache.org) privately.
+Please report security vulnerability to [us](security@dubbo.incubator.apache.org) privately.
 
-## Dubbo ecosystem
+## Dubbo eco system
 
 * [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 Samples](https://github.com/dubbo/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 Admin](https://github.com/apache/incubator-dubbo-admin) - The reference implementation for Dubbo admin
+* [Dubbo OPS](https://github.com/apache/incubator-dubbo-ops) - 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
 

diff --git a/codestyle/checkstyle.xml b/codestyle/checkstyle.xml
@@ -20,7 +20,6 @@
         <module name="NoLineWrap"/>
         <module name="OuterTypeFilename"/>
         <module name="UnusedImports"/>
-        <module name="RedundantImport"/>
 
         <!--<module name="CustomImportOrder">-->
         <!--<property name="specialImportsRegExp" value="org.apache.dubbo.*"/>-->