Merge branch '2.6.2-release'

# Conflicts: # all/pom.xml # bom/pom.xml # dependencies-bom/pom.xml # dubbo-cluster/pom.xml # dubbo-common/pom.xml # dubbo-config/dubbo-config-api/pom.xml # dubbo-config/dubbo-config-spring/pom.xml # dubbo-config/pom.xml # dubbo-container/dubbo-container-api/pom.xml # dubbo-container/dubbo-container-log4j/pom.xml # dubbo-container/dubbo-container-logback/pom.xml # dubbo-container/dubbo-container-spring/pom.xml # dubbo-container/pom.xml # dubbo-demo/dubbo-demo-api/pom.xml # dubbo-demo/dubbo-demo-consumer/pom.xml # dubbo-demo/dubbo-demo-provider/pom.xml # dubbo-demo/pom.xml # dubbo-filter/dubbo-filter-cache/pom.xml # dubbo-filter/dubbo-filter-validation/pom.xml # dubbo-filter/pom.xml # dubbo-monitor/dubbo-monitor-api/pom.xml # dubbo-monitor/dubbo-monitor-default/pom.xml # dubbo-monitor/pom.xml # dubbo-plugin/dubbo-qos/pom.xml # dubbo-plugin/pom.xml # dubbo-registry/dubbo-registry-api/pom.xml # dubbo-registry/dubbo-registry-default/pom.xml # dubbo-registry/dubbo-registry-multicast/pom.xml # dubbo-registry/dubbo-registry-redis/pom.xml # dubbo-registry/dubbo-registry-zookeeper/pom.xml # dubbo-registry/pom.xml # dubbo-remoting/dubbo-remoting-api/pom.xml # dubbo-remoting/dubbo-remoting-grizzly/pom.xml # dubbo-remoting/dubbo-remoting-http/pom.xml # dubbo-remoting/dubbo-remoting-mina/pom.xml # dubbo-remoting/dubbo-remoting-netty/pom.xml # dubbo-remoting/dubbo-remoting-netty4/pom.xml # dubbo-remoting/dubbo-remoting-p2p/pom.xml # dubbo-remoting/dubbo-remoting-zookeeper/pom.xml # dubbo-remoting/pom.xml # dubbo-rpc/dubbo-rpc-api/pom.xml # dubbo-rpc/dubbo-rpc-dubbo/pom.xml # dubbo-rpc/dubbo-rpc-hessian/pom.xml # dubbo-rpc/dubbo-rpc-http/pom.xml # dubbo-rpc/dubbo-rpc-injvm/pom.xml # dubbo-rpc/dubbo-rpc-memcached/pom.xml # dubbo-rpc/dubbo-rpc-redis/pom.xml # dubbo-rpc/dubbo-rpc-rest/pom.xml # dubbo-rpc/dubbo-rpc-rmi/pom.xml # dubbo-rpc/dubbo-rpc-thrift/pom.xml # dubbo-rpc/dubbo-rpc-webservice/pom.xml # dubbo-rpc/pom.xml # dubbo-serialization/dubbo-serialization-api/pom.xml # dubbo-serialization/dubbo-serialization-fastjson/pom.xml # dubbo-serialization/dubbo-serialization-fst/pom.xml # dubbo-serialization/dubbo-serialization-hessian2/pom.xml # dubbo-serialization/dubbo-serialization-jdk/pom.xml # dubbo-serialization/dubbo-serialization-kryo/pom.xml # dubbo-serialization/pom.xml # dubbo-test/dubbo-test-benchmark/pom.xml # dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml # dubbo-test/dubbo-test-compatibility/pom.xml # dubbo-test/dubbo-test-examples/pom.xml # dubbo-test/dubbo-test-integration/pom.xml # dubbo-test/pom.xml # hessian-lite/pom.xml # pom.xml
zonghaishang · Jun 6, 2018 · d6faa92 · d6faa92
2 parents 5856d4f + 1e729af
commit d6faa92
Show file tree

Hide file tree

Showing 74 changed files with 2,476 additions and 2,145 deletions.
diff --git a/CHANGES.md b/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).
diff --git a/CODE_OF_CONDUCT.md b/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 dubbo@googlegroups.com. 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 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.
 
 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.
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -10,11 +10,11 @@ Our code style is almost in line with the standard java conventions(Popular IDE'
 
 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.  
 
-* 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.
+* 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.
 

diff --git a/all/pom.xml b/all/pom.xml
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -1,81 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
 
     <modelVersion>4.0.0</modelVersion>
 
-    <!--<parent>-->
-    <!--<artifactId>dubbo-parent</artifactId>-->
-    <!--<groupId>com.alibaba</groupId>-->
-    <!--<version>2.6.2-SNAPSHOT</version>-->
-    <!--<relativePath>../pom.xml</relativePath>-->
-    <!--</parent>-->
     <parent>
         <groupId>org.sonatype.oss</groupId>
         <artifactId>oss-parent</artifactId>
         <version>7</version>
-        <relativePath/>
     </parent>
 
     <groupId>com.alibaba</groupId>
     <artifactId>dubbo-bom</artifactId>
-    <version>2.6.2-SNAPSHOT</version>
+    <version>2.6.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>dubbo-bom</name>
     <description>Dubbo dependencies BOM</description>
-    <url>http://dubbo.io</url>
-
+    <url>https://github.com/apache/incubator-dubbo</url>
     <inceptionYear>2011</inceptionYear>
     <licenses>
         <license>
-            <name>Apache 2</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+            <distribution>repo</distribution>
         </license>
     </licenses>
 
-    <organization>
-        <name>The Dubbo Project</name>
-        <url>http://dubbo.io</url>
-    </organization>
-
-    <issueManagement>
-        <system>Github Issues</system>
-        <url>https://github.com/alibaba/dubbo/issues</url>
-    </issueManagement>
     <scm>
-        <url>https://github.com/alibaba/dubbo/tree/master</url>
-        <connection>scm:git:git://github.com/alibaba/dubbo.git</connection>
-        <developerConnection>scm:git:git@github.com:alibaba/dubbo.git</developerConnection>
-    </scm>
+        <url>https://github.com/apache/incubator-dubbo</url>
+        <connection>scm:git:https://github.com/apache/incubator-dubbo.git</connection>
+        <developerConnection>scm:git:https://github.com/apache/incubator-dubbo.git</developerConnection>
+      <tag>HEAD</tag>
+  </scm>
     <mailingLists>
         <mailingList>
-            <name>Dubbo User Mailling List</name>
-            <subscribe>dubbo+subscribe@googlegroups.com</subscribe>
-            <unsubscribe>dubbo+unsubscribe@googlegroups.com</unsubscribe>
-            <post>dubbo@googlegroups.com</post>
-            <archive>http://groups.google.com/group/dubbo</archive>
+            <name>Development List</name>
+            <subscribe>dev-subscribe@dubbo.apache.org</subscribe>
+            <unsubscribe>dev-unsubscribe@dubbo.apache.org</unsubscribe>
+            <post>dev@dubbo.apache.org</post>
+        </mailingList>
+        <mailingList>
+            <name>Commits List</name>
+            <subscribe>commits-subscribe@dubbo.apache.org</subscribe>
+            <unsubscribe>commits-unsubscribe@dubbo.apache.org</unsubscribe>
+            <post>commits@dubbo.apache.org</post>
         </mailingList>
         <mailingList>
-            <name>Dubbo Developer Mailling List</name>
-            <subscribe>dubbo-developers+subscribe@googlegroups.com</subscribe>
-            <unsubscribe>dubbo-developers+unsubscribe@googlegroups.com</unsubscribe>
-            <post>dubbo-developers@googlegroups.com</post>
-            <archive>http://groups.google.com/group/dubbo-developers</archive>
+            <name>Issues List</name>
+            <subscribe>issues-subscribe@dubbo.apache.org</subscribe>
+            <unsubscribe>issues-unsubscribe@dubbo.apache.org</unsubscribe>
+            <post>issues@dubbo.apache.org</post>
         </mailingList>
     </mailingLists>
     <developers>
         <developer>
             <id>dubbo.io</id>
             <name>The Dubbo Project Contributors</name>
-            <email>dubbo@googlegroups.com</email>
-            <url>http://dubbo.io</url>
-            <organization>The Dubbo Project</organization>
-            <organizationUrl>http://dubbo.io</organizationUrl>
+            <email>dev-subscribe@dubbo.apache.org</email>
+            <url>http://dubbo.apache.org/</url>
         </developer>
     </developers>
 
+    <organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+    </organization>
+
+    <issueManagement>
+        <system>Github Issues</system>
+        <url>https://github.com/apache/incubator-dubbo/issues</url>
+    </issueManagement>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -286,7 +281,7 @@
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>hessian-lite</artifactId>
-                <version>3.2.2</version>
+                <version>3.2.3</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
@@ -1,74 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.sonatype.oss</groupId>
         <artifactId>oss-parent</artifactId>
         <version>7</version>
-        <relativePath />
     </parent>
 
     <groupId>com.alibaba</groupId>
     <artifactId>dubbo-dependencies-bom</artifactId>
-    <version>2.6.2-SNAPSHOT</version>
+    <version>2.6.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>dubbo-dependencies-bom</name>
     <description>Dubbo dependencies BOM</description>
-    <url>http://dubbo.io</url>
-
+    <url>https://github.com/apache/incubator-dubbo</url>
     <inceptionYear>2011</inceptionYear>
     <licenses>
         <license>
-            <name>Apache 2</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+            <distribution>repo</distribution>
         </license>
     </licenses>
 
-    <organization>
-        <name>The Dubbo Project</name>
-        <url>http://dubbo.io</url>
-    </organization>
-
-    <issueManagement>
-        <system>Github Issues</system>
-        <url>https://github.com/alibaba/dubbo/issues</url>
-    </issueManagement>
     <scm>
-        <url>https://github.com/alibaba/dubbo/tree/master</url>
-        <connection>scm:git:git://github.com/alibaba/dubbo.git</connection>
-        <developerConnection>scm:git:git@github.com:alibaba/dubbo.git</developerConnection>
-    </scm>
+        <url>https://github.com/apache/incubator-dubbo</url>
+        <connection>scm:git:https://github.com/apache/incubator-dubbo.git</connection>
+        <developerConnection>scm:git:https://github.com/apache/incubator-dubbo.git</developerConnection>
+      <tag>HEAD</tag>
+  </scm>
     <mailingLists>
         <mailingList>
-            <name>Dubbo User Mailling List</name>
-            <subscribe>dubbo+subscribe@googlegroups.com</subscribe>
-            <unsubscribe>dubbo+unsubscribe@googlegroups.com</unsubscribe>
-            <post>dubbo@googlegroups.com</post>
-            <archive>http://groups.google.com/group/dubbo</archive>
+            <name>Development List</name>
+            <subscribe>dev-subscribe@dubbo.apache.org</subscribe>
+            <unsubscribe>dev-unsubscribe@dubbo.apache.org</unsubscribe>
+            <post>dev@dubbo.apache.org</post>
+        </mailingList>
+        <mailingList>
+            <name>Commits List</name>
+            <subscribe>commits-subscribe@dubbo.apache.org</subscribe>
+            <unsubscribe>commits-unsubscribe@dubbo.apache.org</unsubscribe>
+            <post>commits@dubbo.apache.org</post>
         </mailingList>
         <mailingList>
-            <name>Dubbo Developer Mailling List</name>
-            <subscribe>dubbo-developers+subscribe@googlegroups.com</subscribe>
-            <unsubscribe>dubbo-developers+unsubscribe@googlegroups.com</unsubscribe>
-            <post>dubbo-developers@googlegroups.com</post>
-            <archive>http://groups.google.com/group/dubbo-developers</archive>
+            <name>Issues List</name>
+            <subscribe>issues-subscribe@dubbo.apache.org</subscribe>
+            <unsubscribe>issues-unsubscribe@dubbo.apache.org</unsubscribe>
+            <post>issues@dubbo.apache.org</post>
         </mailingList>
     </mailingLists>
     <developers>
         <developer>
             <id>dubbo.io</id>
             <name>The Dubbo Project Contributors</name>
-            <email>dubbo@googlegroups.com</email>
-            <url>http://dubbo.io</url>
-            <organization>The Dubbo Project</organization>
-            <organizationUrl>http://dubbo.io</organizationUrl>
+            <email>dev-subscribe@dubbo.apache.org</email>
+            <url>http://dubbo.apache.org/</url>
         </developer>
     </developers>
 
+    <organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+    </organization>
+
+    <issueManagement>
+        <system>Github Issues</system>
+        <url>https://github.com/apache/incubator-dubbo/issues</url>
+    </issueManagement>
+
     <properties>
         <!-- Common libs -->
         <spring_version>4.3.16.RELEASE</spring_version>