This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
from ad803e1c84 fix DubboAutoConfiguration and
DubboRelaxedBinding2AutoConfiguration init too early, (#13461)
add 849e108835 Bump com.alibaba.fastjson2:fastjson2 from 2.0.42 to 2.0.43
(#13459)
add 94725ece64 Bump com.diffplug.spotless:spotless-maven-plugin from
2.41.0 to 2.41.1 (#13460)
add b7e675940d Bump grpc.version from 1.59.0 to 1.59.1 (#13457)
add 0d879666b4 Support exclude fastjson2 or hessian2 serialization
dependencies (#13441)
add 5554706256 Fix streamobserver actual type (#13446)
add b0a36ee097 Bump org.apache.commons:commons-compress from 1.23.0 to
1.25.0 (#13485)
add 7edf187d21 Bump grpc.version from 1.59.1 to 1.60.0 (#13484)
add acc1d6f64f Bump com.ctrip.framework.apollo:apollo-mockserver from
2.1.0 to 2.2.0 (#13483)
add 8416ee4ed5 Bump org.apache.maven.plugins:maven-enforcer-plugin from
3.3.0 to 3.4.1 (#13482)
add 060f59a30f Bump org.apache.maven.plugin-tools:maven-plugin-annotations
(#13481)
add 337fc554ae Bump org.apache.maven.plugins:maven-source-plugin from
3.2.1 to 3.3.0 (#13480)
add f426a7a6b4 Bump org.apache.maven.plugins:maven-clean-plugin from 3.2.0
to 3.3.2 (#13479)
add 68ddac8755 Bump org.apache.maven.plugins:maven-assembly-plugin from
3.5.0 to 3.6.0 (#13478)
add 0d418fc40c Bump cxf_version from 3.5.5 to 3.6.2 (#13475)
add a9a3a0975f Bump org.apache.maven:maven-core from 3.9.1 to 3.9.6
(#13476)
add f2a8b2db77 Bump org.apache.avro:avro from 1.11.1 to 1.11.3 (#13486)
add 76c990f053 Bump org.apache.maven.plugins:maven-javadoc-plugin from
3.5.0 to 3.6.3 (#13473)
add f19e2c7627 Bump org.apache.commons:commons-lang3 from 3.12.0 to 3.14.0
(#13472)
add 1577a31046 Remove Kubernetes and xDS implementations (#13469)
add 787cc28ff4 Bump org.apache.avro:avro in /dubbo-dependencies-bom
(#13487)
add 43cd8ddc30 Bump org.apache.tomcat.embed:tomcat-embed-core from 8.5.87
to 8.5.96 (#13477)
add 3e2d69f80f Bump org.apache.maven.plugins:maven-plugin-plugin from
3.8.1 to 3.10.2 (#13474)
add 71a1ed3cae if SSL auth policy is set to AuthPolicy.NONE,
SslServerTlsHandler#decode should remove and return instead of printing the
error log. (#13468)
add 570cd47d9a only call DubboBootstrap.reset(); once to make the test
org.apache.dubbo.generic.GenericServiceTest faster (#13466)
add 33677c050d Bump org.apache.zookeeper:zookeeper (#13494)
new 0fccd2ccae Merge branch 'apache-3.2' into apache-3.3
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/common/constants/ProviderConstants.java | 28 --
.../PreferSerializationProvider.java} | 6 +-
.../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 | 6 +-
.../dubbo/rpc/protocol/tri/DescriptorService.java | 11 +
.../protocol/tri/ReflectionPackableMethodTest.java | 32 ++
.../SerializationScopeModelInitializer.java | 13 +-
.../support/PreferSerializationProviderImpl.java | 28 +-
...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 ---
.../java/org/apache/dubbo/registry/xds/XdsEnv.java | 22 -
.../registry/xds/XdsInitializationException.java | 28 --
.../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 -------
.../dubbo/registry/xds/util/XdsListener.java | 23 --
.../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 --
.../router/xds/XdsScopeModelInitializer.java | 39 --
.../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 +-
115 files changed, 197 insertions(+), 7732 deletions(-)
delete mode 100644
dubbo-common/src/main/java/org/apache/dubbo/common/constants/ProviderConstants.java
copy dubbo-common/src/{test/java/com/service/Service.java =>
main/java/org/apache/dubbo/common/serialization/PreferSerializationProvider.java}
(86%)
copy
dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/HeaderFilter.java =>
dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/utils/TestPreferSerializationProvider.java
(75%)
delete mode 100644 dubbo-kubernetes/pom.xml
delete mode 100644
dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesMeshEnvListener.java
delete mode 100644
dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesMeshEnvListenerFactory.java
delete mode 100644
dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesRegistry.java
delete mode 100644
dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesRegistryFactory.java
delete mode 100644
dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesServiceDiscovery.java
delete mode 100644
dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/KubernetesServiceDiscoveryFactory.java
delete mode 100644
dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/MeshConstant.java
delete mode 100644
dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/NopKubernetesMeshEnvListener.java
delete mode 100644
dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/util/KubernetesClientConst.java
delete mode 100644
dubbo-kubernetes/src/main/java/org/apache/dubbo/registry/kubernetes/util/KubernetesConfigUtils.java
delete mode 100644
dubbo-kubernetes/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory
delete mode 100644
dubbo-kubernetes/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.client.ServiceDiscoveryFactory
delete mode 100644
dubbo-kubernetes/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.mesh.route.MeshEnvListenerFactory
delete mode 100644
dubbo-kubernetes/src/test/java/org/apache/dubbo/registry/kubernetes/KubernetesServiceDiscoveryTest.java
delete mode 100644
dubbo-kubernetes/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
copy dubbo-common/src/test/java/com/service/Service.java =>
dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/DataWrapper.java
(89%)
copy
dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/SpringScopeModelInitializer.java
=>
dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/SerializationScopeModelInitializer.java
(79%)
copy
dubbo-common/src/main/java/org/apache/dubbo/common/convert/multiple/StringToListConverter.java
=>
dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/support/PreferSerializationProviderImpl.java
(51%)
create mode 100644
dubbo-serialization/dubbo-serialization-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.model.ScopeModelInitializer
delete mode 100644 dubbo-xds/pom.xml
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsCertificateSigner.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsEnv.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsInitializationException.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsRegistry.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsRegistryFactory.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsServiceDiscovery.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/XdsServiceDiscoveryFactory.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/istio/IstioCitadelCertificateSigner.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/istio/IstioConstant.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/istio/IstioEnv.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/AdsObserver.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/NodeBuilder.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/PilotExchanger.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/XdsChannel.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/XdsListener.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/BootstrapInfoImpl.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/Bootstrapper.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/BootstrapperImpl.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/CertificateProviderInfoImpl.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/bootstrap/ServerInfoImpl.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/AbstractProtocol.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/DeltaResource.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/XdsProtocol.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/delta/DeltaEndpoint.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/delta/DeltaListener.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/delta/DeltaRoute.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/EdsProtocol.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/LdsProtocol.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/RdsProtocol.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/message/Endpoint.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/message/EndpointResult.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/message/ListenerResult.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/message/RouteResult.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/EdsEndpointListener.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/EdsEndpointManager.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/RdsRouteRuleManager.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/RdsVirtualHostListener.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouteRuleListener.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouter.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouterFactory.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsScopeModelInitializer.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/ClusterWeight.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/DestinationSubset.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/HTTPRouteDestination.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/HeaderMatcher.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/HttpRequestMatch.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/LongRangeMatch.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/PathMatcher.java
delete mode 100644
dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/rule/XdsRouteRule.java
delete mode 100644 dubbo-xds/src/main/proto/ca.proto
delete mode 100644
dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory
delete mode 100644
dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.client.ServiceDiscoveryFactory
delete mode 100644
dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.xds.XdsCertificateSigner
delete mode 100644
dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.router.state.StateRouterFactory
delete mode 100644
dubbo-xds/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.model.ScopeModelInitializer
delete mode 100644
dubbo-xds/src/test/java/org/apache/dubbo/registry/xds/util/bootstrap/BootstrapperTest.java
delete mode 100644
dubbo-xds/src/test/java/org/apache/dubbo/registry/xds/util/protocol/impl/EdsProtocolMock.java
delete mode 100644
dubbo-xds/src/test/java/org/apache/dubbo/registry/xds/util/protocol/impl/LdsProtocolMock.java
delete mode 100644
dubbo-xds/src/test/java/org/apache/dubbo/registry/xds/util/protocol/impl/RdsProtocolMock.java
delete mode 100644
dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/EdsEndpointManagerTest.java
delete mode 100644
dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/RdsRouteRuleManagerTest.java
delete mode 100644
dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/RdsVirtualHostListenerTest.java
delete mode 100644
dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouteTest.java
delete mode 100644
dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/rule/HeaderMatcherTest.java
delete mode 100644
dubbo-xds/src/test/java/org/apache/dubbo/rpc/cluster/router/xds/rule/PathMatcherTest.java
