Merge branch '2.6.3-release' into 2.6.x

# Conflicts:
#	all/pom.xml
#	distribution/pom.xml
#	dubbo-common/pom.xml
#	dubbo-serialization/dubbo-serialization-api/pom.xml
#	dubbo-serialization/dubbo-serialization-hessian2/pom.xml
#	dubbo-serialization/dubbo-serialization-jdk/pom.xml
#	dubbo-test/pom.xml

Author: chickenlj

CHANGES.md

@@ -1,15 +1,61 @@
 # Release Notes
 
+## 2.6.3
+Enhancements / Features
+
+- Support implicit delivery of attachments from provider to consumer, #889
+- Support inject Spring bean to SPI by bean type, #1837
+- Add generic invoke and attachments support for http&hessian protocol, #1827
+- Get the real methodname to support consistenthash for generic invoke, #1872
+- Remove validation key from provider url on Consumer side, config depedently, #1386
+- Introducing the Bootstrap module as a unified entry for Dubbo startup and resource destruction, #1820
+- Open TCP_NODELAY on Netty 3, #1746
+- Support specify proxy type on provider side, #1873
+- Support dbindex in redis, #1831
+- Upgrade tomcat to 8.5.31, #1781
+
+Bugfixes
+
+- ExecutionDispatcher meet with user docs, #1089
+- Remove side effects of Dubbo custom loggers on Netty logger, #1717
+- Fix isShutdown() judge of Dubbo biz threadpool always return true, #1426
+- Selection of invoker node under the critical condition of only two nodes, #1759
+- Listener cann't be removed during unsubscribe when use ZK as registry, #1792
+- URL parsing problem when user filed contains '@',  #1808
+- Check null in CacheFilter to avoid NPE, #1828
+- Fix potential deadlock in DubboProtocol, #1836
+- Restore the bug that attachment has not been updated in the RpcContext when the Dubbo built-in retry mechanism is triggered, #1453
+- Some other small bugfixes
+
+Performance Tuning
+
+- ChannelState branch prediction optimization. #1643
+- Optimize AtomicPositiveInteger, less memory and compute cost, #348
+- Introduce embedded Threadlocal to replace the JDK implementation, #1745
+
+Hessian-lite
+
+- Hessian deserialization optimization, #1705
+- Support Locale type, #1761
+
+Compatibilities  
+This release is compatible with other versions since 2.5.3, and you can upgrade smoothly.
+- The RPC protocol version has been upgraded from 2.0.1 to 2.0.2, to support attachments delivery in #889, 
+generally, the protocol version is used internally, so it should have no side effects on users.
+
+Issues and Pull Requests, check [milestone-2.6.3](https://github.com/apache/incubator-dubbo/milestone/17).
+
+
 ## 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
+2. Asset transfer to ASF, including 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
+6. Graceful 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).
+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 dev@dubbo.apache.org. 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 private@dubbo.apache.org. 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.
 

LICENSE

@@ -208,54 +208,6 @@ 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
-    info@caucho.com.
-
- 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:
 
 This product bundles and repackages the following code in Google Guava 16.0.1, which is available under a

all/pom.xml

@@ -19,16 +19,17 @@
     <parent>
         <groupId>com.alibaba</groupId>
         <artifactId>dubbo-parent</artifactId>
-        <version>2.6.3-SNAPSHOT</version>
+        <version>2.6.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dubbo</artifactId>
-    <version>2.6.3-SNAPSHOT</version>
+    <version>2.6.3</version>
     <packaging>jar</packaging>
     <name>dubbo-all</name>
     <description>The all in one project of dubbo</description>
     <properties>
         <skip_maven_deploy>false</skip_maven_deploy>
+        <hessian_lite_version>3.2.4</hessian_lite_version>
     </properties>
     <dependencies>
         <dependency>

bom/pom.xml

@@ -3,7 +3,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <properties>
-        <hessian_lite_version>3.2.3</hessian_lite_version>
+        <hessian_lite_version>3.2.4</hessian_lite_version>
     </properties>
 
     <parent>
@@ -14,7 +14,7 @@
 
     <groupId>com.alibaba</groupId>
     <artifactId>dubbo-bom</artifactId>
-    <version>2.6.3-SNAPSHOT</version>
+    <version>2.6.3</version>
     <packaging>pom</packaging>
 
     <name>dubbo-bom</name>

dependencies-bom/pom.xml

@@ -10,7 +10,7 @@
 
     <groupId>com.alibaba</groupId>
     <artifactId>dubbo-dependencies-bom</artifactId>
-    <version>2.6.3-SNAPSHOT</version>
+    <version>2.6.3</version>
     <packaging>pom</packaging>
 
     <name>dubbo-dependencies-bom</name>
@@ -111,7 +111,7 @@
 
         <jaxb_version>2.2.7</jaxb_version>
         <activation_version>1.2.0</activation_version>
-        <hessian_lite_version>3.2.3</hessian_lite_version>
+        <hessian_lite_version>3.2.4</hessian_lite_version>
     </properties>
 
     <dependencyManagement>

distribution/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.alibaba</groupId>
         <artifactId>dubbo-parent</artifactId>
-        <version>2.6.3-SNAPSHOT</version>
+        <version>2.6.3</version>
     </parent>
     <artifactId>dubbo-distribution</artifactId>
     <packaging>pom</packaging>
@@ -250,7 +250,7 @@
         <profile>
             <id>release</id>
             <build>
-                <finalName>dubbo-incubating-${project.version}</finalName>
+                <finalName>apache-dubbo-incubating-${project.version}</finalName>
                 <plugins>
                     <plugin>
                         <artifactId>maven-assembly-plugin</artifactId>

distribution/src/assembly/source-release.xml

@@ -46,6 +46,9 @@
                 <exclude>**/*.log</exclude>
                 <exclude>release.properties</exclude>
                 <exclude>**/*.xml.*</exclude>
+                <exclude>**/.mvn/**</exclude>
+                <exclude>**/*.jar</exclude>
+                <exclude>**/mvnw*</exclude>
             </excludes>
         </fileSet>
     </fileSets>

dubbo-bootstrap/pom.xml

@@ -14,13 +14,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>dubbo-parent</artifactId>
         <groupId>com.alibaba</groupId>
-        <version>2.6.3-SNAPSHOT</version>
+        <version>2.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dubbo-cluster/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.alibaba</groupId>
         <artifactId>dubbo-parent</artifactId>
-        <version>2.6.3-SNAPSHOT</version>
+        <version>2.6.3</version>
     </parent>
     <artifactId>dubbo-cluster</artifactId>
     <packaging>jar</packaging>