This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.2.0-beta.5-release in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 7bb8fd7e8cbd5b67d6c86dcbc7c95f7e76002f58 Merge: e83fea7e69 a11e639949 Author: Albumen Kevin <[email protected]> AuthorDate: Thu Feb 9 09:38:26 2023 +0800 Merge branch 'apache-3.2' into 3.2.0-beta.5-release .../alibaba/dubbo/common/extension/Activate.java | 7 + .../dubbo/common/constants/MetricsConstants.java | 2 + .../apache/dubbo/common/extension/Activate.java | 6 + .../dubbo/common/extension/ExtensionLoader.java | 309 +++++++++++++-------- .../extension/ExtensionLoader_Activate_Test.java | 25 +- .../activate/impl/ActivateOnClassExt1Impl.java | 19 +- ...he.dubbo.common.extension.activate.ActivateExt1 | 3 +- .../config/deploy/DefaultApplicationDeployer.java | 2 + dubbo-dependencies-bom/pom.xml | 10 +- .../dubbo-dependencies-zookeeper-curator5/pom.xml | 4 +- dubbo-distribution/dubbo-all/pom.xml | 17 ++ dubbo-distribution/dubbo-bom/pom.xml | 6 + .../metrics/collector/stat/MetricsStatHandler.java | 3 + .../{RequestEvent.java => ApplicationEvent.java} | 23 +- .../apache/dubbo/metrics/event/MetricsEvent.java | 12 + .../apache/dubbo/metrics/event/RequestEvent.java | 11 +- .../dubbo/metrics/model/ApplicationMetric.java | 65 +++++ .../apache/dubbo/metrics/model/MethodMetric.java | 2 +- .../model/{MetricsCategory.java => Metric.java} | 11 +- .../dubbo/metrics/model/MetricsCategory.java | 1 + .../org/apache/dubbo/metrics/model/MetricsKey.java | 1 + .../collector/AggregateMetricsCollector.java | 2 +- .../metrics/collector/DefaultMetricsCollector.java | 65 +++-- .../collector/stat/DefaultMetricsStatHandler.java | 17 +- .../collector/stat/MetricsStatComposite.java | 29 +- .../metrics/report/AbstractMetricsReporter.java | 82 +++--- .../collector/DefaultMetricsCollectorTest.java | 2 +- .../metrics/metrics/event/RequestEventTest.java | 3 +- .../prometheus/PrometheusMetricsReporter.java | 2 + .../prometheus/PrometheusMetricsReporterTest.java | 18 +- dubbo-plugin/dubbo-spring-security/pom.xml | 76 +++++ .../AuthenticationExceptionTranslatorFilter.java | 65 +++++ .../ContextHolderAuthenticationPrepareFilter.java | 52 ++++ .../ContextHolderAuthenticationResolverFilter.java | 56 ++++ ...textHolderParametersSelectedTransferFilter.java | 55 ++++ .../spring/security/utils/ObjectMapperCodec.java | 66 +++++ .../dubbo/spring/security/utils/SecurityNames.java | 17 +- .../dubbo/internal/org.apache.dubbo.rpc.Filter | 2 + ...g.apache.dubbo.rpc.cluster.filter.ClusterFilter | 2 + dubbo-plugin/pom.xml | 1 + .../metadata/MetadataServiceNameMapping.java | 4 +- .../support/CacheableFailbackRegistry.java | 36 +-- dubbo-test/dubbo-dependencies-all/pom.xml | 4 + 43 files changed, 895 insertions(+), 300 deletions(-) diff --cc dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index 85d4d5ca74,b7554db068..24fb422d0f --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml @@@ -32,9 -32,9 +32,9 @@@ <packaging>pom</packaging> <properties> - <revision>3.2.0-beta.5-SNAPSHOT</revision> + <revision>3.2.0-beta.5</revision> <maven_flatten_version>1.1.0</maven_flatten_version> - <curator_version>4.3.0</curator_version> + <curator5_version>5.1.0</curator5_version> <zookeeper_version>3.7.0</zookeeper_version> </properties>
