[incubator-dubbo] branch master updated: HashedWheelTimer (#1973)

2018-08-20 Thread iluo
This is an automated email from the ASF dual-hosted git repository.

iluo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git


The following commit(s) were added to refs/heads/master by this push:
 new 9c8f4e7  HashedWheelTimer (#1973)
9c8f4e7 is described below

commit 9c8f4e761951bfac0ad50e3bffe92824e5497a6d
Author: 时无两丶 <442367...@qq.com>
AuthorDate: Tue Aug 21 13:26:50 2018 +0800

HashedWheelTimer (#1973)

* * HashedWheelTimer to check timeout future

* when the future is done, do not set it is timeout
---
 .../dubbo/common/timer/HashedWheelTimer.java   | 805 +
 .../org/apache/dubbo/common/timer/Timeout.java |  55 ++
 .../java/org/apache/dubbo/common/timer/Timer.java  |  48 ++
 .../org/apache/dubbo/common/timer/TimerTask.java   |  34 +
 .../org/apache/dubbo/common/utils/StringUtils.java |  14 +
 .../dubbo/common/timer/HashedWheelTimerTest.java   |  72 ++
 .../remoting/exchange/support/DefaultFuture.java   |  82 ++-
 .../support/header/HeaderExchangeChannel.java  |   2 +-
 .../exchange/support/DefaultFutureTest.java| 124 
 .../dubbo/rpc/protocol/thrift/ThriftCodecTest.java |   4 +-
 10 files changed, 1202 insertions(+), 38 deletions(-)

diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/common/timer/HashedWheelTimer.java
 
b/dubbo-common/src/main/java/org/apache/dubbo/common/timer/HashedWheelTimer.java
new file mode 100644
index 000..db5c43f
--- /dev/null
+++ 
b/dubbo-common/src/main/java/org/apache/dubbo/common/timer/HashedWheelTimer.java
@@ -0,0 +1,805 @@
+/*
+ * Copyright 2012 The Netty Project
+ *
+ * The Netty Project 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.
+ */
+
+package org.apache.dubbo.common.timer;
+
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.utils.StringUtils;
+
+import java.util.Queue;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Collections;
+import java.util.Locale;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * A {@link Timer} optimized for approximated I/O timeout scheduling.
+ *
+ * Tick Duration
+ * 
+ * As described with 'approximated', this timer does not execute the scheduled
+ * {@link TimerTask} on time.  {@link HashedWheelTimer}, on every tick, will
+ * check if there are any {@link TimerTask}s behind the schedule and execute
+ * them.
+ * 
+ * You can increase or decrease the accuracy of the execution timing by
+ * specifying smaller or larger tick duration in the constructor.  In most
+ * network applications, I/O timeout does not need to be accurate.  Therefore,
+ * the default tick duration is 100 milliseconds and you will not need to try
+ * different configurations in most cases.
+ *
+ * Ticks per Wheel (Wheel Size)
+ * 
+ * {@link HashedWheelTimer} maintains a data structure called 'wheel'.
+ * To put simply, a wheel is a hash table of {@link TimerTask}s whose hash
+ * function is 'dead line of the task'.  The default number of ticks per wheel
+ * (i.e. the size of the wheel) is 512.  You could specify a larger value
+ * if you are going to schedule a lot of timeouts.
+ *
+ * Do not create many instances.
+ * 
+ * {@link HashedWheelTimer} creates a new thread whenever it is instantiated 
and
+ * started.  Therefore, you should make sure to create only one instance and
+ * share it across your application.  One of the common mistakes, that makes
+ * your application unresponsive, is to create a new instance for every 
connection.
+ *
+ * Implementation Details
+ * 
+ * {@link HashedWheelTimer} is based on
+ * http://cseweb.ucsd.edu/users/varghese/;>George Varghese and
+ * Tony Lauck's paper,
+ * http://cseweb.ucsd.edu/users/varghese/PAPERS/twheel.ps.Z;>'Hashed
+ * and Hierarchical Timing Wheels: data structures to efficiently implement a
+ * timer facility'.  More comprehensive slides are located
+ * 

[incubator-dubbo] branch 2.6.3-release updated: [maven-release-plugin] prepare for next development iteration

2018-08-20 Thread liujun
This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch 2.6.3-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git


The following commit(s) were added to refs/heads/2.6.3-release by this push:
 new d60e824  [maven-release-plugin] prepare for next development iteration
d60e824 is described below

commit d60e8240c30ea0292cbfd34809a6e5b5c628dabc
Author: ken.lj 
AuthorDate: Mon Aug 20 19:09:03 2018 +0800

[maven-release-plugin] prepare for next development iteration
---
 all/pom.xml| 4 ++--
 bom/pom.xml| 4 ++--
 dependencies-bom/pom.xml   | 4 ++--
 distribution/pom.xml   | 2 +-
 dubbo-bootstrap/pom.xml| 2 +-
 dubbo-cluster/pom.xml  | 2 +-
 dubbo-common/pom.xml   | 2 +-
 dubbo-config/dubbo-config-api/pom.xml  | 2 +-
 dubbo-config/dubbo-config-spring/pom.xml   | 2 +-
 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 | 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| 2 +-
 dubbo-filter/dubbo-filter-validation/pom.xml   | 2 +-
 dubbo-filter/pom.xml   | 2 +-
 dubbo-monitor/dubbo-monitor-api/pom.xml| 2 +-
 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 +-
 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 +-
 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| 2 +-
 dubbo-remoting/dubbo-remoting-netty4/pom.xml   | 2 +-
 dubbo-remoting/dubbo-remoting-p2p/pom.xml  | 2 +-
 dubbo-remoting/dubbo-remoting-zookeeper/pom.xml| 2 +-
 dubbo-remoting/pom.xml | 2 +-
 dubbo-rpc/dubbo-rpc-api/pom.xml| 2 +-
 dubbo-rpc/dubbo-rpc-dubbo/pom.xml  | 2 +-
 dubbo-rpc/dubbo-rpc-hessian/pom.xml| 2 +-
 dubbo-rpc/dubbo-rpc-http/pom.xml   | 2 +-
 dubbo-rpc/dubbo-rpc-injvm/pom.xml  | 2 +-
 dubbo-rpc/dubbo-rpc-memcached/pom.xml  | 2 +-
 dubbo-rpc/dubbo-rpc-redis/pom.xml  | 2 +-
 dubbo-rpc/dubbo-rpc-rest/pom.xml   | 2 +-
 dubbo-rpc/dubbo-rpc-rmi/pom.xml| 2 +-
 dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +-
 dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +-
 dubbo-rpc/pom.xml  | 2 +-
 dubbo-serialization/dubbo-serialization-api/pom.xml| 2 +-
 dubbo-serialization/dubbo-serialization-fastjson/pom.xml   | 2 +-
 dubbo-serialization/dubbo-serialization-fst/pom.xml| 2 +-
 dubbo-serialization/dubbo-serialization-hessian2/pom.xml   | 2 +-
 dubbo-serialization/dubbo-serialization-jdk/pom.xml| 2 +-
 dubbo-serialization/dubbo-serialization-kryo/pom.xml   | 2 +-
 dubbo-serialization/pom.xml| 2 +-
 dubbo-test/dubbo-test-benchmark/pom.xml| 2 +-
 

[incubator-dubbo] annotated tag dubbo-2.6.3 updated (3963d8f -> be27b10)

2018-08-20 Thread liujun
This is an automated email from the ASF dual-hosted git repository.

liujun pushed a change to annotated tag dubbo-2.6.3
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.


*** WARNING: tag dubbo-2.6.3 was modified! ***

from 3963d8f  (commit)
  to be27b10  (tag)
 tagging 3963d8fd93642398375ea92acb7ed4d2bc1b0518 (commit)
 replaces dubbo-2.6.2
  by ken.lj
  on Mon Aug 20 19:08:57 2018 +0800

- Log -
[maven-release-plugin] copy for tag dubbo-2.6.3
---


No new revisions were added by this update.

Summary of changes:



[incubator-dubbo] branch 2.6.3-release updated (84f3215 -> 3963d8f)

2018-08-20 Thread liujun
This is an automated email from the ASF dual-hosted git repository.

liujun pushed a change to branch 2.6.3-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.


from 84f3215  Include 'apache' in release package name.
 new 375e2b9  Fix version issue: 2.6.2-SNAPSHOT to 2.6.3-SNAPSHOT
 new 3963d8f  [maven-release-plugin] prepare release dubbo-2.6.3

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 all/pom.xml| 4 ++--
 bom/pom.xml| 4 ++--
 dependencies-bom/pom.xml   | 4 ++--
 distribution/pom.xml   | 2 +-
 dubbo-bootstrap/pom.xml| 2 +-
 dubbo-cluster/pom.xml  | 2 +-
 dubbo-common/pom.xml   | 2 +-
 dubbo-config/dubbo-config-api/pom.xml  | 2 +-
 dubbo-config/dubbo-config-spring/pom.xml   | 2 +-
 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 | 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| 2 +-
 dubbo-filter/dubbo-filter-validation/pom.xml   | 2 +-
 dubbo-filter/pom.xml   | 2 +-
 dubbo-monitor/dubbo-monitor-api/pom.xml| 2 +-
 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 +-
 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 +-
 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| 2 +-
 dubbo-remoting/dubbo-remoting-netty4/pom.xml   | 2 +-
 dubbo-remoting/dubbo-remoting-p2p/pom.xml  | 2 +-
 dubbo-remoting/dubbo-remoting-zookeeper/pom.xml| 2 +-
 dubbo-remoting/pom.xml | 2 +-
 dubbo-rpc/dubbo-rpc-api/pom.xml| 2 +-
 dubbo-rpc/dubbo-rpc-dubbo/pom.xml  | 2 +-
 dubbo-rpc/dubbo-rpc-hessian/pom.xml| 2 +-
 dubbo-rpc/dubbo-rpc-http/pom.xml   | 2 +-
 dubbo-rpc/dubbo-rpc-injvm/pom.xml  | 2 +-
 dubbo-rpc/dubbo-rpc-memcached/pom.xml  | 2 +-
 dubbo-rpc/dubbo-rpc-redis/pom.xml  | 2 +-
 dubbo-rpc/dubbo-rpc-rest/pom.xml   | 2 +-
 dubbo-rpc/dubbo-rpc-rmi/pom.xml| 2 +-
 dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +-
 dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +-
 dubbo-rpc/pom.xml  | 2 +-
 dubbo-serialization/dubbo-serialization-api/pom.xml| 2 +-
 dubbo-serialization/dubbo-serialization-fastjson/pom.xml   | 2 +-
 dubbo-serialization/dubbo-serialization-fst/pom.xml| 2 +-
 dubbo-serialization/dubbo-serialization-hessian2/pom.xml   | 2 +-
 dubbo-serialization/dubbo-serialization-jdk/pom.xml| 2 +-
 dubbo-serialization/dubbo-serialization-kryo/pom.xml   | 2 +-
 dubbo-serialization/pom.xml| 2 +-
 

[incubator-dubbo] branch 2.6.3-release updated (62251fd -> dba7578)

2018-08-20 Thread liujun
This is an automated email from the ASF dual-hosted git repository.

liujun pushed a change to branch 2.6.3-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.


from 62251fd  [maven-release-plugin] prepare release dubbo-2.6.3
 new 41717d8  Revert version to 2.6.3-SNAPSHOT
 new dba7578  [maven-release-plugin] prepare release dubbo-2.6.2

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bom/pom.xml  | 2 +-
 dependencies-bom/pom.xml | 2 +-
 pom.xml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



[incubator-dubbo] 01/02: Revert version to 2.6.3-SNAPSHOT

2018-08-20 Thread liujun
This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch 2.6.3-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git

commit 41717d843f887665b2af0f53141d03298df3c172
Author: ken.lj 
AuthorDate: Mon Aug 20 18:16:57 2018 +0800

Revert version to 2.6.3-SNAPSHOT
---
 all/pom.xml| 4 ++--
 bom/pom.xml| 4 ++--
 dependencies-bom/pom.xml   | 4 ++--
 distribution/pom.xml   | 2 +-
 dubbo-bootstrap/pom.xml| 2 +-
 dubbo-cluster/pom.xml  | 2 +-
 dubbo-common/pom.xml   | 2 +-
 dubbo-config/dubbo-config-api/pom.xml  | 2 +-
 dubbo-config/dubbo-config-spring/pom.xml   | 2 +-
 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 | 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| 2 +-
 dubbo-filter/dubbo-filter-validation/pom.xml   | 2 +-
 dubbo-filter/pom.xml   | 2 +-
 dubbo-monitor/dubbo-monitor-api/pom.xml| 2 +-
 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 +-
 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 +-
 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| 2 +-
 dubbo-remoting/dubbo-remoting-netty4/pom.xml   | 2 +-
 dubbo-remoting/dubbo-remoting-p2p/pom.xml  | 2 +-
 dubbo-remoting/dubbo-remoting-zookeeper/pom.xml| 2 +-
 dubbo-remoting/pom.xml | 2 +-
 dubbo-rpc/dubbo-rpc-api/pom.xml| 2 +-
 dubbo-rpc/dubbo-rpc-dubbo/pom.xml  | 2 +-
 dubbo-rpc/dubbo-rpc-hessian/pom.xml| 2 +-
 dubbo-rpc/dubbo-rpc-http/pom.xml   | 2 +-
 dubbo-rpc/dubbo-rpc-injvm/pom.xml  | 2 +-
 dubbo-rpc/dubbo-rpc-memcached/pom.xml  | 2 +-
 dubbo-rpc/dubbo-rpc-redis/pom.xml  | 2 +-
 dubbo-rpc/dubbo-rpc-rest/pom.xml   | 2 +-
 dubbo-rpc/dubbo-rpc-rmi/pom.xml| 2 +-
 dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +-
 dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +-
 dubbo-rpc/pom.xml  | 2 +-
 dubbo-serialization/dubbo-serialization-api/pom.xml| 2 +-
 dubbo-serialization/dubbo-serialization-fastjson/pom.xml   | 2 +-
 dubbo-serialization/dubbo-serialization-fst/pom.xml| 2 +-
 dubbo-serialization/dubbo-serialization-hessian2/pom.xml   | 2 +-
 dubbo-serialization/dubbo-serialization-jdk/pom.xml| 2 +-
 dubbo-serialization/dubbo-serialization-kryo/pom.xml   | 2 +-
 dubbo-serialization/pom.xml| 2 +-
 dubbo-test/dubbo-test-benchmark/pom.xml| 2 +-
 dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml | 2 +-
 dubbo-test/dubbo-test-compatibility/pom.xml| 2 +-
 dubbo-test/dubbo-test-examples/pom.xml | 2 +-
 

[incubator-dubbo] 02/05: Replace outdated license header

2018-08-20 Thread liujun
This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch 2.6.3-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git

commit f33e5b37d40e1d5bcf239be71856a1d3162bc680
Author: ken.lj 
AuthorDate: Mon Aug 20 16:09:02 2018 +0800

Replace outdated license header
---
 dubbo-common/src/test/resources/log4j.xml  | 29 +++---
 dubbo-monitor/dubbo-monitor-api/pom.xml| 29 +++---
 dubbo-remoting/dubbo-remoting-netty/pom.xml| 29 +++---
 dubbo-remoting/dubbo-remoting-zookeeper/pom.xml| 29 +++---
 dubbo-rpc/dubbo-rpc-rest/pom.xml   | 29 +++---
 .../src/test/resources/log4j.xml   | 29 +++---
 .../src/test/resources/log4j.xml   | 29 +++---
 .../src/test/resources/log4j.xml   | 29 +++---
 .../src/test/resources/log4j.xml   | 29 +++---
 .../src/test/resources/log4j.xml   | 29 +++---
 dubbo-test/dubbo-test-compatibility/pom.xml| 29 +++---
 11 files changed, 165 insertions(+), 154 deletions(-)

diff --git a/dubbo-common/src/test/resources/log4j.xml 
b/dubbo-common/src/test/resources/log4j.xml
index 9f18a80..1e98db4 100644
--- a/dubbo-common/src/test/resources/log4j.xml
+++ b/dubbo-common/src/test/resources/log4j.xml
@@ -1,19 +1,20 @@
 
 
+  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.
+  -->
 
 http://jakarta.apache.org/log4j/;>
 
diff --git a/dubbo-monitor/dubbo-monitor-api/pom.xml 
b/dubbo-monitor/dubbo-monitor-api/pom.xml
index d085338..48a06f4 100644
--- a/dubbo-monitor/dubbo-monitor-api/pom.xml
+++ b/dubbo-monitor/dubbo-monitor-api/pom.xml
@@ -1,18 +1,19 @@
 
+  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.
+  -->
 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;>
 4.0.0
 
diff --git a/dubbo-remoting/dubbo-remoting-netty/pom.xml 
b/dubbo-remoting/dubbo-remoting-netty/pom.xml
index 3894fe7..c73749b 100644
--- a/dubbo-remoting/dubbo-remoting-netty/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-netty/pom.xml
@@ -1,18 +1,19 @@
 
+  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.
+  -->
 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;>
 4.0.0
 
diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml 
b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
index 

[incubator-dubbo] 05/05: [maven-release-plugin] prepare release dubbo-2.6.3

2018-08-20 Thread liujun
This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch 2.6.3-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git

commit 62251fd4e7614c116607ef6bd836504d5b6c4e2d
Author: ken.lj 
AuthorDate: Mon Aug 20 17:13:40 2018 +0800

[maven-release-plugin] prepare release dubbo-2.6.3
---
 all/pom.xml| 4 ++--
 bom/pom.xml| 4 ++--
 dependencies-bom/pom.xml   | 4 ++--
 distribution/pom.xml   | 2 +-
 dubbo-bootstrap/pom.xml| 2 +-
 dubbo-cluster/pom.xml  | 2 +-
 dubbo-common/pom.xml   | 2 +-
 dubbo-config/dubbo-config-api/pom.xml  | 2 +-
 dubbo-config/dubbo-config-spring/pom.xml   | 2 +-
 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 | 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| 2 +-
 dubbo-filter/dubbo-filter-validation/pom.xml   | 2 +-
 dubbo-filter/pom.xml   | 2 +-
 dubbo-monitor/dubbo-monitor-api/pom.xml| 2 +-
 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 +-
 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 +-
 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| 2 +-
 dubbo-remoting/dubbo-remoting-netty4/pom.xml   | 2 +-
 dubbo-remoting/dubbo-remoting-p2p/pom.xml  | 2 +-
 dubbo-remoting/dubbo-remoting-zookeeper/pom.xml| 2 +-
 dubbo-remoting/pom.xml | 2 +-
 dubbo-rpc/dubbo-rpc-api/pom.xml| 2 +-
 dubbo-rpc/dubbo-rpc-dubbo/pom.xml  | 2 +-
 dubbo-rpc/dubbo-rpc-hessian/pom.xml| 2 +-
 dubbo-rpc/dubbo-rpc-http/pom.xml   | 2 +-
 dubbo-rpc/dubbo-rpc-injvm/pom.xml  | 2 +-
 dubbo-rpc/dubbo-rpc-memcached/pom.xml  | 2 +-
 dubbo-rpc/dubbo-rpc-redis/pom.xml  | 2 +-
 dubbo-rpc/dubbo-rpc-rest/pom.xml   | 2 +-
 dubbo-rpc/dubbo-rpc-rmi/pom.xml| 2 +-
 dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +-
 dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +-
 dubbo-rpc/pom.xml  | 2 +-
 dubbo-serialization/dubbo-serialization-api/pom.xml| 2 +-
 dubbo-serialization/dubbo-serialization-fastjson/pom.xml   | 2 +-
 dubbo-serialization/dubbo-serialization-fst/pom.xml| 2 +-
 dubbo-serialization/dubbo-serialization-hessian2/pom.xml   | 2 +-
 dubbo-serialization/dubbo-serialization-jdk/pom.xml| 2 +-
 dubbo-serialization/dubbo-serialization-kryo/pom.xml   | 2 +-
 dubbo-serialization/pom.xml| 2 +-
 dubbo-test/dubbo-test-benchmark/pom.xml| 2 +-
 dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml | 2 +-
 dubbo-test/dubbo-test-compatibility/pom.xml| 2 +-
 dubbo-test/dubbo-test-examples/pom.xml | 2 +-
 

[incubator-dubbo] 03/05: Include 'apache' in release package name.

2018-08-20 Thread liujun
This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch 2.6.3-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git

commit 84f3215a4fc8fc1d8f21343ae00ab7a3901c9e14
Author: ken.lj 
AuthorDate: Mon Aug 20 16:09:38 2018 +0800

Include 'apache' in release package name.
---
 CODE_OF_CONDUCT.md   | 2 +-
 distribution/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index b7c31c2..f1493c1 100644
--- 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 d...@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 priv...@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/distribution/pom.xml b/distribution/pom.xml
index 3c76393..d9b6a23 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -251,7 +251,7 @@
 
 release
 
-dubbo-incubating-${project.version}
+
apache-dubbo-incubating-${project.version}
 
 
 maven-assembly-plugin



[incubator-dubbo] branch master updated (64f4adb -> e723ad3)

2018-08-20 Thread jerrick
This is an automated email from the ASF dual-hosted git repository.

jerrick pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.


from 64f4adb  replace the method httpclient which is annotated with 
“@Deprecated” (#2103)
 add e723ad3  fix #2134 upgrade httpcore to 4.4.6 (#2319)

No new revisions were added by this update.

Summary of changes:
 dubbo-dependencies-bom/pom.xml | 6 ++
 1 file changed, 6 insertions(+)