You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2022/11/12 15:29:32 UTC
[dubbo] branch 3.2 updated (ce38ee2694 -> 82507b8856)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
from ce38ee2694 Set Fastjson2 as default, support JDK17 native test (#10914)
add 75504e6f80 Fix MetadataService method order (#10922)
add 32c7674681 Add tmp exclude for rat (#10927)
new 82507b8856 Merge branch 'apache-3.1' into apache-3.2
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:
.../main/java/org/apache/dubbo/common/utils/ClassUtils.java | 2 ++
.../main/java/org/apache/dubbo/config/ReferenceConfig.java | 8 +++++---
.../src/main/java/org/apache/dubbo/config/ServiceConfig.java | 11 +++++++----
.../test/java/org/apache/dubbo/config/spring/ConfigTest.java | 2 +-
pom.xml | 1 +
5 files changed, 16 insertions(+), 8 deletions(-)
[dubbo] 01/01: Merge branch 'apache-3.1' into apache-3.2
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 82507b88564c6cedc4194b22d8baa9a83069c46d
Merge: ce38ee2694 32c7674681
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Sat Nov 12 23:29:15 2022 +0800
Merge branch 'apache-3.1' into apache-3.2
.../main/java/org/apache/dubbo/common/utils/ClassUtils.java | 2 ++
.../main/java/org/apache/dubbo/config/ReferenceConfig.java | 8 +++++---
.../src/main/java/org/apache/dubbo/config/ServiceConfig.java | 11 +++++++----
.../test/java/org/apache/dubbo/config/spring/ConfigTest.java | 2 +-
pom.xml | 1 +
5 files changed, 16 insertions(+), 8 deletions(-)
diff --cc dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
index 77405a5b78,bff76a8a21..8ce7554707
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@@ -62,22 -62,21 +62,23 @@@ import java.util.concurrent.atomic.Atom
import static org.apache.dubbo.common.constants.CommonConstants.ANYHOST_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.ANY_VALUE;
+ import static org.apache.dubbo.common.constants.CommonConstants.COMMA_SEPARATOR;
import static org.apache.dubbo.common.constants.CommonConstants.DUBBO;
import static org.apache.dubbo.common.constants.CommonConstants.DUBBO_IP_TO_BIND;
+import static org.apache.dubbo.common.constants.CommonConstants.EXECUTOR_MANAGEMENT_MODE_ISOLATION;
import static org.apache.dubbo.common.constants.CommonConstants.LOCALHOST_VALUE;
import static org.apache.dubbo.common.constants.CommonConstants.METHODS_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.MONITOR_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER_SIDE;
import static org.apache.dubbo.common.constants.CommonConstants.REVISION_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.SERVICE_EXECUTOR;
import static org.apache.dubbo.common.constants.CommonConstants.SERVICE_NAME_MAPPING_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY;
+ import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_FAILED_EXPORT_SERVICE;
import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_NO_METHOD_FOUND;
+ import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_SERVER_DISCONNECTED;
import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_UNEXPORT_ERROR;
import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_USE_RANDOM_PORT;
- import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_FAILED_EXPORT_SERVICE;
- import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_SERVER_DISCONNECTED;
import static org.apache.dubbo.common.constants.RegistryConstants.DYNAMIC_KEY;
import static org.apache.dubbo.common.constants.RegistryConstants.SERVICE_REGISTRY_PROTOCOL;
import static org.apache.dubbo.common.utils.NetUtils.getAvailablePort;