This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 0fccd2ccaef9c484624244ec9dc5f546e5f29259
Merge: ad803e1c84 33677c050d
Author: Albumen Kevin <jhq0...@gmail.com>
AuthorDate: Thu Dec 14 19:36:25 2023 +0800
Merge branch 'apache-3.2' into apache-3.3
# Conflicts:
# dubbo-build-tools/pom.xml
# dubbo-dependencies-bom/pom.xml
# dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
# dubbo-kubernetes/pom.xml
# dubbo-native-plugin/pom.xml
# dubbo-xds/pom.xml
#
dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouteTest.java
# pom.xml
.../dubbo/common/constants/ProviderConstants.java | 28 --
.../serialization/PreferSerializationProvider.java | 8 +-
.../org/apache/dubbo/config/ProtocolConfig.java | 9 +-
.../dubbo/config/context/ConfigManagerTest.java | 10 +
.../apache/dubbo/generic/GenericServiceTest.java | 6 +-
.../apache/dubbo/config/ProtocolConfigTest.java | 6 +-
.../utils/TestPreferSerializationProvider.java | 14 +-
.../dubbo-configcenter-apollo/pom.xml | 2 +-
dubbo-dependencies-bom/pom.xml | 16 +-
.../dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +-
.../dubbo-dependencies-zookeeper/pom.xml | 2 +-
dubbo-dependencies/pom.xml | 2 +-
dubbo-distribution/dubbo-all/pom.xml | 23 --
dubbo-distribution/dubbo-apache-release/pom.xml | 2 +-
dubbo-distribution/dubbo-bom/pom.xml | 13 -
dubbo-distribution/dubbo-core-spi/pom.xml | 6 -
dubbo-distribution/pom.xml | 2 +-
dubbo-kubernetes/pom.xml | 78 ----
.../kubernetes/KubernetesMeshEnvListener.java | 207 ----------
.../KubernetesMeshEnvListenerFactory.java | 42 --
.../registry/kubernetes/KubernetesRegistry.java | 50 ---
.../kubernetes/KubernetesRegistryFactory.java | 34 --
.../kubernetes/KubernetesServiceDiscovery.java | 451 ---------------------
.../KubernetesServiceDiscoveryFactory.java | 28 --
.../dubbo/registry/kubernetes/MeshConstant.java | 45 --
.../kubernetes/NopKubernetesMeshEnvListener.java | 34 --
.../kubernetes/util/KubernetesClientConst.java | 78 ----
.../kubernetes/util/KubernetesConfigUtils.java | 104 -----
.../org.apache.dubbo.registry.RegistryFactory | 1 -
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 -
...luster.router.mesh.route.MeshEnvListenerFactory | 1 -
.../kubernetes/KubernetesServiceDiscoveryTest.java | 289 -------------
.../org.mockito.plugins.MockMaker | 1 -
dubbo-maven-plugin/pom.xml | 6 +-
.../transport/netty4/ssl/SslServerTlsHandler.java | 7 +-
.../rpc/protocol/tri/ReflectionPackableMethod.java | 24 +-
.../apache/dubbo/rpc/protocol/tri/DataWrapper.java | 7 +-
.../dubbo/rpc/protocol/tri/DescriptorService.java | 11 +
.../protocol/tri/ReflectionPackableMethodTest.java | 32 ++
.../SerializationScopeModelInitializer.java | 17 +-
.../support/PreferSerializationProviderImpl.java | 42 ++
...rg.apache.dubbo.rpc.model.ScopeModelInitializer | 1 +
.../fastjson2/FastJson2Serialization.java | 15 +
.../fastjson2/Fastjson2ScopeModelInitializer.java | 14 +-
.../hessian2/Hessian2ScopeModelInitializer.java | 14 +-
.../serialize/hessian2/Hessian2Serialization.java | 16 +
dubbo-test/dubbo-dependencies-all/pom.xml | 13 -
dubbo-test/dubbo-test-check/pom.xml | 2 +-
dubbo-xds/pom.xml | 131 ------
.../dubbo/registry/xds/XdsCertificateSigner.java | 58 ---
.../org/apache/dubbo/registry/xds/XdsRegistry.java | 50 ---
.../dubbo/registry/xds/XdsRegistryFactory.java | 34 --
.../dubbo/registry/xds/XdsServiceDiscovery.java | 117 ------
.../registry/xds/XdsServiceDiscoveryFactory.java | 48 ---
.../xds/istio/IstioCitadelCertificateSigner.java | 294 --------------
.../dubbo/registry/xds/istio/IstioConstant.java | 109 -----
.../apache/dubbo/registry/xds/istio/IstioEnv.java | 195 ---------
.../dubbo/registry/xds/util/AdsObserver.java | 140 -------
.../dubbo/registry/xds/util/NodeBuilder.java | 43 --
.../dubbo/registry/xds/util/PilotExchanger.java | 250 ------------
.../apache/dubbo/registry/xds/util/XdsChannel.java | 142 -------
.../xds/util/bootstrap/BootstrapInfoImpl.java | 131 ------
.../registry/xds/util/bootstrap/Bootstrapper.java | 75 ----
.../xds/util/bootstrap/BootstrapperImpl.java | 179 --------
.../bootstrap/CertificateProviderInfoImpl.java | 45 --
.../xds/util/bootstrap/ServerInfoImpl.java | 71 ----
.../xds/util/protocol/AbstractProtocol.java | 269 ------------
.../registry/xds/util/protocol/DeltaResource.java | 32 --
.../registry/xds/util/protocol/XdsProtocol.java | 41 --
.../xds/util/protocol/delta/DeltaEndpoint.java | 48 ---
.../xds/util/protocol/delta/DeltaListener.java | 47 ---
.../xds/util/protocol/delta/DeltaRoute.java | 47 ---
.../xds/util/protocol/impl/EdsProtocol.java | 97 -----
.../xds/util/protocol/impl/LdsProtocol.java | 106 -----
.../xds/util/protocol/impl/RdsProtocol.java | 92 -----
.../xds/util/protocol/message/Endpoint.java | 96 -----
.../xds/util/protocol/message/EndpointResult.java | 60 ---
.../xds/util/protocol/message/ListenerResult.java | 68 ----
.../xds/util/protocol/message/RouteResult.java | 94 -----
.../cluster/router/xds/EdsEndpointListener.java | 26 --
.../rpc/cluster/router/xds/EdsEndpointManager.java | 127 ------
.../cluster/router/xds/RdsRouteRuleManager.java | 162 --------
.../cluster/router/xds/RdsVirtualHostListener.java | 184 ---------
.../cluster/router/xds/XdsRouteRuleListener.java | 28 --
.../dubbo/rpc/cluster/router/xds/XdsRouter.java | 391 ------------------
.../rpc/cluster/router/xds/XdsRouterFactory.java | 31 --
.../rpc/cluster/router/xds/rule/ClusterWeight.java | 37 --
.../cluster/router/xds/rule/DestinationSubset.java | 57 ---
.../router/xds/rule/HTTPRouteDestination.java | 42 --
.../rpc/cluster/router/xds/rule/HeaderMatcher.java | 121 ------
.../cluster/router/xds/rule/HttpRequestMatch.java | 39 --
.../cluster/router/xds/rule/LongRangeMatch.java | 47 ---
.../rpc/cluster/router/xds/rule/PathMatcher.java | 71 ----
.../rpc/cluster/router/xds/rule/XdsRouteRule.java | 37 --
dubbo-xds/src/main/proto/ca.proto | 62 ---
.../org.apache.dubbo.registry.RegistryFactory | 1 -
...e.dubbo.registry.client.ServiceDiscoveryFactory | 1 -
....apache.dubbo.registry.xds.XdsCertificateSigner | 1 -
...bbo.rpc.cluster.router.state.StateRouterFactory | 1 -
...rg.apache.dubbo.rpc.model.ScopeModelInitializer | 1 -
.../xds/util/bootstrap/BootstrapperTest.java | 148 -------
.../xds/util/protocol/impl/EdsProtocolMock.java | 51 ---
.../xds/util/protocol/impl/LdsProtocolMock.java | 68 ----
.../xds/util/protocol/impl/RdsProtocolMock.java | 54 ---
.../cluster/router/xds/EdsEndpointManagerTest.java | 108 -----
.../router/xds/RdsRouteRuleManagerTest.java | 126 ------
.../router/xds/RdsVirtualHostListenerTest.java | 258 ------------
.../dubbo/rpc/cluster/router/xds/XdsRouteTest.java | 375 -----------------
.../cluster/router/xds/rule/HeaderMatcherTest.java | 89 ----
.../cluster/router/xds/rule/PathMatcherTest.java | 57 ---
pom.xml | 12 +-
111 files changed, 223 insertions(+), 7615 deletions(-)
diff --cc dubbo-common/src/main/java/org/apache/dubbo/config/ProtocolConfig.java
index eb358a79f7,bae108cfe5..1d0b5918a0
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/ProtocolConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/ProtocolConfig.java
@@@ -30,10 -30,9 +31,9 @@@ import static org.apache.dubbo.common.c
import static
org.apache.dubbo.common.constants.CommonConstants.SSL_ENABLED_KEY;
import static
org.apache.dubbo.common.constants.CommonConstants.THREAD_POOL_EXHAUSTED_LISTENERS_KEY;
import static
org.apache.dubbo.common.constants.LoggerCodeConstants.COMMON_UNEXPECTED_EXCEPTION;
- import static
org.apache.dubbo.common.constants.ProviderConstants.DEFAULT_PREFER_SERIALIZATION;
/**
- * ProtocolConfig
+ * Configuration for the protocol.
*
* @export
*/
diff --cc dubbo-dependencies-bom/pom.xml
index fb79bd584a,b3bfb07766..4121138d8e
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@@ -101,8 -101,8 +101,8 @@@
<httpclient_version>4.5.14</httpclient_version>
<httpcore_version>4.4.16</httpcore_version>
<fastjson_version>1.2.83</fastjson_version>
- <fastjson2_version>2.0.42</fastjson2_version>
+ <fastjson2_version>2.0.43</fastjson2_version>
- <zookeeper_version>3.7.0</zookeeper_version>
+ <zookeeper_version>3.7.2</zookeeper_version>
<curator_version>5.1.0</curator_version>
<curator_test_version>2.12.0</curator_test_version>
<jedis_version>3.10.0</jedis_version>
@@@ -146,15 -145,12 +146,15 @@@
<rs_api_version>2.1.1</rs_api_version>
<resteasy_version>3.15.6.Final</resteasy_version>
<codehaus-jackson_version>1.9.13</codehaus-jackson_version>
- <tomcat_embed_version>8.5.87</tomcat_embed_version>
+ <tomcat_embed_version>8.5.96</tomcat_embed_version>
<jetcd_version>0.7.6</jetcd_version>
<nacos_version>2.2.4</nacos_version>
+ <sentinel.version>1.8.6</sentinel.version>
+ <seata.version>1.6.1</seata.version>
- <grpc.version>1.59.0</grpc.version>
+ <grpc.version>1.60.0</grpc.version>
<grpc_contrib_verdion>0.8.1</grpc_contrib_verdion>
<jprotoc_version>1.2.2</jprotoc_version>
+ <mustache_version>0.9.10</mustache_version>
<!-- Log libs -->
<slf4j_version>1.7.36</slf4j_version>
<jcl_version>1.2</jcl_version>
diff --cc dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
index dbe8e646ab,dfa4896b57..0cf95672d5
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
@@@ -31,12 -31,11 +31,12 @@@
<packaging>pom</packaging>
<properties>
- <revision>3.2.10-SNAPSHOT</revision>
+ <revision>3.3.0-beta.2-SNAPSHOT</revision>
<maven_flatten_version>1.5.0</maven_flatten_version>
+ <slf4j_version>1.7.36</slf4j_version>
<curator5_version>5.1.0</curator5_version>
<zookeeper_version>3.8.3</zookeeper_version>
- <spotless-maven-plugin.version>2.41.0</spotless-maven-plugin.version>
+ <spotless-maven-plugin.version>2.41.1</spotless-maven-plugin.version>
<spotless.action>check</spotless.action>
<dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
<palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
diff --cc dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
index 62a3340084,5495471537..ea2e35d93b
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
@@@ -31,12 -31,11 +31,12 @@@
<packaging>pom</packaging>
<properties>
- <revision>3.2.10-SNAPSHOT</revision>
+ <revision>3.3.0-beta.2-SNAPSHOT</revision>
<maven_flatten_version>1.5.0</maven_flatten_version>
+ <slf4j_version>1.7.36</slf4j_version>
<curator_version>4.3.0</curator_version>
<zookeeper_version>3.4.14</zookeeper_version>
- <spotless-maven-plugin.version>2.41.0</spotless-maven-plugin.version>
+ <spotless-maven-plugin.version>2.41.1</spotless-maven-plugin.version>
<spotless.action>check</spotless.action>
<dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
<palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
diff --cc pom.xml
index 4e70221edc,d04b93350a..c188ff099f
--- a/pom.xml
+++ b/pom.xml
@@@ -93,10 -96,11 +93,8 @@@
<module>dubbo-dependencies</module>
<module>dubbo-metadata</module>
<module>dubbo-metrics</module>
- <module>dubbo-build-tools</module>
<module>dubbo-spring-boot</module>
- <module>dubbo-native</module>
<module>dubbo-test</module>
- <module>dubbo-kubernetes</module>
- <module>dubbo-xds</module>
- <module>dubbo-native-plugin</module>
<module>dubbo-maven-plugin</module>
</modules>
@@@ -147,10 -156,16 +145,10 @@@
<maven_antrun_version>3.1.0</maven_antrun_version>
<maven_os_plugin_version>1.7.1</maven_os_plugin_version>
<maven_protobuf_plugin_version>0.6.1</maven_protobuf_plugin_version>
- <arguments />
- <checkstyle.skip>true</checkstyle.skip>
- <checkstyle_unix.skip>true</checkstyle_unix.skip>
- <rat.skip>true</rat.skip>
- <jacoco.skip>true</jacoco.skip>
- <jprotoc_version>1.2.2</jprotoc_version>
- <protobuf-java_version>3.22.3</protobuf-java_version>
+ <protobuf-protoc_version>3.22.3</protobuf-protoc_version>
<grpc_version>1.54.0</grpc_version>
- <spotless-maven-plugin.version>2.41.0</spotless-maven-plugin.version>
+ <spotless-maven-plugin.version>2.41.1</spotless-maven-plugin.version>
<spotless.action>check</spotless.action>
<dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
<palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
