You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2018/09/12 07:16:19 UTC
[incubator-dubbo] 01/02: Merge branch '2.6.3-release' into 2.6.x
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit d57a58c9a1e1d5f72238b5b81b6bdfafea983920
Merge: acd7000 6ce7b11
Author: ken.lj <ke...@gmail.com>
AuthorDate: Wed Sep 12 14:28:47 2018 +0800
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
CHANGES.md | 52 ++-
CODE_OF_CONDUCT.md | 2 +-
LICENSE | 48 ---
all/pom.xml | 5 +-
bom/pom.xml | 4 +-
dependencies-bom/pom.xml | 4 +-
distribution/pom.xml | 4 +-
distribution/src/assembly/source-release.xml | 3 +
dubbo-bootstrap/pom.xml | 6 +-
dubbo-cluster/pom.xml | 2 +-
.../alibaba/dubbo/rpc/cluster/RouterFactory.java | 5 +-
dubbo-common/pom.xml | 2 +-
.../dubbo/common/concurrent/ListenableFuture.java | 3 +-
dubbo-common/src/test/resources/log4j.xml | 29 +-
dubbo-config/dubbo-config-api/pom.xml | 2 +-
.../com/alibaba/dubbo/config/ConsumerConfig.java | 48 +++
.../alibaba/dubbo/config/ConsumerConfigTest.java | 28 ++
dubbo-config/dubbo-config-spring/pom.xml | 315 +++++++--------
.../DubboWebApplicationInitializer.java | 40 --
.../DubboApplicationContextInitializer.java | 39 ++
.../initializer/DubboApplicationListener.java | 2 +-
.../src/main/resources/META-INF/compat/dubbo.xsd | 20 +
.../src/main/resources/META-INF/dubbo.xsd | 20 +
.../src/main/resources/META-INF/web-fragment.xml | 22 ++
.../initializer/DubboApplicationListenerTest.java | 2 +
.../DubboApplicationContextInitializerTest.java | 87 +++++
.../src/test/resources/applicationContext.xml | 21 +-
.../test/resources/webapps/test/WEB-INF/web.xml | 29 +-
.../test/resources/webapps/test2/WEB-INF/web.xml | 25 +-
.../test/resources/webapps/test3/WEB-INF/web.xml | 25 +-
dubbo-config/pom.xml | 2 +-
dubbo-container/dubbo-container-api/pom.xml | 2 +-
dubbo-container/dubbo-container-log4j/pom.xml | 2 +-
dubbo-container/dubbo-container-logback/pom.xml | 2 +-
dubbo-container/dubbo-container-spring/pom.xml | 92 ++---
.../dubbo/container/spring/SpringContainer.java | 2 +-
dubbo-container/pom.xml | 2 +-
dubbo-demo/dubbo-demo-api/pom.xml | 2 +-
dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +-
dubbo-demo/dubbo-demo-provider/pom.xml | 2 +-
dubbo-demo/pom.xml | 2 +-
dubbo-filter/dubbo-filter-cache/pom.xml | 94 ++---
dubbo-filter/dubbo-filter-validation/pom.xml | 142 +++----
dubbo-filter/pom.xml | 2 +-
dubbo-monitor/dubbo-monitor-api/pom.xml | 31 +-
dubbo-monitor/dubbo-monitor-default/pom.xml | 2 +-
dubbo-monitor/pom.xml | 2 +-
dubbo-plugin/dubbo-qos/pom.xml | 2 +-
dubbo-plugin/pom.xml | 2 +-
dubbo-registry/dubbo-registry-api/pom.xml | 2 +-
.../java/com/alibaba/dubbo/registry/Registry.java | 3 +-
dubbo-registry/dubbo-registry-default/pom.xml | 2 +-
dubbo-registry/dubbo-registry-multicast/pom.xml | 2 +-
dubbo-registry/dubbo-registry-redis/pom.xml | 2 +-
dubbo-registry/dubbo-registry-zookeeper/pom.xml | 2 +-
dubbo-registry/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +-
.../com/alibaba/dubbo/remoting/Transporter.java | 6 +-
dubbo-remoting/dubbo-remoting-grizzly/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-http/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-mina/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-netty/pom.xml | 31 +-
dubbo-remoting/dubbo-remoting-netty4/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-p2p/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-zookeeper/pom.xml | 31 +-
dubbo-remoting/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-api/pom.xml | 2 +-
.../com/alibaba/dubbo/rpc/InvokerListener.java | 3 +-
dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-hessian/pom.xml | 112 +++---
dubbo-rpc/dubbo-rpc-http/pom.xml | 112 +++---
dubbo-rpc/dubbo-rpc-injvm/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-memcached/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-redis/pom.xml | 104 ++---
dubbo-rpc/dubbo-rpc-rest/pom.xml | 31 +-
dubbo-rpc/dubbo-rpc-rmi/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-webservice/pom.xml | 150 +++----
dubbo-rpc/pom.xml | 2 +-
.../dubbo-serialization-api/pom.xml | 2 +-
.../dubbo-serialization-fastjson/pom.xml | 2 +-
.../src/test/resources/log4j.xml | 29 +-
.../dubbo-serialization-fst/pom.xml | 2 +-
.../src/test/resources/log4j.xml | 29 +-
.../dubbo-serialization-hessian2/pom.xml | 2 +-
.../src/test/resources/log4j.xml | 29 +-
.../dubbo-serialization-jdk/pom.xml | 2 +-
.../src/test/resources/log4j.xml | 29 +-
.../dubbo-serialization-kryo/pom.xml | 2 +-
.../src/test/resources/log4j.xml | 29 +-
dubbo-serialization/pom.xml | 2 +-
dubbo-test/dubbo-test-benchmark/pom.xml | 2 +-
.../dubbo-test-spring3/pom.xml | 2 +-
dubbo-test/dubbo-test-compatibility/pom.xml | 31 +-
dubbo-test/dubbo-test-examples/pom.xml | 2 +-
dubbo-test/dubbo-test-integration/pom.xml | 2 +-
dubbo-test/pom.xml | 434 ++++++++++-----------
pom.xml | 19 +-
98 files changed, 1381 insertions(+), 1176 deletions(-)
diff --cc dubbo-test/pom.xml
index 7d044d7,1418947..f7a46f4
--- a/dubbo-test/pom.xml
+++ b/dubbo-test/pom.xml
@@@ -1,217 -1,218 +1,217 @@@
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- 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.
- -->
- <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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-parent</artifactId>
- <version>2.6.3-SNAPSHOT</version>
- </parent>
- <artifactId>dubbo-test</artifactId>
- <packaging>pom</packaging>
- <name>${project.artifactId}</name>
- <description>The test module of dubbo project</description>
- <properties>
- <skip_maven_deploy>true</skip_maven_deploy>
- </properties>
- <modules>
- <module>dubbo-test-benchmark</module>
- <module>dubbo-test-compatibility</module>
- <module>dubbo-test-integration</module>
- <module>dubbo-test-examples</module>
- </modules>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-bom</artifactId>
- <version>${project.parent.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-cluster</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-common</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-config-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-config-spring</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-filter-cache</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-filter-validation</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-remoting-netty</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-remoting-netty4</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-remoting-mina</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-remoting-grizzly</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-remoting-p2p</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-remoting-http</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-rpc-dubbo</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-rpc-injvm</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-rpc-rmi</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-rpc-hessian</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-rpc-http</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-rpc-webservice</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-rpc-thrift</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-rpc-memcached</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-rpc-redis</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-rpc-rest</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-registry-default</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-registry-multicast</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-registry-zookeeper</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-registry-redis</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-monitor-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-monitor-default</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-container-spring</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-container-log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-container-logback</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-qos</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>hessian-lite</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-serialization-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-serialization-hessian2</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-serialization-fst</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-serialization-fastjson</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-serialization-kryo</artifactId>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>dubbo-serialization-jdk</artifactId>
- <version>2.6.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- </dependency>
- </dependencies>
- </project>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.
+ -->
+ <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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-parent</artifactId>
+ <version>2.6.3</version>
+ </parent>
+ <artifactId>dubbo-test</artifactId>
+ <packaging>pom</packaging>
+ <name>${project.artifactId}</name>
+ <description>The test module of dubbo project</description>
+ <properties>
+ <skip_maven_deploy>true</skip_maven_deploy>
+ </properties>
+ <modules>
+ <module>dubbo-test-benchmark</module>
+ <module>dubbo-test-compatibility</module>
+ <module>dubbo-test-integration</module>
+ <module>dubbo-test-examples</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-bom</artifactId>
+ <version>${project.parent.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-cluster</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-config-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-config-spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-filter-cache</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-filter-validation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-remoting-netty</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-remoting-netty4</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-remoting-mina</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-remoting-grizzly</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-remoting-p2p</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-remoting-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-rpc-dubbo</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-rpc-injvm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-rpc-rmi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-rpc-hessian</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-rpc-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-rpc-webservice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-rpc-thrift</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-rpc-memcached</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-rpc-redis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-rpc-rest</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-registry-default</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-registry-multicast</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-registry-zookeeper</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-registry-redis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-monitor-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-monitor-default</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-container-spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-container-log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-container-logback</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-qos</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>hessian-lite</artifactId>
- <version>3.2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-serialization-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-serialization-hessian2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-serialization-fst</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-serialization-fastjson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-serialization-kryo</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>dubbo-serialization-jdk</artifactId>
+ <version>2.6.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.el</artifactId>
+ </dependency>
+ </dependencies>
+ </project>