This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.1 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 80561c1925a4857635dd8c58978c5c98d7147ed7 Merge: f9eb28cf7e 196374dca3 Author: Albumen Kevin <[email protected]> AuthorDate: Thu Jul 28 14:07:48 2022 +0800 Merge branch 'apache-3.0' into apache-3.1 .../rpc/cluster/filter/FilterChainBuilder.java | 9 +- .../apache/dubbo/common/config/Environment.java | 1 + .../dubbo/common/config/ModuleEnvironment.java | 4 + .../dubbo/common/extension/ExtensionLoader.java | 24 ++- .../java/org/apache/dubbo/common/json/JSON.java | 22 ++ .../dubbo/common/json/impl/AbstractJSONImpl.java | 238 +++++++++++++++++++++ .../dubbo/common/json/impl/FastJsonImpl.java | 3 +- .../apache/dubbo/common/json/impl/GsonImpl.java | 3 +- .../org/apache/dubbo/config/AbstractConfig.java | 2 +- .../config/context/AbstractConfigManager.java | 14 +- .../apache/dubbo/config/context/ConfigMode.java | 4 +- .../dubbo/config/context/ModuleConfigManager.java | 31 ++- .../apache/dubbo/rpc/model/ApplicationModel.java | 3 + .../org/apache/dubbo/rpc/model/FrameworkModel.java | 1 - .../org/apache/dubbo/rpc/model/ModuleModel.java | 12 +- .../org/apache/dubbo/rpc/model/ScopeModel.java | 2 +- .../org.apache.dubbo.common.context.ModuleExt | 1 + .../common/extension/ExtensionDirectorTest.java | 24 +-- .../dubbo/config/context/ConfigManagerTest.java | 48 ++++- .../ConfigurableMetadataServiceExporter.java | 9 +- .../ReferenceAnnotationBeanPostProcessor.java | 7 +- .../spring/extension/SpringExtensionInjector.java | 16 +- .../dubbo-demo-native-consumer/pom.xml | 2 +- .../dubbo-demo-native-provider/pom.xml | 2 +- .../org/apache/dubbo/metadata/MetadataInfo.java | 1 + dubbo-native-plugin/pom.xml | 2 +- .../org/apache/dubbo/qos/command/impl/Online.java | 6 +- .../telnet/support/TelnetHandlerAdapter.java | 4 +- .../telnet/support/TelnetHandlerAdapterTest.java | 4 +- .../dubbo-spring-boot-actuator/pom.xml | 16 +- .../dubbo-spring-boot-autoconfigure/pom.xml | 10 +- .../dubbo-spring-boot-compatible/actuator/pom.xml | 12 +- .../autoconfigure/pom.xml | 8 +- .../dubbo-spring-boot-starter/pom.xml | 4 +- pom.xml | 16 ++ 35 files changed, 477 insertions(+), 88 deletions(-) diff --cc dubbo-spring-boot/dubbo-spring-boot-actuator/pom.xml index fa7f3ddf2c,355b032de6..9246831edf --- a/dubbo-spring-boot/dubbo-spring-boot-actuator/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-actuator/pom.xml @@@ -108,16 -108,9 +108,16 @@@ <dependency> <groupId>org.apache.dubbo</groupId> <artifactId>dubbo-serialization-hessian2</artifactId> - <version>${revision}</version> + <version>${project.version}</version> <optional>true</optional> </dependency> + + <dependency> + <groupId>org.apache.dubbo</groupId> + <artifactId>dubbo-serialization-fastjson2</artifactId> + <version>${revision}</version> + <optional>true</optional> + </dependency> <dependency> <groupId>org.apache.dubbo</groupId>
