This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 9f9b3d7cb7b6478f704d1527db2a40e22d14ecf5 Merge: 1efe576197 64a1d13cc3 Author: Albumen Kevin <[email protected]> AuthorDate: Tue Nov 22 16:05:58 2022 +0800 Merge branch 'apache-3.1' into apache-3.2 # Conflicts: # dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java .github/workflows/build-and-test-pr.yml | 2 + .../common/beanutil/JavaBeanSerializeUtilTest.java | 92 +++++++++++++++++++++- .../apache/dubbo/common/utils/PojoUtilsTest.java | 2 +- .../java/org/apache/dubbo/cache/CacheTest.java | 4 +- .../dubbo/common/extension/ExtensionTest.java | 4 +- .../apache/dubbo/config/ApplicationConfigTest.java | 34 ++++---- .../apache/dubbo/config/ArgumentConfigTest.java | 10 +-- .../java/org/apache/dubbo/config/ConfigTest.java | 4 +- .../apache/dubbo/config/ConsumerConfigTest.java | 8 +- .../org/apache/dubbo/config/MethodConfigTest.java | 28 +++---- .../org/apache/dubbo/config/ModuleConfigTest.java | 18 ++--- .../apache/dubbo/config/ProtocolConfigTest.java | 32 ++++---- .../apache/dubbo/config/ProviderConfigTest.java | 40 +++++----- .../apache/dubbo/config/ReferenceConfigTest.java | 4 +- .../apache/dubbo/config/RegistryConfigTest.java | 40 +++++----- .../org/apache/dubbo/echo/EchoServiceTest.java | 4 +- .../java/org/apache/dubbo/filter/FilterTest.java | 6 +- .../apache/dubbo/generic/GenericServiceTest.java | 12 +-- .../java/org/apache/dubbo/rpc/RpcContextTest.java | 6 +- .../org/apache/dubbo/rpc/cluster/RouterTest.java | 4 +- .../dubbo/serialization/SerializationTest.java | 12 +-- .../org/apache/dubbo/config/spring/ConfigTest.java | 2 +- .../spring/schema/DubboNamespaceHandlerTest.java | 5 +- .../{transport => }/codec/CodecAdapterTest.java | 4 +- .../codec/DeprecatedExchangeCodec.java | 2 +- .../codec/DeprecatedTelnetCodec.java | 2 +- .../dubbo/remoting/codec/ExchangeCodecTest.java | 2 +- .../java/org/apache/dubbo/dependency/FileTest.java | 14 ++-- 28 files changed, 241 insertions(+), 156 deletions(-) diff --cc .github/workflows/build-and-test-pr.yml index 68a5de3680,1018219c67..8480eb1d1a --- a/.github/workflows/build-and-test-pr.yml +++ b/.github/workflows/build-and-test-pr.yml @@@ -154,9 -154,10 +154,11 @@@ jobs env: DISABLE_FILE_SYSTEM_TEST: true CURRENT_ROLE: ${{ matrix.case-role }} + DUBBO_DEFAULT_SERIALIZATION: fastjson2 steps: - uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: "Set up JDK ${{ matrix.jdk }}" uses: actions/setup-java@v3 with:
