[incubator-dubbo] branch master updated: stop running openjdk7 in travis CI
This is an automated email from the ASF dual-hosted git repository. liujun 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 00c4201 stop running openjdk7 in travis CI 00c4201 is described below commit 00c4201cf8d67db5fe0447ee1e183ad49f51f945 Author: ken.lj AuthorDate: Wed Jun 6 11:26:39 2018 +0800 stop running openjdk7 in travis CI --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 529e7ff..facb5b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ sudo: false # faster builds jdk: - oraclejdk9 - oraclejdk8 -- openjdk7 script: - travis_wait 30 ./mvnw clean package -- To stop receiving notification emails like this one, please contact liu...@apache.org.
[incubator-dubbo-spring-boot-project] branch master updated (53b9ff0 -> b84278c)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 53b9ff0 Sync pom.xml with ASF info. add e950bbf Update README_CN.md new b84278c Merge pull request #156 from boliuxyz/master The 1 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: README_CN.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #156 from boliuxyz/master
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit b84278cbb255d82808abe374b41499c60048ed7f Merge: 53b9ff0 e950bbf Author: 小马哥 AuthorDate: Wed Jun 6 11:21:38 2018 +0800 Merge pull request #156 from boliuxyz/master Update README_CN.md README_CN.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated (5d52ba0 -> 6340b52)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 5d52ba0 Merge branch 'master' into 0.2.0 add 65dd7ac Update dubbo's version to be 2.6.2 new 6340b52 Merge pull request #159 from mercyblitz/0.2.0 The 1 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: dubbo-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #159 from mercyblitz/0.2.0
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.2.0 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit 6340b524a609278e160d7355caad1e6060546c27 Merge: 5d52ba0 65dd7ac Author: 小马哥 AuthorDate: Wed Jun 6 11:20:59 2018 +0800 Merge pull request #159 from mercyblitz/0.2.0 Update dubbo's version to be 2.6.2 dubbo-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] branch 0.1.x updated (79a6cdf -> c99dc17)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. from 79a6cdf Merge pull request #133 from ralf0131/java10-ut add 506ff10 Update dubbo's version to be 2.6.2 new c99dc17 Merge pull request #158 from mercyblitz/0.1.x The 1 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: dubbo-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo-spring-boot-project] 01/01: Merge pull request #158 from mercyblitz/0.1.x
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 0.1.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git commit c99dc173d6c1561b8edd9c824e69f26c56af25be Merge: 79a6cdf 506ff10 Author: 小马哥 AuthorDate: Wed Jun 6 11:20:34 2018 +0800 Merge pull request #158 from mercyblitz/0.1.x Update dubbo's version to be 2.6.2 dubbo-spring-boot-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mercybl...@apache.org.
[incubator-dubbo] branch master updated: support Java 8+
This is an automated email from the ASF dual-hosted git repository. liujun 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 6cab4ef support Java 8+ 6cab4ef is described below commit 6cab4ef1777f2f9d11d70848db2d3d4445603fa6 Author: ken.lj AuthorDate: Wed Jun 6 10:56:39 2018 +0800 support Java 8+ --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f28e8d9..d7efe20 100644 --- a/pom.xml +++ b/pom.xml @@ -106,8 +106,8 @@ oss -1.6 -1.6 +1.8 +1.8 UTF-8 3.0.2 -- To stop receiving notification emails like this one, please contact liu...@apache.org.
[incubator-dubbo] branch master updated: unit test tracked by issue#1682 (#1889)
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 86984e6 unit test tracked by issue#1682 (#1889)
86984e6 is described below
commit 86984e60617d6f450a03ff8fe82f8bd54f20428f
Author: Ian Luo
AuthorDate: Wed Jun 6 10:42:16 2018 +0800
unit test tracked by issue#1682 (#1889)
* #1682: Enhance the test coverage part-4 :
dubbo-common/src/main/java/com/alibaba/dubbo/common/status(store|threadpoolutils)
modules
* fix test failure
---
.../alibaba/dubbo/common/utils/LogHelperTest.java | 93 +
.../com/alibaba/dubbo/common/utils/LogTest.java| 56 ++
.../alibaba/dubbo/common/utils/LogUtilTest.java| 113 +
3 files changed, 262 insertions(+)
diff --git
a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LogHelperTest.java
b/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LogHelperTest.java
new file mode 100644
index 000..b3ba783
--- /dev/null
+++
b/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LogHelperTest.java
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+
+package com.alibaba.dubbo.common.utils;
+
+import com.alibaba.dubbo.common.logger.Logger;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class LogHelperTest {
+
+@Test
+public void testTrace() throws Exception {
+Logger logger = Mockito.mock(Logger.class);
+when(logger.isTraceEnabled()).thenReturn(true);
+LogHelper.trace(logger, "trace");
+verify(logger).trace("trace");
+Throwable t = new RuntimeException();
+LogHelper.trace(logger, t);
+verify(logger).trace(t);
+LogHelper.trace(logger, "trace", t);
+verify(logger).trace("trace", t);
+}
+
+@Test
+public void testDebug() throws Exception {
+Logger logger = Mockito.mock(Logger.class);
+when(logger.isDebugEnabled()).thenReturn(true);
+LogHelper.debug(logger, "debug");
+verify(logger).debug("debug");
+Throwable t = new RuntimeException();
+LogHelper.debug(logger, t);
+verify(logger).debug(t);
+LogHelper.debug(logger, "debug", t);
+verify(logger).debug("debug", t);
+}
+
+@Test
+public void testInfo() throws Exception {
+Logger logger = Mockito.mock(Logger.class);
+when(logger.isInfoEnabled()).thenReturn(true);
+LogHelper.info(logger, "info");
+verify(logger).info("info");
+Throwable t = new RuntimeException();
+LogHelper.info(logger, t);
+verify(logger).info(t);
+LogHelper.info(logger, "info", t);
+verify(logger).info("info", t);
+}
+
+@Test
+public void testWarn() throws Exception {
+Logger logger = Mockito.mock(Logger.class);
+when(logger.isWarnEnabled()).thenReturn(true);
+LogHelper.warn(logger, "warn");
+verify(logger).warn("warn");
+Throwable t = new RuntimeException();
+LogHelper.warn(logger, t);
+verify(logger).warn(t);
+LogHelper.warn(logger, "warn", t);
+verify(logger).warn("warn", t);
+}
+
+@Test
+public void testError() throws Exception {
+Logger logger = Mockito.mock(Logger.class);
+when(logger.isErrorEnabled()).thenReturn(true);
+LogHelper.error(logger, "error");
+verify(logger).error("error");
+Throwable t = new RuntimeException();
+LogHelper.error(logger, t);
+verify(logger).error(t);
+LogHelper.error(logger, "error", t);
+verify(logger).error("error", t);
+}
+}
diff --git
a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LogTest.java
b/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LogTest.java
new file mode 100644
index 000..3901a93
--- /dev/null
+++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LogTest.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the
[incubator-dubbo] branch master updated: bump version to 2.7.0-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. liujun 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 82905e1 bump version to 2.7.0-SNAPSHOT 82905e1 is described below commit 82905e14da688d763d0d5c22b8e10ffc1aa77103 Author: ken.lj AuthorDate: Wed Jun 6 10:30:19 2018 +0800 bump version to 2.7.0-SNAPSHOT --- all/pom.xml| 4 ++-- bom/pom.xml| 2 +- dependencies-bom/pom.xml | 2 +- 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
[incubator-dubbo] branch 2.6.2-release deleted (was 1e729af)
This is an automated email from the ASF dual-hosted git repository. liujun pushed a change to branch 2.6.2-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. was 1e729af [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact liu...@apache.org.
[incubator-dubbo] branch master updated: upgrade version manually after merge 2.6.2-release
This is an automated email from the ASF dual-hosted git repository. liujun 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 e4ab908 upgrade version manually after merge 2.6.2-release e4ab908 is described below commit e4ab9087531e2c97ea51e9e890c10d9c81fa9bc1 Author: ken.lj AuthorDate: Wed Jun 6 09:44:52 2018 +0800 upgrade version manually after merge 2.6.2-release --- distribution/pom.xml | 2 +- dubbo-bootstrap/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-api/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-hessian2/pom.xml | 2 +- dubbo-serialization/dubbo-serialization-jdk/pom.xml | 2 +- dubbo-test/pom.xml | 2 +- hessian-lite/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index ddfc690..b8590e7 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -243,7 +243,7 @@ com.alibaba hessian-lite -3.2.2 +3.2.3 diff --git a/dubbo-bootstrap/pom.xml b/dubbo-bootstrap/pom.xml index bb2b1a4..e4320f0 100644 --- a/dubbo-bootstrap/pom.xml +++ b/dubbo-bootstrap/pom.xml @@ -20,7 +20,7 @@ dubbo-parent com.alibaba -2.6.2-SNAPSHOT +2.6.3-SNAPSHOT 4.0.0 diff --git a/dubbo-serialization/dubbo-serialization-api/pom.xml b/dubbo-serialization/dubbo-serialization-api/pom.xml index 97b2745..1f09c45 100644 --- a/dubbo-serialization/dubbo-serialization-api/pom.xml +++ b/dubbo-serialization/dubbo-serialization-api/pom.xml @@ -38,7 +38,7 @@ limitations under the License. com.alibaba hessian-lite -2.6.3-SNAPSHOT +3.2.3 com.alibaba diff --git a/dubbo-serialization/dubbo-serialization-hessian2/pom.xml b/dubbo-serialization/dubbo-serialization-hessian2/pom.xml index 8b1e63e..9ab7a6d 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/pom.xml +++ b/dubbo-serialization/dubbo-serialization-hessian2/pom.xml @@ -38,7 +38,7 @@ limitations under the License. com.alibaba hessian-lite -2.6.3-SNAPSHOT +3.2.3 \ No newline at end of file diff --git a/dubbo-serialization/dubbo-serialization-jdk/pom.xml b/dubbo-serialization/dubbo-serialization-jdk/pom.xml index 36eb59b..2b0fd3a 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/pom.xml +++ b/dubbo-serialization/dubbo-serialization-jdk/pom.xml @@ -38,7 +38,7 @@ limitations under the License. com.alibaba hessian-lite -2.6.3-SNAPSHOT +3.2.3 \ No newline at end of file diff --git a/dubbo-test/pom.xml b/dubbo-test/pom.xml index 7f1d4a1..7505067 100644 --- a/dubbo-test/pom.xml +++ b/dubbo-test/pom.xml @@ -179,7 +179,7 @@ com.alibaba hessian-lite -3.2.2 +3.2.3 com.alibaba diff --git a/hessian-lite/pom.xml b/hessian-lite/pom.xml index b03cd47..911e726 100644 --- a/hessian-lite/pom.xml +++ b/hessian-lite/pom.xml @@ -23,6 +23,6 @@ hessian-lite jar -2.6.3-SNAPSHOT +3.2.3 Hessian Lite(Alibaba embed version) -- To stop receiving notification emails like this one, please contact liu...@apache.org.
[incubator-dubbo] 01/01: Merge branch '2.6.2-release'
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit d6faa92be1ccffe5bd1dbecb8cfb394c44895729
Merge: 5856d4f 1e729af
Author: ken.lj
AuthorDate: Wed Jun 6 09:29:31 2018 +0800
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
CHANGES.md | 15 +
CODE_OF_CONDUCT.md | 2 +-
CONTRIBUTING.md| 4 +-
all/pom.xml| 102 ++--
bom/pom.xml| 81 ++--
dependencies-bom/pom.xml | 73 +--
{dubbo-test => distribution}/pom.xml | 521 -
distribution/src/assembly/bin-release.xml | 50 ++
distribution/src/assembly/source-release.xml | 52 ++
dubbo-cluster/pom.xml | 75 ++-
dubbo-common/pom.xml | 143 +++---
dubbo-config/dubbo-config-api/pom.xml | 251 +-
dubbo-config/dubbo-config-spring/pom.xml | 5 +-
dubbo-config/pom.xml | 71 ++-
dubbo-container/dubbo-container-api/pom.xml| 107 +++--
dubbo-container/dubbo-container-log4j/pom.xml | 75 ++-
dubbo-container/dubbo-container-logback/pom.xml| 85 ++--
dubbo-container/dubbo-container-spring/pom.xml | 5 +-
dubbo-container/pom.xml| 75 ++-
dubbo-demo/dubbo-demo-api/pom.xml | 61 ++-
dubbo-demo/dubbo-demo-consumer/pom.xml | 123 +++--
dubbo-demo/dubbo-demo-provider/pom.xml | 125 +++--
dubbo-demo/pom.xml | 99 ++--
dubbo-filter/dubbo-filter-cache/pom.xml| 5 +-
dubbo-filter/dubbo-filter-validation/pom.xml | 5 +-
dubbo-filter/pom.xml | 71 ++-
[incubator-dubbo] branch master updated (5856d4f -> d6faa92)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.
from 5856d4f remove author info from #1453
add 1503d6d We need to change the version to SNAPSHOT to satisfy
release:prepare
add 7f052f1 upgrade to 2.6.2-SNAPSHOT
add 1973f18 Change parent pom back to oss in this version
add 625c445 Add binary release module 'distribution'
add f5de637 Bump version to 2.6.2 for release
add bb8e93e Polish distribution pom
add 7c90490 Support package NOTICE & LICENSE into sub-module jar.
add 944d520 Bump version to 2.6.2-SNAPSHOT
add a9c975c Bump version to 2.6.2-SNAPSHOT
add afab04c [maven-release-plugin] prepare release dubbo-2.6.2
add a6401e6 [maven-release-plugin] prepare for next development iteration
add 938e52d Add assembly plugin
add ec87d96 Add CHANGES.md as release note.
add 5a9ea93 Polish release notes in CHANGES.md
add d7b3eaf Go back to 2.6.2-SNAPSHOT to prepare for the next release.
add 7c07339 Add source-release assembly config
add 472e62c Add arguments for release-plugin
add b09e7a4 #1816: dubbo schema compatibility
add c968c09 Fix minor issues reported in 2.6.2 RC1
add d11ddc0 Add *.log exclude pattern for source-release assembly
add 81c3c0d Skip checkstyle by default
add 63f6361 Skip rat by default
add b4705d0 Merge checkstyle-plugin configuration
add d4d8a50 Exclude release temp files
add aa63752 Exclude release temp files
add 9e003d6 Add profile for distribution module
add 5eeb240 [maven-release-plugin] prepare release dubbo-2.6.2
add 1e729af [maven-release-plugin] prepare for next development iteration
new d6faa92 Merge branch '2.6.2-release'
The 1 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:
CHANGES.md | 15 +
CODE_OF_CONDUCT.md | 2 +-
CONTRIBUTING.md| 4 +-
all/pom.xml| 102 ++--
bom/pom.xml| 81 ++--
dependencies-bom/pom.xml | 73 +--
{dubbo-test => distribution}/pom.xml | 521 -
.../src/assembly/bin-release.xml | 34 +-
distribution/src/assembly/source-release.xml | 52 ++
dubbo-cluster/pom.xml | 75 ++-
dubbo-common/pom.xml | 143 +++---
dubbo-config/dubbo-config-api/pom.xml | 251 +-
dubbo-config/dubbo-config-spring/pom.xml | 5 +-
dubbo-config/pom.xml | 71 ++-
dubbo-container/dubbo-container-api/pom.xml| 107 +++--
dubbo-container/dubbo-container-log4j/pom.xml | 75 ++-
dubbo-container/dubbo-container-logback/pom.xml| 85 ++--
dubbo-container/dubbo-container-spring/pom.xml | 5 +-
dubbo-container/pom.xml| 75 ++-
dubbo-demo/dubbo-demo-api/pom.xml | 61 ++-
dubbo-demo/dubbo-demo-consumer/pom.xml | 123 +++--
dubbo-demo/dubbo-demo-provider/pom.xml | 125 +++--
dubbo-demo/pom.xml | 99 ++--
dubbo-filter/dubbo-filter-cache/pom.xml| 5 +-
dubbo-filter/dubbo-filter-validation/pom.xml | 5 +-
dubbo-filter/pom.xml | 71 ++-
dubbo-monitor/dubbo-monitor-api/pom.xml| 73 ++-
dubbo-monitor/dubbo-monitor-default/pom.xml| 111 +++--
dubbo-monitor/pom.xml | 71 ++-
dubbo-plugin/dubbo-qos/pom.xml | 5 +-
dubbo-plugin/pom.xml | 5 +-
dubbo-registry/dubbo-registry-api/pom.xml | 97 ++--
dubbo-registry/dubbo-registry-default/pom.xml | 125 +++--
dubbo-registry/dubbo-registry-multicast/pom.xml| 75 ++-
dubbo-registry/dubbo-registry-redis/pom.xml| 93 ++--
dubbo-registry/dubbo-registry-zookeeper/pom.xml| 95 ++--
dubbo-registry/pom.xml | 77 ++-
dubbo-remoting/dubbo-remoting-api/pom.xml | 97 ++--
dubbo-remoting/dubbo-remoting-grizzly/pom.xml | 83 ++--
dubbo-remoting/dubbo-remoting-http/pom.xml | 115 +++--
dubbo-remoting/dubbo-remoting-mina/pom.xml | 103 ++--
dubbo-remoting/dubbo-remoting-netty/pom.xml| 93 ++--
dubbo-remoting/dubbo-remoting-netty4/pom.xml | 5 +-
dubbo-remoting/dubbo-remoting-p2p/pom.xml | 75 ++-
dubbo-remoting/dubbo-remoting-zookeeper/pom.xml| 107 +++--
dubbo-remoting/pom.xml
[incubator-dubbo] branch master updated: Merge pull request #1453, restore the bug that attachment has not been updated in the RpcContext when the Dubbo built-in retry mechanism is triggered.
This is an automated email from the ASF dual-hosted git repository.
liujun 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 42ba20e Merge pull request #1453, restore the bug that attachment has
not been updated in the RpcContext when the Dubbo built-in retry mechanism is
triggered.
42ba20e is described below
commit 42ba20ed43331f0e3e1c4a4ea75fcb34f564b796
Author: yizhenqiang
AuthorDate: Tue Jun 5 15:59:29 2018 +0800
Merge pull request #1453, restore the bug that attachment has not been
updated in the RpcContext when the Dubbo built-in retry mechanism is triggered.
---
.../java/com/alibaba/dubbo/rpc/protocol/AbstractInvoker.java | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git
a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractInvoker.java
b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractInvoker.java
index eee7db4..2d8c8d9 100644
---
a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractInvoker.java
+++
b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractInvoker.java
@@ -136,7 +136,14 @@ public abstract class AbstractInvoker implements
Invoker {
}
Map context = RpcContext.getContext().getAttachments();
if (context != null) {
-invocation.addAttachmentsIfAbsent(context);
+/**
+ * invocation.addAttachmentsIfAbsent(context){@link
RpcInvocation#addAttachmentsIfAbsent(Map)}should not be used here,
+ * because the {@link RpcContext#setAttachment(String, String)} is
passed in the Filter when the call is triggered
+ * by the built-in retry mechanism of the Dubbo. The attachment to
update RpcContext will no longer work, which is
+ * a mistake in most cases (for example, through Filter to
RpcContext output traceId and spanId and other information).
+ * yizhenqiang 20180310
+ */
+invocation.addAttachments(context);
}
if (getUrl().getMethodParameter(invocation.getMethodName(),
Constants.ASYNC_KEY, false)) {
invocation.setAttachment(Constants.ASYNC_KEY,
Boolean.TRUE.toString());
--
To stop receiving notification emails like this one, please contact
liu...@apache.org.
[incubator-dubbo] branch master updated: Adding maven wrapper to Dubbo project (#1887)
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 7df5eb6 Adding maven wrapper to Dubbo project (#1887)
7df5eb6 is described below
commit 7df5eb6a3b2da91f8b13a6c8eb36ea47f43f87ba
Author: 时无两丶 <442367...@qq.com>
AuthorDate: Tue Jun 5 14:09:20 2018 +0800
Adding maven wrapper to Dubbo project (#1887)
* 当cores线程数全都使用的情况下，默认线程池会把任务放入到队列中。队列满则再创建线程（总数不会超过Max线程数）
增强线程池：在请求量阶段性出现高峰时使用
特性：cores线程全部使用的情况下，优先创建线程（总数不会超过max），当max个线程全都在忙的情况下，才将任务放入队列。请求量下降时，线程池会自动维持cores个线程，多余的线程退出。
* 当cores线程数全都使用的情况下，默认线程池会把任务放入到队列中。队列满则再创建线程（总数不会超过Max线程数）
增强线程池：在请求量阶段性出现高峰时使用
特性：cores线程全部使用的情况下，优先创建线程（总数不会超过max），当max个线程全都在忙的情况下，才将任务放入队列。请求量下降时，线程池会自动维持cores个线程，多余的线程退出。
* 补全单元测试，测试扩展是否生效
* 增加@Override注解
long 初始化赋值时，小写l改为大写L防止误读
* remove enhanced
* remove enhanced
* feat: 增加maven-wrapper，用户可以使用自己的maven，应用工程构建时将会使用工程的maven版本
* use mvnw to ci.
---
.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 47774 bytes
.mvn/wrapper/maven-wrapper.properties | 1 +
.travis.yml| 2 +-
.../dubbo/common/utils/AtomicPositiveInteger.java | 7 +
mvnw | 227 +
mvnw.cmd | 143 +
6 files changed, 379 insertions(+), 1 deletion(-)
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
new file mode 100755
index 000..41c70a7
Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/.mvn/wrapper/maven-wrapper.properties
b/.mvn/wrapper/maven-wrapper.properties
new file mode 100755
index 000..56bb016
--- /dev/null
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1 @@
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index e774ec5..529e7ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ jdk:
- openjdk7
script:
-- travis_wait 30 mvn clean package
+- travis_wait 30 ./mvnw clean package
after_success:
- bash <(curl -s https://codecov.io/bash)
diff --git
a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/AtomicPositiveInteger.java
b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/AtomicPositiveInteger.java
index 2ff9532..c7d01e1 100644
---
a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/AtomicPositiveInteger.java
+++
b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/AtomicPositiveInteger.java
@@ -97,30 +97,37 @@ public class AtomicPositiveInteger extends Number {
return indexUpdater.weakCompareAndSet(this, expect, update);
}
+@Override
public byte byteValue() {
return (byte) get();
}
+@Override
public short shortValue() {
return (short) get();
}
+@Override
public int intValue() {
return get();
}
+@Override
public long longValue() {
return (long) get();
}
+@Override
public float floatValue() {
return (float) get();
}
+@Override
public double doubleValue() {
return (double) get();
}
+@Override
public String toString() {
return Integer.toString(get());
}
diff --git a/mvnw b/mvnw
new file mode 100755
index 000..e96ccd5
--- /dev/null
+++ b/mvnw
@@ -0,0 +1,227 @@
+#!/bin/sh
+#
+# 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.
+#
+
+#
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# --
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS
