This is an automated email from the ASF dual-hosted git repository. crazyhzm pushed a commit to branch 3.3 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 71cc51bf69df6bcef5222fd95ab8d8fe2f805c6d Merge: a80ad7f505 2e1fcef156 Author: crazyhzm <[email protected]> AuthorDate: Wed May 17 14:07:55 2023 +0800 Merge branch '3.2' into 3.3 # Conflicts: # dubbo-dependencies-bom/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml # pom.xml .artifacts | 1 + .../dubbo/common/utils/ConcurrentHashMapUtils.java | 18 ++++- .../utils/SerializeSecurityConfigurator.java | 20 +++++- .../common/utils/SerializeSecurityManager.java | 16 +++-- .../org/apache/dubbo/config/MetricsConfig.java | 13 ++++ .../apache/dubbo/config/nested/ExporterConfig.java | 70 ++++++++++++++++++- .../dubbo/config/nested/PrometheusConfig.java | 26 -------- .../main/resources/security/serialize.allowlist | 5 ++ .../src/test/java/com/service/Params.java | 17 +++-- .../src/test/java/com/service/Service.java | 24 +++++++ .../src/test/java/com/service/User.java | 43 +++++++----- .../src/test/java/com/service/UserService.java | 24 +++++++ .../common/utils/ConcurrentHashMapUtilsTest.java | 29 ++++++++ .../utils/SerializeSecurityConfiguratorTest.java | 26 ++++++++ dubbo-config/dubbo-config-api/pom.xml | 2 +- .../org/apache/dubbo/config/MetricsConfigTest.java | 4 -- .../dubbo/config/nested/PrometheusConfigTest.java | 6 +- .../src/main/resources/META-INF/dubbo.xsd | 10 --- .../configprops/SpringBootConfigPropsTest.java | 4 -- .../spring/isolation/api/ApiIsolationTest.java | 3 + .../metrics/SpringBootConfigMetricsTest.java | 4 -- .../spring/schema/DubboNamespaceHandlerTest.java | 4 -- .../dubbo/config/spring/metrics-prometheus.xml | 2 +- .../dubbo-demo-native-consumer/pom.xml | 2 +- .../dubbo-demo-native-provider/pom.xml | 2 +- dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +- dubbo-demo/pom.xml | 12 ---- dubbo-dependencies-bom/pom.xml | 16 ++--- .../dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +- .../dubbo-dependencies-zookeeper/pom.xml | 2 +- dubbo-distribution/dubbo-bom/pom.xml | 5 ++ .../kubernetes/util/KubernetesConfigUtils.java | 64 +++++++++--------- .../kubernetes/KubernetesServiceDiscoveryTest.java | 1 + .../apache/dubbo/metrics/model/MetricsSupport.java | 72 ++++++++++---------- .../dubbo/metrics/MetricsGlobalRegistry.java | 31 ++++++++- .../collector/AggregateMetricsCollector.java | 5 +- .../collector/HistogramMetricsCollector.java | 2 +- .../dubbo/metrics/event/DefaultSubDispatcher.java | 9 +-- .../metrics/report/AbstractMetricsReporter.java | 2 +- .../dubbo/metrics/filter/MetricsFilterTest.java | 18 ++++- .../prometheus/PrometheusMetricsReporterTest.java | 2 - .../PrometheusMetricsThreadPoolTest.java | 2 - .../dubbo/qos/command/impl/InvokeTelnet.java | 22 +++++- .../java/org/apache/dubbo/registry/Constants.java | 2 + .../registry/integration/RegistryDirectory.java | 11 +-- .../registry/integration/RegistryProtocol.java | 18 +++-- .../rpc/protocol/ProtocolSecurityWrapper.java | 11 +-- .../dubbo/rpc/protocol/dubbo/DubboCodec.java | 9 ++- .../rpc/protocol/rest/constans/RestConstant.java | 2 +- .../rest/exception/mapper/ExceptionMapper.java | 19 +++++- .../rpc/protocol/rest/message/codec/JsonCodec.java | 5 +- .../{JsonCodec.java => ResteasyResponseCodec.java} | 65 +++++++++++------- ...ubbo.rpc.protocol.rest.message.HttpMessageCodec | 1 + .../rpc/protocol/rest/ResteasyResponseTest.java | 78 ++++++++++++++++++++++ .../rpc/protocol/rest/rest/RestDemoService.java | 5 ++ .../protocol/rest/rest/RestDemoServiceImpl.java | 13 +++- .../hessian2/Hessian2SerializerFactory.java | 20 ++++-- .../DubboMetricsAutoConfiguration.java | 7 +- .../boot/actuate/mertics/DubboMetricsBinder.java | 16 ++--- .../autoconfigure/pom.xml | 11 ++- .../autoconfigure/ObservabilityUtils.java | 1 + .../exporter/otlp/OtlpAutoConfiguration.java | 64 ++++++++++++++++++ .../src/main/resources/META-INF/spring.factories | 3 +- ...rk.boot.autoconfigure.AutoConfiguration.imports | 3 +- .../pom.xml | 54 ++++++--------- .../pom.xml | 7 +- dubbo-test/dubbo-dependencies-all/pom.xml | 5 ++ dubbo-test/pom.xml | 12 ---- pom.xml | 6 +- 69 files changed, 766 insertions(+), 326 deletions(-) diff --cc dubbo-config/dubbo-config-api/pom.xml index 23a642faf0,bd2b6b2422..dd24abf9ec --- a/dubbo-config/dubbo-config-api/pom.xml +++ b/dubbo-config/dubbo-config-api/pom.xml @@@ -229,8 -229,10 +229,8 @@@ <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> - <version>1.18.0</version> + <version>1.18.1</version> <scope>test</scope> </dependency> - - </dependencies> </project> diff --cc dubbo-dependencies-bom/pom.xml index 886eff0a60,bbb2980506..ea7df07f06 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@@ -188,9 -188,9 +188,9 @@@ <jsonrpc_version>1.6</jsonrpc_version> <mortbay_jetty_version>6.1.26</mortbay_jetty_version> <portlet_version>2.0</portlet_version> - <maven_flatten_version>1.4.1</maven_flatten_version> + <maven_flatten_version>1.5.0</maven_flatten_version> <commons_compress_version>1.23.0</commons_compress_version> - <revision>3.2.2-SNAPSHOT</revision> + <revision>3.3.0-beta.1-SNAPSHOT</revision> </properties> <dependencyManagement> diff --cc dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index d7e52b7e21,9f706c7697..41913dc5fd --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml @@@ -32,8 -32,8 +32,8 @@@ <packaging>pom</packaging> <properties> - <revision>3.2.2-SNAPSHOT</revision> + <revision>3.3.0-beta.1-SNAPSHOT</revision> - <maven_flatten_version>1.4.1</maven_flatten_version> + <maven_flatten_version>1.5.0</maven_flatten_version> <curator5_version>5.1.0</curator5_version> <zookeeper_version>3.8.1</zookeeper_version> </properties> diff --cc dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml index e24d465495,7e4361c69f..678de29e88 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml @@@ -32,8 -32,8 +32,8 @@@ <packaging>pom</packaging> <properties> - <revision>3.2.2-SNAPSHOT</revision> + <revision>3.3.0-beta.1-SNAPSHOT</revision> - <maven_flatten_version>1.4.1</maven_flatten_version> + <maven_flatten_version>1.5.0</maven_flatten_version> <curator_version>4.3.0</curator_version> <zookeeper_version>3.4.14</zookeeper_version> </properties> diff --cc pom.xml index 923ca6577e,bb9409a204..c6e8b020fb --- a/pom.xml +++ b/pom.xml @@@ -122,10 -122,9 +122,10 @@@ <maven_jetty_version>9.4.51.v20230217</maven_jetty_version> <maven_checkstyle_version>3.2.1</maven_checkstyle_version> <maven_jacoco_version>0.8.10</maven_jacoco_version> - <maven_flatten_version>1.4.1</maven_flatten_version> + <maven_flatten_version>1.5.0</maven_flatten_version> <maven_enforce_version>3.3.0</maven_enforce_version> <maven_antrun_version>3.1.0</maven_antrun_version> + <dubbo_annotation_processor_version>1.0.0</dubbo_annotation_processor_version> <maven_os_plugin_version>1.7.1</maven_os_plugin_version> <maven_protobuf_plugin_version>0.6.1</maven_protobuf_plugin_version> <arguments />
