Merge remote-tracking branch 'upstream/master' into 2.7.x

.codecov.yml

@@ -6,5 +6,6 @@ coverage:
         threshold: 0.1%
 ignore:
   - "dubbo-demo/.*"
-  - "dubbo-common/src/main/java/com/alibaba/dubbo/common/json/*.java" #  internal JSON impl is deprecate, ignore test coverage for them
-  - "dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/AnnotationBean.java" # Deprecated
+  - "dubbo-common/src/main/java/org/apache/dubbo/common/json/*.java" #  internal JSON impl is deprecate, ignore test coverage for them
+  - "dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/AnnotationBean.java" # Deprecated
+  - "dubbo-rpc/dubbo-rpc-thrift/.*"

.github/ISSUE_TEMPLATE/dubbo-issue-report-template.md

@@ -0,0 +1,36 @@
+---
+name: Dubbo issue report template
+about: If you would like to report a issue to Dubbo, please use this template.
+
+---
+
+- [ ] I have searched the [issues](https://github.com/apache/incubator-dubbo/issues) of this repository and believe that this is not a duplicate.
+- [ ] I have checked the [FAQ](https://github.com/apache/incubator-dubbo/blob/master/FAQ.md) of this repository and believe that this is not a duplicate.
+
+### Environment
+
+* Dubbo version: xxx
+* Operating System version: xxx
+* Java version: xxx
+
+### Step to reproduce this issue
+
+1. xxx
+2. xxx
+3. xxx
+
+Pls. provide [GitHub address] to reproduce this issue.
+
+### Expected Result
+
+What do you expected from the above steps？
+
+### Actual Result
+
+What is actually happen?
+
+If there is an exception, please attach the exception trace:
+
+```
+Just put your stack trace here!
+```

CONTRIBUTING.md

@@ -1,14 +1,27 @@
 
 ## Contributing to dubbo
 Dubbo is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below.
+
 ### Sign the Contributor License Agreement
 Before we accept a non-trivial patch or pull request we will need you to sign the Contributor License Agreement. Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. Active contributors might be asked to join the core team, and given the ability to merge pull requests.
-### Code Conventions
-Our code style is almost in line with the standard java conventions(Popular IDE's default setting satisfy this), only changed the following two restricts:  
-1. Classes under 'com.alibaba.*' and 'com.taobao.*' package are grouped separately, and put on top of all other 'imports'.  
-2. If there are more than 120 characters in current line, start a new line.
 
-We provide a template file [dubbo_codestyle_for_idea.xml](https://github.com/alibaba/dubbo/tree/master/codestyle/dubbo_codestyle_for_idea.xml) for IntelliJ idea, you can import it to you IDE. If you use Eclipse you can config manually by referencing the same file.  
+### Contact
+
+#### Mailing list
+
+The mailing list is the recommended way for discussing almost anything that related to Dubbo. Please refer to this [guide](https://github.com/apache/incubator-dubbo/wiki/Mailing-list-subscription-guide) for detailed documentation on how to subscribe.
+
+- [[email protected]](mailto:[email protected]): the develop mailing list, you can ask question here if you have encountered any problem when using or developing Dubbo.
+- [[email protected]](mailto:[email protected]): all the commits will be sent to this mailing list. You can subscribe to it if you are interested in Dubbo's development.
+- [[email protected]](mailto:[email protected]): 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
+
+Please follow the [template](https://github.com/apache/incubator-dubbo/issues/new?template=dubbo-issue-report-template.md) for reporting any issues.
+
+### Code Conventions
+Our code style is almost in line with the standard java conventions (Popular IDE's default setting satisfy this), with the following additional restricts:  
+* If there are more than 120 characters in current line, start a new line.
 
 * Make sure all new .java files to have a simple Javadoc class comment with at least a @date tag identifying birth, and preferably at least a paragraph on what the class is for.
 
@@ -23,3 +36,31 @@ We provide a template file [dubbo_codestyle_for_idea.xml](https://github.com/ali
 * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project).
 
 * When writing a commit message please follow these conventions, if you are fixing an existing issue please add Fixes #XXX at the end of the commit message (where XXX is the issue number).
+
+### Contribution flow
+
+This is a rough outline of what a contributor's workflow looks like:
+
+* Fork the current repository
+* Create a topic branch from where to base the contribution. This is usually master.
+* Make commits of logical units.
+* Make sure commit messages are in the proper format (see below).
+* Push changes in a topic branch to your forked repository.
+* Follow the checklist in the [pull request template](https://github.com/apache/incubator-dubbo/blob/master/PULL_REQUEST_TEMPLATE.md)
+* Before you sending out the pull request, please sync your forked repository with remote repository, this will make your pull request simple and clear. See guide below:
+```
+git remote add upstream [email protected]:apache/incubator-dubbo.git
+git fetch upstream
+git rebase upstream/master
+git checkout -b your_awesome_patch
+... add some work
+git push origin your_awesome_patch
+```
+* Submit a pull request to apache/incubator-dubbo and wait for the reply.
+
+Thanks for contributing!
+
+### Code style
+
+We provide a template file [dubbo_codestyle_for_idea.xml](https://github.com/apache/incubator-dubbo/tree/master/codestyle/dubbo_codestyle_for_idea.xml) for IntelliJ idea, you can import it to you IDE. 
+If you use Eclipse you can config manually by referencing the same file.

FAQ.md

@@ -0,0 +1,25 @@
+### Where is dubbo-admin?
+
+dubbo-admin has been moved from core repository to https://github.com/apache/incubator-dubbo-ops since 2.6.1
+
+### Which version should I choose?
+
+Currently, dubbo keeps 3 versions evolve in parallel:
+
+* 2.7.x (master): requires Java 1.8, major feature branch
+
+* 2.6.x: requires Java 1.6, minor feature & bugfix branch, GA, production ready.
+
+* 2.5.x: requires Java 1.6, maintainance branch, only accept security vulnerbility and critical bugfix, expected to be EOL soon
+
+check [this](https://github.com/apache/incubator-dubbo/issues/1208) for detailed version management plan.
+
+For contributors, please make sure all changes on the right branch, that is, most of the pull request should go to 2.7.x, and be backported to 2.6.x and 2.5.x if necessary. If the fix is specific to a branch, please make sure your pull request goes to the right branch.
+
+For committers, make sure select the right label and target branch for every PR, and don't forget to back port the fix to lower version is necessary.
+
+####  How to register ip correctly in docker?  
+
+[Example question](https://github.com/alibaba/dubbo/issues/742)  
+
+Dubbo support to specify ip/port via system environment varialbles, examples can be found [here](https://github.com/dubbo/dubbo-samples/tree/master/dubbo-samples-docker).

LICENSE

@@ -208,55 +208,7 @@ 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 hessian-lite submodule:
-
-The Apache Software License, Version 1.1
-
- Copyright (c) 2001-2004 Caucho Technology, Inc.  All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
- 3. The end-user documentation included with the redistribution, if
-    any, must include the following acknowlegement:
-       "This product includes software developed by the
-        Caucho Technology (http://www.caucho.com/)."
-    Alternately, this acknowlegement may appear in the software itself,
-    if and wherever such third-party acknowlegements normally appear.
-
- 4. The names "Hessian", "Resin", and "Caucho" must not be used to
-    endorse or promote products derived from this software without prior
-    written permission. For written permission, please contact
-    [email protected].
-
- 5. Products derived from this software may not be called "Resin"
-    nor may "Resin" appear in their names without prior written
-    permission of Caucho Technology.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN NO EVENT SHALL CAUCHO TECHNOLOGY OR ITS CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-For the com.alibaba.dubbo.common.concurrent package:
+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.
@@ -265,7 +217,7 @@ This product bundles and repackages the following code in Google Guava 16.0.1, w
  * com.google.common.util.concurrent.ListenableFuture
  * com.google.common.util.concurrent.ListenableFutureTask
 
-For the package com.alibaba.dubbo.common.threadlocal:
+For the package org.apache.dubbo.common.threadlocal:
 
 This product contains a modified portion of 'Netty', an event-driven asynchronous network application framework also
  under a "Apache License 2.0" license, see https://github.com/netty/netty/blob/4.1/LICENSE.txt:

PULL_REQUEST_TEMPLATE.md

@@ -15,6 +15,6 @@ Follow this checklist to help us incorporate your contribution quickly and easil
 - [x] Make sure there is a [GITHUB_issue](https://github.com/apache/incubator-dubbo/issues) filed for the change (usually before you start working on it). Trivial changes like typos do not require a GITHUB issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
 - [ ] Format the pull request title like `[Dubbo-XXX] Fix UnknownException when host config not exist #XXX`. Each commit in the pull request should have a meaningful subject line and body.
 - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
-- [ ] Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in [test module](https://github.com/alibaba/dubbo/tree/master/dubbo-test).
+- [ ] Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in [test module](https://github.com/apache/incubator-dubbo/tree/master/dubbo-test).
 - [ ] Run `mvn clean install -DskipTests` & `mvn clean test-compile failsafe:integration-test` to make sure unit-test and integration-test pass.
 - [ ] If this contribution is large, please follow the [Software Donation Guide](https://github.com/apache/incubator-dubbo/wiki/Software-donation-guide).