Merge pull request #1 from apache/master

sync primary library

.codecov.yml

@@ -0,0 +1,11 @@
+coverage:
+  status:
+    # pull-requests only
+    patch:
+      default:
+        threshold: 0.1%
+ignore:
+  - "dubbo-demo/.*"
+  - "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
+
+### Steps 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 actually happens?
+
+If there is an exception, please attach the exception trace:
+
+```
+Just put your stack trace here!
+```

.gitignore

@@ -28,3 +28,4 @@ target/
 # system ignore
 .DS_Store
 Thumbs.db
+*.orig

.mvn/wrapper/maven-wrapper.properties

@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip

.travis.yml

@@ -2,10 +2,17 @@ language: java
 sudo: false # faster builds
 
 jdk:
-    - oraclejdk8
-    - openjdk7
+  - oraclejdk11
+  - oraclejdk8
 
-script: "mvn cobertura:cobertura"
+cache:
+  directories:
+    - $HOME/.m2
+
+install: true
+
+script:
+  - travis_wait 30 ./mvnw clean install -DskipTests=false -Dcheckstyle.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true
 
 after_success:
-  - bash <(curl -s https://codecov.io/bash)
+  - bash <(curl -s https://codecov.io/bash)

CHANGES.md

@@ -0,0 +1,15 @@
+# Release Notes
+
+## 2.6.2
+
+1. Hessian-lite serialization: revert locale serialization for compatibility, #1413
+2. Asset transfer to ASF, includeing pom, license, DISCLAIMER and so on, #1491
+3. Introduce of new dispatcher policy: EagerThreadpool, #1568
+4. Separate monitor data with group and version, #1407
+5. Spring Boot Enhancenment, #1611
+6. Gaceful shutdown enhancement
+   - Remove exporter destroy logic in AnnotationBean.
+   - 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).

CODE_OF_CONDUCT.md

@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

CONTRIBUTING.md

@@ -1,20 +1,33 @@
 
 ## 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.
 
-* Make sure all new .java files to have a simple Javadoc class comment with at least an @author tag identifying you, and a @date tag identifying birth, and preferably at least a paragraph on what the class is for.
+- [[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.
 
 * Add the ASF license header comment to all new .java files (copy from existing files in the project)
 
-* Add yourself as an @author to the .java files that you modify substantially (more than cosmetic changes).
+* Make sure no @author tag added to the file you contribute since @author tag is not used at Apache, other ways such as cvs will record all your contributions fairly.
 
 * Add some Javadocs and, if you change the namespace, some XSD doc elements.
 
@@ -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.

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 projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.

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, maintenance branch, only accept security vulnerability 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 variables, examples can be found [here](https://github.com/dubbo/dubbo-samples/tree/master/dubbo-samples-docker).

LICENSE

@@ -1,5 +1,4 @@
 
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -187,6 +186,7 @@
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
+
    Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
@@ -200,3 +200,32 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+
+Apache Dubbo Submodules:
+
+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
+ under a "Apache License 2.0" license, see https://github.com/netty/netty/blob/4.1/LICENSE.txt:
+
+ * io.netty.util.concurrent.FastThreadLocal
+ * io.netty.util.internal.InternalThreadLocalMap
+ * io.netty.util.Timer
+ * io.netty.util.TimerTask
+ * io.netty.util.Timeout
+ * io.netty.util.HashedWheelTimer
+