This is an automated email from the ASF dual-hosted git repository. songxiaosheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-spi-extensions.git
The following commit(s) were added to refs/heads/master by this push: new 45548ad Bump to 3.2.1-SNAPSHOT (#333) 45548ad is described below commit 45548ad72f79ff114c95588365021abb3f6c6bd3 Author: aofall <10182210+aof...@users.noreply.github.com> AuthorDate: Fri Apr 26 08:36:12 2024 +0800 Bump to 3.2.1-SNAPSHOT (#333) * chore: Use the revision tag to conveniently manage version * fix: build test failed * chore: manage dubbo.version * chore: upload logs if test failed * chore: setup java distribution in scenarios test * chore: setup java distribution in scenarios test * chore: setup java distribution in scenarios test * chore: manage dependencies * chore: try to fix triple class not found * chore: revert merge test result * chore: fix merge test result failed * chore: try to merge scenarios test result * chore: try to merge scenarios test result * chore: try to merge scenarios test result * chore: try to merge scenarios test result * chore: try to merge scenarios test result * bump to 3.2.1-SNAPSHOT --- .github/workflows/conformance.yml | 84 +++++++++++++++------- dobbo-doc-auto-gen/pom.xml | 2 +- dubbo-api-docs/dubbo-api-docs-annotations/pom.xml | 2 +- dubbo-api-docs/dubbo-api-docs-core/pom.xml | 2 +- .../dubbo-api-docs-examples/examples-api/pom.xml | 2 +- .../examples-provider-sca/pom.xml | 2 +- .../examples-provider/pom.xml | 2 +- dubbo-api-docs/dubbo-api-docs-examples/pom.xml | 2 +- dubbo-api-docs/pom.xml | 3 +- .../dubbo-cluster-broadcast-1/pom.xml | 2 +- .../dubbo-cluster-loadbalance-peakewma/pom.xml | 2 +- .../dubbo-cluster-polaris-dubbo2/pom.xml | 2 +- .../dubbo-cluster-router-mesh/pom.xml | 2 +- .../dubbo-cluster-specify-address-common/pom.xml | 2 +- .../dubbo-cluster-specify-address-dubbo2/pom.xml | 2 +- .../dubbo-cluster-specify-address-dubbo3/pom.xml | 2 +- dubbo-common-extensions/pom.xml | 2 +- .../dubbo-configcenter-consul/pom.xml | 2 +- .../dubbo-configcenter-etcd/pom.xml | 4 +- dubbo-cross-thread-extensions/pom.xml | 2 +- dubbo-extensions-dependencies-bom/pom.xml | 5 +- .../pom.xml | 3 +- .../dubbo-filter-polaris-ratelimit-dubbo2/pom.xml | 3 +- .../dubbo-filter-polaris-dubbo2/pom.xml | 2 +- dubbo-filter-extensions/dubbo-filter-seata/pom.xml | 2 +- .../dubbo-metadata-report-consul/pom.xml | 4 +- .../dubbo-metadata-report-etcd/pom.xml | 4 +- .../dubbo-metadata-rest/pom.xml | 2 +- dubbo-mock-extensions/dubbo-mock-admin/pom.xml | 4 +- dubbo-mock-extensions/dubbo-mock-api/pom.xml | 2 +- dubbo-mock-extensions/pom.xml | 2 +- .../dubbo-registry-consul/pom.xml | 2 +- .../dubbo-registry-dns/pom.xml | 2 +- .../dubbo-registry-etcd3/pom.xml | 4 +- .../dubbo-registry-nameservice/pom.xml | 2 +- .../dubbo-registry-polaris/pom.xml | 2 +- .../dubbo-registry-redis/pom.xml | 4 +- .../dubbo-registry-sofa/pom.xml | 2 +- .../dubbo-remoting-etcd3/pom.xml | 2 +- .../dubbo-remoting-grizzly/pom.xml | 2 +- .../dubbo-remoting-http/pom.xml | 2 +- .../dubbo-remoting-mina/pom.xml | 2 +- .../dubbo-remoting-p2p/pom.xml | 2 +- .../dubbo-remoting-quic/pom.xml | 2 +- .../dubbo-remoting-redis/pom.xml | 2 +- dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml | 4 +- dubbo-rpc-extensions/dubbo-rpc-http/pom.xml | 2 +- dubbo-rpc-extensions/dubbo-rpc-memcached/pom.xml | 2 +- .../dubbo-rpc-native-thrift/pom.xml | 2 +- dubbo-rpc-extensions/dubbo-rpc-redis/pom.xml | 2 +- dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml | 2 +- dubbo-rpc-extensions/dubbo-rpc-rmi/pom.xml | 2 +- dubbo-rpc-extensions/dubbo-rpc-rocketmq/pom.xml | 2 +- dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml | 2 +- .../dubbo-serialization-avro/pom.xml | 4 +- .../dubbo-serialization-common/pom.xml | 2 +- .../dubbo-serialization-fastjson/pom.xml | 4 +- .../dubbo-serialization-fst/pom.xml | 4 +- .../dubbo-serialization-fury/pom.xml | 2 +- .../dubbo-serialization-gson/pom.xml | 4 +- .../dubbo-serialization-jackson/pom.xml | 4 +- .../dubbo-serialization-kryo/pom.xml | 4 +- .../dubbo-serialization-msgpack/pom.xml | 2 +- .../dubbo-serialization-native-hession/pom.xml | 2 +- .../dubbo-serialization-protobuf/pom.xml | 4 +- .../dubbo-serialization-protostuff/pom.xml | 4 +- .../dubbo-serialization-test/pom.xml | 2 +- dubbo-tag-extensions/dubbo-tag-subnets/pom.xml | 2 +- pom.xml | 2 +- test/dubbo-scenario-builder/pom.xml | 6 +- test/dubbo-test-runner/pom.xml | 3 +- test/pom.xml | 16 ++++- test/scenarios/pom.xml | 9 ++- .../dubbo-serialization-avro-test/pom.xml | 13 ++-- .../dubbo-serialization-fastjson-test/pom.xml | 13 ++-- .../dubbo-serialization-fst-test/pom.xml | 11 ++- .../dubbo-serialization-gson-test/pom.xml | 13 ++-- .../dubbo-serialization-kryo-test/pom.xml | 16 ++--- .../dubbo-serialization-protobuf-test/pom.xml | 18 ++--- .../main/resources/spring/dubbo-demo-provider.xml | 2 +- .../dubbo-serialization-protostuff-test/pom.xml | 13 ++-- .../dubbo-serialization-testcase/pom.xml | 5 +- .../scenarios-dubbo-serialization/pom.xml | 9 ++- 83 files changed, 217 insertions(+), 186 deletions(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index e2a0861..48ec1b8 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -23,19 +23,20 @@ jobs: name: "Build Extensions" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: path: dubbo-spi-extensions - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo' ref: '3.0' path: dubbo - name: Set up JDK 8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: + distribution: 'zulu' java-version: 8 - - uses: actions/cache@v2 + - uses: actions/cache@v4 name: "Cache local Maven repository" with: path: ~/.m2/repository @@ -52,8 +53,8 @@ jobs: ./mvnw --batch-mode -U -e --no-transfer-progress install -am -DskipTests=true - name: "Build Scenarios" run: | - cd ./dubbo-spi-extensions/test/scenarios - ../../mvnw --batch-mode -U -e --no-transfer-progress install -am -DskipTests=true + cd ./dubbo-spi-extensions/test + ../mvnw --batch-mode -U -e --no-transfer-progress install -am -DskipTests=true prepare_test: name: "Prepare Test" @@ -62,12 +63,12 @@ jobs: #'JOB_COUNT' MUST match 'job_id' list of 'testjob' JOB_COUNT: 3 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Prepare test list run: | bash ./test/scripts/prepare-test.sh - name: Upload test list - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: test-list path: test/jobs @@ -81,24 +82,26 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8,11 ] + # use the unsafe only run on the jdk8 + java: [ 8 ] #testjob id list MUST match 'JOB_COUNT' of 'prepare_test' job_id: [ 1,2,3 ] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK ${{matrix.java}} - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: + distribution: 'zulu' java-version: ${{matrix.java}} - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-extensions-maven${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-extensions-maven - name: Download test list - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: test-list path: test/jobs/ @@ -107,30 +110,59 @@ jobs: cd test && bash ./build-test-image.sh - name: Run tests run: cd test && bash ./run-tests.sh + - name: Upload log if test failed + if: failure() + uses: actions/upload-artifact@v4 + with: + name: test-log-${{matrix.java}}-${{matrix.job_id}} + path: "**/test/scenarios/**/logs/*" - name: Upload test result if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: - name: test-result + name: test-result-${{matrix.job_id}} path: test/jobs/*-result* - test_result: + merge_test: needs: [ testjob ] - name: 'Test Result (Java${{matrix.java}})' - if: always() + name: 'Merge Test Result (Java${{matrix.java}})' runs-on: ubuntu-latest strategy: fail-fast: false matrix: - java: [ 8,11] + java: [ 8 ] env: JAVA_VER: ${{matrix.java}} steps: - - uses: actions/checkout@v2 - - name: Download test result - uses: actions/download-artifact@v2 + - name: Merge Artifacts + uses: actions/upload-artifact/merge@v4 with: - name: test-result - path: test/jobs/ - - name: Merge test result - java ${{matrix.java}} - run: ./test/scripts/merge-test-results.sh + name: Merge-test-result-Java${{matrix.java}} + separate-directories: true + pattern: test-result-* + delete-merged: true + +# test_result: +# needs: [ testjob ] +# name: 'Test Result (Java${{matrix.java}})' +# if: always() +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# java: [ 8 ] +# env: +# JAVA_VER: ${{matrix.java}} +# steps: +# - uses: actions/checkout@v4 +# - name: Download test result +# uses: actions/download-artifact@v4 +# with: +# path: test/jobs/ +# - name: Merge test result - java ${{matrix.java}} +# run: ./test/scripts/merge-test-results.sh +# - name: Upload merge test result +# uses: actions/upload-artifact@v4 +# with: +# name: merge-test-result-${{matrix.java}} +# path: test/jobs/*-result* diff --git a/dobbo-doc-auto-gen/pom.xml b/dobbo-doc-auto-gen/pom.xml index 6dc8a85..1cf5324 100644 --- a/dobbo-doc-auto-gen/pom.xml +++ b/dobbo-doc-auto-gen/pom.xml @@ -24,7 +24,7 @@ <relativePath>../pom.xml</relativePath> </parent> - <version>3.2.0</version> + <version>${revision}</version> <description>Dubbo interface documentation, testing tools</description> <artifactId>dobbo-doc-auto-gen</artifactId> diff --git a/dubbo-api-docs/dubbo-api-docs-annotations/pom.xml b/dubbo-api-docs/dubbo-api-docs-annotations/pom.xml index 494c81e..7abfe58 100644 --- a/dubbo-api-docs/dubbo-api-docs-annotations/pom.xml +++ b/dubbo-api-docs/dubbo-api-docs-annotations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-api-docs</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/dubbo-api-docs/dubbo-api-docs-core/pom.xml b/dubbo-api-docs/dubbo-api-docs-core/pom.xml index a8d18e9..7e08d77 100644 --- a/dubbo-api-docs/dubbo-api-docs-core/pom.xml +++ b/dubbo-api-docs/dubbo-api-docs-core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-api-docs</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/dubbo-api-docs/dubbo-api-docs-examples/examples-api/pom.xml b/dubbo-api-docs/dubbo-api-docs-examples/examples-api/pom.xml index 65cfa79..3e70a2a 100644 --- a/dubbo-api-docs/dubbo-api-docs-examples/examples-api/pom.xml +++ b/dubbo-api-docs/dubbo-api-docs-examples/examples-api/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.dubbo.extensions.examples.apidocs</groupId> <artifactId>dubbo-api-docs-examples</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml index 7eee42d..1bab0e5 100644 --- a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml +++ b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.dubbo.extensions.examples.apidocs</groupId> <artifactId>dubbo-api-docs-examples</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml index 02c366b..88921ce 100644 --- a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml +++ b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.dubbo.extensions.examples.apidocs</groupId> <artifactId>dubbo-api-docs-examples</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/dubbo-api-docs/dubbo-api-docs-examples/pom.xml b/dubbo-api-docs/dubbo-api-docs-examples/pom.xml index 9de82ab..b788ab9 100644 --- a/dubbo-api-docs/dubbo-api-docs-examples/pom.xml +++ b/dubbo-api-docs/dubbo-api-docs-examples/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-api-docs</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/dubbo-api-docs/pom.xml b/dubbo-api-docs/pom.xml index 92de32e..da5007f 100644 --- a/dubbo-api-docs/pom.xml +++ b/dubbo-api-docs/pom.xml @@ -25,7 +25,7 @@ </parent> <artifactId>dubbo-api-docs</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <packaging>pom</packaging> <name>${project.artifactId}</name> @@ -47,7 +47,6 @@ <disruptor.version>3.4.2</disruptor.version> <springfox.version>3.0.0</springfox.version> <nacos.version>1.4.0</nacos.version> - <dubbo.api.docs.version>3.2.0</dubbo.api.docs.version> <spring-cloud.version>Hoxton.SR8</spring-cloud.version> <spring-cloud-alibaba-dependencies.version>2.2.3.RELEASE</spring-cloud-alibaba-dependencies.version> </properties> diff --git a/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/pom.xml b/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/pom.xml index 5e863c6..507829c 100644 --- a/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/pom.xml +++ b/dubbo-cluster-extensions/dubbo-cluster-broadcast-1/pom.xml @@ -27,7 +27,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>dubbo-cluster-broadcast-1</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <packaging>jar</packaging> <dependencies> diff --git a/dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma/pom.xml b/dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma/pom.xml index adc00ad..cecf825 100644 --- a/dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma/pom.xml +++ b/dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma/pom.xml @@ -27,7 +27,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>dubbo-cluster-loadbalance-peakewma</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <packaging>jar</packaging> <dependencies> diff --git a/dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/pom.xml b/dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/pom.xml index 4e4109c..3959c3a 100644 --- a/dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/pom.xml +++ b/dubbo-cluster-extensions/dubbo-cluster-polaris-dubbo2/pom.xml @@ -28,7 +28,7 @@ <artifactId>dubbo-cluster-polaris-dubbo2</artifactId> <name>dubbo-cluster-polaris-dubbo2</name> - <version>3.2.0</version> + <version>${revision}</version> <description>Dubbo2 cluster extension for PolarisMesh, support dynamic routing capability.</description> <dependencies> diff --git a/dubbo-cluster-extensions/dubbo-cluster-router-mesh/pom.xml b/dubbo-cluster-extensions/dubbo-cluster-router-mesh/pom.xml index 94b876f..5081c1c 100644 --- a/dubbo-cluster-extensions/dubbo-cluster-router-mesh/pom.xml +++ b/dubbo-cluster-extensions/dubbo-cluster-router-mesh/pom.xml @@ -25,7 +25,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>dubbo-cluster-router-mesh</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <packaging>jar</packaging> <properties> diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-common/pom.xml b/dubbo-cluster-extensions/dubbo-cluster-specify-address-common/pom.xml index 11caf6d..68a498b 100644 --- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-common/pom.xml +++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-common/pom.xml @@ -27,7 +27,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>dubbo-cluster-specify-address-common</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <dependencies> <dependency> <groupId>org.apache.dubbo</groupId> diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/pom.xml b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/pom.xml index 46bb808..1c6a8ea 100644 --- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/pom.xml +++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo2/pom.xml @@ -27,7 +27,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>dubbo-cluster-specify-address-dubbo2</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <dependencies> <dependency> diff --git a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/pom.xml b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/pom.xml index 24451fa..ef17d3b 100644 --- a/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/pom.xml +++ b/dubbo-cluster-extensions/dubbo-cluster-specify-address-dubbo3/pom.xml @@ -27,7 +27,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>dubbo-cluster-specify-address-dubbo3</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <dependencies> <dependency> diff --git a/dubbo-common-extensions/pom.xml b/dubbo-common-extensions/pom.xml index b35a98f..1af71ba 100644 --- a/dubbo-common-extensions/pom.xml +++ b/dubbo-common-extensions/pom.xml @@ -27,6 +27,6 @@ <modelVersion>4.0.0</modelVersion> <artifactId>dubbo-common-extensions</artifactId> - <version>3.2.0</version> + <version>${revision}</version> </project> diff --git a/dubbo-configcenter-extensions/dubbo-configcenter-consul/pom.xml b/dubbo-configcenter-extensions/dubbo-configcenter-consul/pom.xml index 2b1ecbf..316a116 100644 --- a/dubbo-configcenter-extensions/dubbo-configcenter-consul/pom.xml +++ b/dubbo-configcenter-extensions/dubbo-configcenter-consul/pom.xml @@ -26,7 +26,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>dubbo-configcenter-consul</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <dependencies> <dependency> diff --git a/dubbo-configcenter-extensions/dubbo-configcenter-etcd/pom.xml b/dubbo-configcenter-extensions/dubbo-configcenter-etcd/pom.xml index 13c4c80..653fba3 100644 --- a/dubbo-configcenter-extensions/dubbo-configcenter-etcd/pom.xml +++ b/dubbo-configcenter-extensions/dubbo-configcenter-etcd/pom.xml @@ -28,7 +28,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>dubbo-configcenter-etcd</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <packaging>jar</packaging> <name>${project.artifactId}</name> <description>The etcd implementation of the config-center api</description> @@ -67,7 +67,7 @@ <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-remoting-etcd3</artifactId> - <version>3.2.0</version> + <version>${revision}</version> </dependency> </dependencies> diff --git a/dubbo-cross-thread-extensions/pom.xml b/dubbo-cross-thread-extensions/pom.xml index 2d55e94..0a8d8e9 100644 --- a/dubbo-cross-thread-extensions/pom.xml +++ b/dubbo-cross-thread-extensions/pom.xml @@ -24,7 +24,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>dubbo-cross-thread-extensions</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <packaging>jar</packaging> <properties> diff --git a/dubbo-extensions-dependencies-bom/pom.xml b/dubbo-extensions-dependencies-bom/pom.xml index 52fbaeb..32f8c27 100644 --- a/dubbo-extensions-dependencies-bom/pom.xml +++ b/dubbo-extensions-dependencies-bom/pom.xml @@ -89,8 +89,8 @@ </issueManagement> <properties> - <revision>3.2.0</revision> - <dubbo.version>3.2.9</dubbo.version> + <revision>3.2.1-SNAPSHOT</revision> + <dubbo.version>3.2.11</dubbo.version> <spring.version>5.2.9.RELEASE</spring.version> <spring-boot.version>2.4.1</spring-boot.version> @@ -145,6 +145,7 @@ <protobuf-java_version>3.25.1</protobuf-java_version> <bouncycastle-bcprov_version>1.70</bouncycastle-bcprov_version> <envoy_api_version>0.1.35</envoy_api_version> + <mockito_version>5.11.0</mockito_version> </properties> <dependencyManagement> diff --git a/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-circuitbreaker-dubbo2/pom.xml b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-circuitbreaker-dubbo2/pom.xml index 994bff6..de2c500 100644 --- a/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-circuitbreaker-dubbo2/pom.xml +++ b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-circuitbreaker-dubbo2/pom.xml @@ -21,7 +21,8 @@ <parent> <artifactId>dubbo-filter-polaris-dubbo2</artifactId> <groupId>org.apache.dubbo.extensions</groupId> - <version>3.2.0</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-ratelimit-dubbo2/pom.xml b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-ratelimit-dubbo2/pom.xml index 8172f22..e57fdad 100644 --- a/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-ratelimit-dubbo2/pom.xml +++ b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/dubbo-filter-polaris-ratelimit-dubbo2/pom.xml @@ -21,7 +21,8 @@ <parent> <artifactId>dubbo-filter-polaris-dubbo2</artifactId> <groupId>org.apache.dubbo.extensions</groupId> - <version>3.2.0</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/pom.xml b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/pom.xml index a167bba..ac5cd08 100644 --- a/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/pom.xml +++ b/dubbo-filter-extensions/dubbo-filter-polaris-dubbo2/pom.xml @@ -29,7 +29,7 @@ <artifactId>dubbo-filter-polaris-dubbo2</artifactId> <packaging>pom</packaging> <name>dubbo-filter-polaris-dubbo2</name> - <version>3.2.0</version> + <version>${revision}</version> <description>Dubbo2 filter extension for PolarisMesh, support circuitbreaking, ratelimit, metric capabilities.</description> <modules> <module>dubbo-filter-polaris-circuitbreaker-dubbo2</module> diff --git a/dubbo-filter-extensions/dubbo-filter-seata/pom.xml b/dubbo-filter-extensions/dubbo-filter-seata/pom.xml index a4cfe75..dd77702 100644 --- a/dubbo-filter-extensions/dubbo-filter-seata/pom.xml +++ b/dubbo-filter-extensions/dubbo-filter-seata/pom.xml @@ -28,7 +28,7 @@ <artifactId>dubbo-filter-seata</artifactId> <name>${project.artifactId}</name> - <version>3.2.0</version> + <version>${revision}</version> <dependencies> <dependency> diff --git a/dubbo-metadata-report-extensions/dubbo-metadata-report-consul/pom.xml b/dubbo-metadata-report-extensions/dubbo-metadata-report-consul/pom.xml index 84f7ddb..7e58ec2 100644 --- a/dubbo-metadata-report-extensions/dubbo-metadata-report-consul/pom.xml +++ b/dubbo-metadata-report-extensions/dubbo-metadata-report-consul/pom.xml @@ -26,7 +26,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <version>3.2.0</version> + <version>${revision}</version> <artifactId>dubbo-metadata-report-consul</artifactId> @@ -39,7 +39,7 @@ <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-configcenter-consul</artifactId> - <version>3.2.0</version> + <version>${revision}</version> </dependency> <dependency> <groupId>com.ecwid.consul</groupId> diff --git a/dubbo-metadata-report-extensions/dubbo-metadata-report-etcd/pom.xml b/dubbo-metadata-report-extensions/dubbo-metadata-report-etcd/pom.xml index 0a8f90e..1bf4d71 100644 --- a/dubbo-metadata-report-extensions/dubbo-metadata-report-etcd/pom.xml +++ b/dubbo-metadata-report-extensions/dubbo-metadata-report-etcd/pom.xml @@ -27,7 +27,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <version>3.2.0</version> + <version>${revision}</version> <artifactId>dubbo-metadata-report-etcd</artifactId> @@ -89,7 +89,7 @@ <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-remoting-etcd3</artifactId> - <version>3.2.0</version> + <version>${revision}</version> </dependency> <dependency> <groupId>io.etcd</groupId> diff --git a/dubbo-metadata-report-extensions/dubbo-metadata-rest/pom.xml b/dubbo-metadata-report-extensions/dubbo-metadata-rest/pom.xml index 30cecd4..e2b8f01 100644 --- a/dubbo-metadata-report-extensions/dubbo-metadata-rest/pom.xml +++ b/dubbo-metadata-report-extensions/dubbo-metadata-rest/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>dubbo-metadata-rest</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <description>The rest-metadata module of Dubbo project</description> <properties> diff --git a/dubbo-mock-extensions/dubbo-mock-admin/pom.xml b/dubbo-mock-extensions/dubbo-mock-admin/pom.xml index 7e0714c..5438ce0 100644 --- a/dubbo-mock-extensions/dubbo-mock-admin/pom.xml +++ b/dubbo-mock-extensions/dubbo-mock-admin/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>dubbo-mock-extensions</artifactId> <groupId>org.apache.dubbo.extensions</groupId> - <version>3.2.0</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -31,7 +31,7 @@ <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-mock-api</artifactId> - <version>3.2.0</version> + <version>${revision}</version> </dependency> <dependency> diff --git a/dubbo-mock-extensions/dubbo-mock-api/pom.xml b/dubbo-mock-extensions/dubbo-mock-api/pom.xml index c4cbab3..9d6196a 100644 --- a/dubbo-mock-extensions/dubbo-mock-api/pom.xml +++ b/dubbo-mock-extensions/dubbo-mock-api/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>dubbo-mock-extensions</artifactId> <groupId>org.apache.dubbo.extensions</groupId> - <version>3.2.0</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/dubbo-mock-extensions/pom.xml b/dubbo-mock-extensions/pom.xml index 5a1583d..17903cf 100644 --- a/dubbo-mock-extensions/pom.xml +++ b/dubbo-mock-extensions/pom.xml @@ -27,7 +27,7 @@ <artifactId>dubbo-mock-extensions</artifactId> <packaging>pom</packaging> - <version>3.2.0</version> + <version>${revision}</version> <modules> <module>dubbo-mock-api</module> <module>dubbo-mock-admin</module> diff --git a/dubbo-registry-extensions/dubbo-registry-consul/pom.xml b/dubbo-registry-extensions/dubbo-registry-consul/pom.xml index 45bda06..0b46a79 100644 --- a/dubbo-registry-extensions/dubbo-registry-consul/pom.xml +++ b/dubbo-registry-extensions/dubbo-registry-consul/pom.xml @@ -25,7 +25,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <version>3.2.0</version> + <version>${revision}</version> <artifactId>dubbo-registry-consul</artifactId> <properties> diff --git a/dubbo-registry-extensions/dubbo-registry-dns/pom.xml b/dubbo-registry-extensions/dubbo-registry-dns/pom.xml index b60868b..f3d528a 100644 --- a/dubbo-registry-extensions/dubbo-registry-dns/pom.xml +++ b/dubbo-registry-extensions/dubbo-registry-dns/pom.xml @@ -29,7 +29,7 @@ <artifactId>dubbo-registry-dns</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> - <version>3.2.0</version> + <version>${revision}</version> <description>The DNS registry module of Dubbo project</description> <dependencies> diff --git a/dubbo-registry-extensions/dubbo-registry-etcd3/pom.xml b/dubbo-registry-extensions/dubbo-registry-etcd3/pom.xml index 7dcbc6a..d0c5638 100644 --- a/dubbo-registry-extensions/dubbo-registry-etcd3/pom.xml +++ b/dubbo-registry-extensions/dubbo-registry-etcd3/pom.xml @@ -25,7 +25,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <version>3.2.0</version> + <version>${revision}</version> <artifactId>dubbo-registry-etcd3</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> @@ -54,7 +54,7 @@ <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-remoting-etcd3</artifactId> - <version>3.2.0</version> + <version>${revision}</version> </dependency> </dependencies> diff --git a/dubbo-registry-extensions/dubbo-registry-nameservice/pom.xml b/dubbo-registry-extensions/dubbo-registry-nameservice/pom.xml index ec42d4e..bae0e98 100644 --- a/dubbo-registry-extensions/dubbo-registry-nameservice/pom.xml +++ b/dubbo-registry-extensions/dubbo-registry-nameservice/pom.xml @@ -25,7 +25,7 @@ <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> - <version>3.2.0</version> + <version>${revision}</version> <modelVersion>4.0.0</modelVersion> <artifactId>dubbo-registry-nameservice</artifactId> <name>dubbo-registry-nameservice</name> diff --git a/dubbo-registry-extensions/dubbo-registry-polaris/pom.xml b/dubbo-registry-extensions/dubbo-registry-polaris/pom.xml index 1a06d6a..134730a 100644 --- a/dubbo-registry-extensions/dubbo-registry-polaris/pom.xml +++ b/dubbo-registry-extensions/dubbo-registry-polaris/pom.xml @@ -25,7 +25,7 @@ <artifactId>dubbo-registry-polaris</artifactId> <name>dubbo-registry-polaris</name> - <version>3.2.0</version> + <version>${revision}</version> <description>Dubbo registry extension for PolarisMesh, support instance register, discover, health-check capabilities.</description> <dependencies> diff --git a/dubbo-registry-extensions/dubbo-registry-redis/pom.xml b/dubbo-registry-extensions/dubbo-registry-redis/pom.xml index 44175b7..acf1201 100644 --- a/dubbo-registry-extensions/dubbo-registry-redis/pom.xml +++ b/dubbo-registry-extensions/dubbo-registry-redis/pom.xml @@ -23,7 +23,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <version>3.2.0</version> + <version>${revision}</version> <artifactId>dubbo-registry-redis</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> @@ -40,7 +40,7 @@ <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-remoting-redis</artifactId> - <version>3.2.0</version> + <version>${revision}</version> </dependency> <dependency> <groupId>redis.clients</groupId> diff --git a/dubbo-registry-extensions/dubbo-registry-sofa/pom.xml b/dubbo-registry-extensions/dubbo-registry-sofa/pom.xml index 30666d7..33f1725 100644 --- a/dubbo-registry-extensions/dubbo-registry-sofa/pom.xml +++ b/dubbo-registry-extensions/dubbo-registry-sofa/pom.xml @@ -24,7 +24,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <version>3.2.0</version> + <version>${revision}</version> <artifactId>dubbo-registry-sofa</artifactId> <name>${project.artifactId}</name> <description>The SOFARegistry module of Dubbo project</description> diff --git a/dubbo-remoting-extensions/dubbo-remoting-etcd3/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-etcd3/pom.xml index d989397..9aafa49 100644 --- a/dubbo-remoting-extensions/dubbo-remoting-etcd3/pom.xml +++ b/dubbo-remoting-extensions/dubbo-remoting-etcd3/pom.xml @@ -27,7 +27,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <version>3.2.0</version> + <version>${revision}</version> <artifactId>dubbo-remoting-etcd3</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> diff --git a/dubbo-remoting-extensions/dubbo-remoting-grizzly/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-grizzly/pom.xml index 9850331..8ded776 100644 --- a/dubbo-remoting-extensions/dubbo-remoting-grizzly/pom.xml +++ b/dubbo-remoting-extensions/dubbo-remoting-grizzly/pom.xml @@ -23,7 +23,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <version>3.2.0</version> + <version>${revision}</version> <artifactId>dubbo-remoting-grizzly</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> diff --git a/dubbo-remoting-extensions/dubbo-remoting-http/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-http/pom.xml index fdec3d6..721a192 100644 --- a/dubbo-remoting-extensions/dubbo-remoting-http/pom.xml +++ b/dubbo-remoting-extensions/dubbo-remoting-http/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>dubbo-remoting-http</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <packaging>jar</packaging> <name>${project.artifactId}</name> <description>The http remoting module of dubbo project</description> diff --git a/dubbo-remoting-extensions/dubbo-remoting-mina/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-mina/pom.xml index e1078d5..76a5c28 100644 --- a/dubbo-remoting-extensions/dubbo-remoting-mina/pom.xml +++ b/dubbo-remoting-extensions/dubbo-remoting-mina/pom.xml @@ -23,7 +23,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <version>3.2.0</version> + <version>${revision}</version> <artifactId>dubbo-remoting-mina</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> diff --git a/dubbo-remoting-extensions/dubbo-remoting-p2p/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-p2p/pom.xml index 758809b..75e82c5 100644 --- a/dubbo-remoting-extensions/dubbo-remoting-p2p/pom.xml +++ b/dubbo-remoting-extensions/dubbo-remoting-p2p/pom.xml @@ -23,7 +23,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <version>3.2.0</version> + <version>${revision}</version> <artifactId>dubbo-remoting-p2p</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> diff --git a/dubbo-remoting-extensions/dubbo-remoting-quic/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-quic/pom.xml index ac57007..fe08542 100644 --- a/dubbo-remoting-extensions/dubbo-remoting-quic/pom.xml +++ b/dubbo-remoting-extensions/dubbo-remoting-quic/pom.xml @@ -29,7 +29,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>dubbo-remoting-quic</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <dependencies> diff --git a/dubbo-remoting-extensions/dubbo-remoting-redis/pom.xml b/dubbo-remoting-extensions/dubbo-remoting-redis/pom.xml index 0e06641..26f76bf 100644 --- a/dubbo-remoting-extensions/dubbo-remoting-redis/pom.xml +++ b/dubbo-remoting-extensions/dubbo-remoting-redis/pom.xml @@ -23,7 +23,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <version>3.2.0</version> + <version>${revision}</version> <artifactId>dubbo-remoting-redis</artifactId> <packaging>jar</packaging> diff --git a/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml index 35680e2..5e78ad2 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml @@ -24,7 +24,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>dubbo-rpc-hessian</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <packaging>jar</packaging> <name>${project.artifactId}</name> @@ -64,7 +64,7 @@ <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-native-hession</artifactId> - <version>3.2.0</version> + <version>${revision}</version> </dependency> <dependency> <groupId>org.springframework</groupId> diff --git a/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml index d6205d3..35a6ef9 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml @@ -26,7 +26,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>dubbo-rpc-http</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <description>The JSON-RPC module of dubbo project</description> diff --git a/dubbo-rpc-extensions/dubbo-rpc-memcached/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-memcached/pom.xml index d664e88..2369ea9 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-memcached/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-memcached/pom.xml @@ -24,7 +24,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>dubbo-rpc-memcached</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <packaging>jar</packaging> <name>${project.artifactId}</name> <description>The memcached rpc module of dubbo project</description> diff --git a/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml index fddae4a..1f6b0cf 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml @@ -27,7 +27,7 @@ <packaging>jar</packaging> <name>${project.artifactId}</name> <description>The thrift rpc module of dubbo project</description> - <version>3.2.0</version> + <version>${revision}</version> <properties> <skip_maven_deploy>false</skip_maven_deploy> </properties> diff --git a/dubbo-rpc-extensions/dubbo-rpc-redis/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-redis/pom.xml index 4e13f86..259a8ad 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-redis/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-redis/pom.xml @@ -24,7 +24,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>dubbo-rpc-redis</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <packaging>jar</packaging> <name>${project.artifactId}</name> <description>The redis rpc module of dubbo project</description> diff --git a/dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml index 864682e..e8704b7 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml @@ -31,7 +31,7 @@ <packaging>jar</packaging> <name>${project.artifactId}</name> <description>The JAX-RS rpc module of dubbo project</description> - <version>3.2.0</version> + <version>${revision}</version> <properties> <skip_maven_deploy>false</skip_maven_deploy> </properties> diff --git a/dubbo-rpc-extensions/dubbo-rpc-rmi/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-rmi/pom.xml index 091ae5f..56ba6b4 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-rmi/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-rmi/pom.xml @@ -25,7 +25,7 @@ </parent> <artifactId>dubbo-rpc-rmi</artifactId> <packaging>jar</packaging> - <version>3.2.0</version> + <version>${revision}</version> <description>The rmi rpc module of dubbo project</description> <properties> <skip_maven_deploy>false</skip_maven_deploy> diff --git a/dubbo-rpc-extensions/dubbo-rpc-rocketmq/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-rocketmq/pom.xml index f63e851..d8c7ea6 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-rocketmq/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-rocketmq/pom.xml @@ -25,7 +25,7 @@ <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> - <version>3.2.0</version> + <version>${revision}</version> <artifactId>dubbo-rpc-rocketmq</artifactId> <name>dubbo-rpc-rocketmq</name> <properties> diff --git a/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml index 9a3ef75..d7b555b 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml @@ -26,7 +26,7 @@ <artifactId>dubbo-rpc-webservice</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> - <version>3.2.0</version> + <version>${revision}</version> <description>The webservice rpc module of dubbo project</description> <properties> <skip_maven_deploy>false</skip_maven_deploy> diff --git a/dubbo-serialization-extensions/dubbo-serialization-avro/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-avro/pom.xml index 20cce6f..b4c14ac 100644 --- a/dubbo-serialization-extensions/dubbo-serialization-avro/pom.xml +++ b/dubbo-serialization-extensions/dubbo-serialization-avro/pom.xml @@ -26,7 +26,7 @@ <artifactId>dubbo-serialization-avro</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> - <version>3.2.0</version> + <version>${revision}</version> <description>The avro serialization module of dubbo project</description> <properties> <skip_maven_deploy>false</skip_maven_deploy> @@ -46,7 +46,7 @@ <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-test</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <scope>test</scope> </dependency> <dependency> diff --git a/dubbo-serialization-extensions/dubbo-serialization-common/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-common/pom.xml index 7865886..3067913 100644 --- a/dubbo-serialization-extensions/dubbo-serialization-common/pom.xml +++ b/dubbo-serialization-extensions/dubbo-serialization-common/pom.xml @@ -27,7 +27,7 @@ limitations under the License. <packaging>jar</packaging> <name>${project.artifactId}</name> - <version>3.2.0</version> + <version>${revision}</version> <artifactId>dubbo-serialization-common</artifactId> <properties> diff --git a/dubbo-serialization-extensions/dubbo-serialization-fastjson/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-fastjson/pom.xml index 9569e90..c63f621 100644 --- a/dubbo-serialization-extensions/dubbo-serialization-fastjson/pom.xml +++ b/dubbo-serialization-extensions/dubbo-serialization-fastjson/pom.xml @@ -27,7 +27,7 @@ limitations under the License. <artifactId>dubbo-serialization-fastjson</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> - <version>3.2.0</version> + <version>${revision}</version> <description>The fastjson serialization module of dubbo project</description> <properties> <skip_maven_deploy>false</skip_maven_deploy> @@ -36,7 +36,7 @@ limitations under the License. <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-common</artifactId> - <version>3.2.0</version> + <version>${revision}</version> </dependency> <dependency> <groupId>org.apache.dubbo</groupId> diff --git a/dubbo-serialization-extensions/dubbo-serialization-fst/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-fst/pom.xml index 761157d..84828b5 100644 --- a/dubbo-serialization-extensions/dubbo-serialization-fst/pom.xml +++ b/dubbo-serialization-extensions/dubbo-serialization-fst/pom.xml @@ -26,7 +26,7 @@ <artifactId>dubbo-serialization-fst</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> - <version>3.2.0</version> + <version>${revision}</version> <description>The fst serialization module of dubbo project</description> <properties> <skip_maven_deploy>false</skip_maven_deploy> @@ -44,7 +44,7 @@ <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-test</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <scope>test</scope> </dependency> <dependency> diff --git a/dubbo-serialization-extensions/dubbo-serialization-fury/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-fury/pom.xml index 26b6726..665c9cf 100644 --- a/dubbo-serialization-extensions/dubbo-serialization-fury/pom.xml +++ b/dubbo-serialization-extensions/dubbo-serialization-fury/pom.xml @@ -29,7 +29,7 @@ limitations under the License. <artifactId>dubbo-serialization-fury</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> - <version>3.2.0</version> + <version>${revision}</version> <properties> <maven.compiler.source>17</maven.compiler.source> diff --git a/dubbo-serialization-extensions/dubbo-serialization-gson/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-gson/pom.xml index e20a640..5f62932 100644 --- a/dubbo-serialization-extensions/dubbo-serialization-gson/pom.xml +++ b/dubbo-serialization-extensions/dubbo-serialization-gson/pom.xml @@ -26,7 +26,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more <artifactId>dubbo-serialization-gson</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> - <version>3.2.0</version> + <version>${revision}</version> <description>The GSON serialization implement for dubbo</description> <properties> <skip_maven_deploy>false</skip_maven_deploy> @@ -45,7 +45,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-common</artifactId> - <version>3.2.0</version> + <version>${revision}</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> diff --git a/dubbo-serialization-extensions/dubbo-serialization-jackson/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-jackson/pom.xml index 36491f7..48c09f9 100644 --- a/dubbo-serialization-extensions/dubbo-serialization-jackson/pom.xml +++ b/dubbo-serialization-extensions/dubbo-serialization-jackson/pom.xml @@ -27,7 +27,7 @@ <artifactId>dubbo-serialization-jackson</artifactId> <description>The jackson serialization module of dubbo project</description> - <version>3.2.0</version> + <version>${revision}</version> <properties> <maven.compiler.source>1.8</maven.compiler.source> @@ -44,7 +44,7 @@ <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-common</artifactId> - <version>3.2.0</version> + <version>${revision}</version> </dependency> <dependency> <groupId>org.apache.dubbo</groupId> diff --git a/dubbo-serialization-extensions/dubbo-serialization-kryo/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-kryo/pom.xml index efb06e0..776d958 100644 --- a/dubbo-serialization-extensions/dubbo-serialization-kryo/pom.xml +++ b/dubbo-serialization-extensions/dubbo-serialization-kryo/pom.xml @@ -27,7 +27,7 @@ limitations under the License. <artifactId>dubbo-serialization-kryo</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> - <version>3.2.0</version> + <version>${revision}</version> <description>The kryo serialization module of dubbo project</description> <properties> <skip_maven_deploy>false</skip_maven_deploy> @@ -47,7 +47,7 @@ limitations under the License. <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-test</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <scope>test</scope> </dependency> <dependency> diff --git a/dubbo-serialization-extensions/dubbo-serialization-msgpack/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-msgpack/pom.xml index ebb9d33..feefa06 100644 --- a/dubbo-serialization-extensions/dubbo-serialization-msgpack/pom.xml +++ b/dubbo-serialization-extensions/dubbo-serialization-msgpack/pom.xml @@ -25,7 +25,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more <relativePath>../pom.xml</relativePath> </parent> <artifactId>dubbo-serialization-msgpack</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <packaging>jar</packaging> <name>${project.artifactId}</name> <description>The Msgpack serialization implement for dubbo</description> diff --git a/dubbo-serialization-extensions/dubbo-serialization-native-hession/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-native-hession/pom.xml index 0896d5c..a13e3ed 100644 --- a/dubbo-serialization-extensions/dubbo-serialization-native-hession/pom.xml +++ b/dubbo-serialization-extensions/dubbo-serialization-native-hession/pom.xml @@ -25,7 +25,7 @@ limitations under the License. </parent> <artifactId>dubbo-serialization-native-hession</artifactId> - <version>3.2.0</version> + <version>${revision}</version> <packaging>jar</packaging> <name>${project.artifactId}</name> <description>The native-hession serialization module of dubbo project</description> diff --git a/dubbo-serialization-extensions/dubbo-serialization-protobuf/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-protobuf/pom.xml index 68a08b4..a85dfa5 100644 --- a/dubbo-serialization-extensions/dubbo-serialization-protobuf/pom.xml +++ b/dubbo-serialization-extensions/dubbo-serialization-protobuf/pom.xml @@ -26,7 +26,7 @@ limitations under the License. <artifactId>dubbo-serialization-protobuf</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> - <version>3.2.0</version> + <version>${revision}</version> <description>The protobuf serialization module of dubbo project</description> <properties> <skip_maven_deploy>false</skip_maven_deploy> @@ -51,12 +51,10 @@ limitations under the License. <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>3.16.3</version> </dependency> <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java-util</artifactId> - <version>3.11.0</version> </dependency> </dependencies> diff --git a/dubbo-serialization-extensions/dubbo-serialization-protostuff/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-protostuff/pom.xml index af9c70c..63c1abc 100644 --- a/dubbo-serialization-extensions/dubbo-serialization-protostuff/pom.xml +++ b/dubbo-serialization-extensions/dubbo-serialization-protostuff/pom.xml @@ -28,7 +28,7 @@ limitations under the License. <artifactId>dubbo-serialization-protostuff</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> - <version>3.2.0</version> + <version>${revision}</version> <description>The protostuff serialization module of dubbo project</description> <properties> @@ -49,7 +49,7 @@ limitations under the License. <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-test</artifactId> - <version>3.2.0</version> + <version>${revision}</version> </dependency> <dependency> <groupId>io.protostuff</groupId> diff --git a/dubbo-serialization-extensions/dubbo-serialization-test/pom.xml b/dubbo-serialization-extensions/dubbo-serialization-test/pom.xml index 06b8e1c..971aba9 100644 --- a/dubbo-serialization-extensions/dubbo-serialization-test/pom.xml +++ b/dubbo-serialization-extensions/dubbo-serialization-test/pom.xml @@ -28,7 +28,7 @@ <artifactId>dubbo-serialization-test</artifactId> <packaging>jar</packaging> <name>${project.artifactId}</name> - <version>3.2.0</version> + <version>${revision}</version> <description>The test serialization module of dubbo project</description> <properties> <skip_maven_deploy>true</skip_maven_deploy> diff --git a/dubbo-tag-extensions/dubbo-tag-subnets/pom.xml b/dubbo-tag-extensions/dubbo-tag-subnets/pom.xml index 08e0bb6..21fe496 100644 --- a/dubbo-tag-extensions/dubbo-tag-subnets/pom.xml +++ b/dubbo-tag-extensions/dubbo-tag-subnets/pom.xml @@ -24,7 +24,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <version>3.2.0</version> + <version>${revision}</version> <artifactId>dubbo-tag-subnets</artifactId> <name>${project.artifactId}</name> <description>The tag subnets module of dubbo project</description> diff --git a/pom.xml b/pom.xml index 324fd8a..dc8651f 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ </modules> <properties> - <revision>3.2.0</revision> + <revision>3.2.1-SNAPSHOT</revision> <!-- Test libs --> <junit_jupiter_version>5.9.3</junit_jupiter_version> <junit_platform_commons>1.9.3</junit_platform_commons> diff --git a/test/dubbo-scenario-builder/pom.xml b/test/dubbo-scenario-builder/pom.xml index 7aa63b7..11ef061 100644 --- a/test/dubbo-scenario-builder/pom.xml +++ b/test/dubbo-scenario-builder/pom.xml @@ -18,10 +18,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>dubbo-extensions-test</artifactId> <groupId>org.apache.dubbo.extensions</groupId> - <version>3.2.0</version> + <artifactId>dubbo-extensions-test</artifactId> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> + <modelVersion>4.0.0</modelVersion> <artifactId>dubbo-scenario-builder</artifactId> diff --git a/test/dubbo-test-runner/pom.xml b/test/dubbo-test-runner/pom.xml index ed8e113..fd4d09f 100644 --- a/test/dubbo-test-runner/pom.xml +++ b/test/dubbo-test-runner/pom.xml @@ -20,7 +20,8 @@ <parent> <artifactId>dubbo-extensions-test</artifactId> <groupId>org.apache.dubbo.extensions</groupId> - <version>3.2.0</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/test/pom.xml b/test/pom.xml index a6ee919..93eb50f 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -20,20 +20,30 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.dubbo.extensions</groupId> + <parent> + <groupId>org.apache.dubbo.extensions</groupId> + <artifactId>extensions-parent</artifactId> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>dubbo-extensions-test</artifactId> <packaging>pom</packaging> - <version>3.2.0</version> + <version>${revision}</version> <modules> <module>dubbo-test-runner</module> <module>dubbo-scenario-builder</module> + <module>scenarios</module> </modules> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> + <dubbo.version>3.2.11</dubbo.version> + <junit.version>4.13.1</junit.version> + <spring.version>4.3.30.RELEASE</spring.version> </properties> + </project> diff --git a/test/scenarios/pom.xml b/test/scenarios/pom.xml index 396c611..e50413d 100644 --- a/test/scenarios/pom.xml +++ b/test/scenarios/pom.xml @@ -17,11 +17,16 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.dubbo.extensions</groupId> + <artifactId>dubbo-extensions-test</artifactId> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> + </parent> - <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-scenarios</artifactId> <packaging>pom</packaging> - <version>3.2.0</version> + <version>${revision}</version> <modules> <module>scenarios-dubbo-serialization</module> diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-avro-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-avro-test/pom.xml index 50efbef..8a74377 100644 --- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-avro-test/pom.xml +++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-avro-test/pom.xml @@ -18,9 +18,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>scenarios-dubbo-serialization</artifactId> <groupId>org.apache.dubbo.extensions</groupId> - <version>3.2.0</version> + <artifactId>scenarios-dubbo-serialization</artifactId> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>dubbo-serialization-avro-test</artifactId> @@ -28,10 +29,6 @@ <properties> <source.level>1.8</source.level> <target.level>1.8</target.level> - <dubbo.version>3.0.4</dubbo.version> - <junit.version>4.13.1</junit.version> - <spring.version>4.3.30.RELEASE</spring.version> - <dubbo.serialization.version>3.2.0</dubbo.serialization.version> <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version> </properties> @@ -95,13 +92,13 @@ <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-avro</artifactId> - <version>${dubbo.serialization.version}</version> + <version>${revision}</version> </dependency> <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-testcase</artifactId> - <version>${project.version}</version> + <version>${revision}</version> </dependency> </dependencies> diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fastjson-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fastjson-test/pom.xml index bc89ad9..3444299 100644 --- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fastjson-test/pom.xml +++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fastjson-test/pom.xml @@ -18,9 +18,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>scenarios-dubbo-serialization</artifactId> <groupId>org.apache.dubbo.extensions</groupId> - <version>3.2.0</version> + <artifactId>scenarios-dubbo-serialization</artifactId> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -29,11 +30,7 @@ <properties> <source.level>1.8</source.level> <target.level>1.8</target.level> - <junit.version>4.13.1</junit.version> - <spring.version>5.3.25</spring.version> - <dubbo.serialization.version>3.2.0</dubbo.serialization.version> <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version> - <dubbo.version>3.2.10</dubbo.version> </properties> @@ -68,13 +65,13 @@ <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-fastjson</artifactId> - <version>${dubbo.serialization.version}</version> + <version>${revision}</version> </dependency> <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-testcase</artifactId> - <version>${project.version}</version> + <version>${revision}</version> </dependency> </dependencies> diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fst-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fst-test/pom.xml index 1db032b..6e6a6d5 100644 --- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fst-test/pom.xml +++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-fst-test/pom.xml @@ -18,9 +18,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>scenarios-dubbo-serialization</artifactId> <groupId>org.apache.dubbo.extensions</groupId> - <version>3.2.0</version> + <artifactId>scenarios-dubbo-serialization</artifactId> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -29,10 +30,6 @@ <properties> <source.level>1.8</source.level> <target.level>1.8</target.level> - <dubbo.version>3.0.4</dubbo.version> - <junit.version>4.13.1</junit.version> - <spring.version>4.3.30.RELEASE</spring.version> - <dubbo.serialization.version>3.2.0</dubbo.serialization.version> <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version> </properties> @@ -96,7 +93,7 @@ <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-fst</artifactId> - <version>${dubbo.serialization.version}</version> + <version>${revision}</version> <exclusions> <exclusion> <artifactId>jackson-core</artifactId> diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-gson-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-gson-test/pom.xml index 510e0da..c5e1615 100644 --- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-gson-test/pom.xml +++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-gson-test/pom.xml @@ -18,9 +18,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>scenarios-dubbo-serialization</artifactId> <groupId>org.apache.dubbo.extensions</groupId> - <version>3.2.0</version> + <artifactId>scenarios-dubbo-serialization</artifactId> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -29,10 +30,6 @@ <properties> <source.level>1.8</source.level> <target.level>1.8</target.level> - <dubbo.version>3.0.4</dubbo.version> - <junit.version>4.13.1</junit.version> - <spring.version>4.3.30.RELEASE</spring.version> - <dubbo.serialization.version>3.2.0</dubbo.serialization.version> <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version> </properties> @@ -96,13 +93,13 @@ <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-gson</artifactId> - <version>${dubbo.serialization.version}</version> + <version>${revision}</version> </dependency> <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-testcase</artifactId> - <version>${project.version}</version> + <version>${revision}</version> </dependency> </dependencies> diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-kryo-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-kryo-test/pom.xml index 0b68826..8855774 100644 --- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-kryo-test/pom.xml +++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-kryo-test/pom.xml @@ -18,9 +18,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>scenarios-dubbo-serialization</artifactId> <groupId>org.apache.dubbo.extensions</groupId> - <version>3.2.0</version> + <artifactId>scenarios-dubbo-serialization</artifactId> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -29,11 +30,6 @@ <properties> <source.level>1.8</source.level> <target.level>1.8</target.level> - <dubbo.version>3.0.4</dubbo.version> - <junit.version>4.13.1</junit.version> - <spring.version>4.3.30.RELEASE</spring.version> - <dubbo.extensions.version>3.2.0</dubbo.extensions.version> - <dubbo.serialization.version>3.2.0</dubbo.serialization.version> <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version> </properties> @@ -50,7 +46,7 @@ <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-extensions-dependencies-bom</artifactId> - <version>${dubbo.extensions.version}</version> + <version>${revision}</version> <type>pom</type> <scope>import</scope> </dependency> @@ -105,13 +101,13 @@ <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-kryo</artifactId> - <version>${dubbo.serialization.version}</version> + <version>${revision}</version> </dependency> <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-testcase</artifactId> - <version>${project.version}</version> + <version>${revision}</version> </dependency> </dependencies> diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protobuf-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protobuf-test/pom.xml index 925439b..768a362 100644 --- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protobuf-test/pom.xml +++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protobuf-test/pom.xml @@ -18,9 +18,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>scenarios-dubbo-serialization</artifactId> <groupId>org.apache.dubbo.extensions</groupId> - <version>3.2.0</version> + <artifactId>scenarios-dubbo-serialization</artifactId> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -29,11 +30,6 @@ <properties> <source.level>1.8</source.level> <target.level>1.8</target.level> - <dubbo.version>3.0.4</dubbo.version> - <junit.version>4.13.1</junit.version> - <spring.version>4.3.30.RELEASE</spring.version> - <dubbo.compiler.version>0.0.2</dubbo.compiler.version> - <dubbo.serialization.version>3.2.0</dubbo.serialization.version> <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version> </properties> @@ -97,7 +93,7 @@ <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-protobuf</artifactId> - <version>${dubbo.serialization.version}</version> + <version>${revision}</version> </dependency> </dependencies> @@ -168,11 +164,11 @@ <clearOutputDirectory>false</clearOutputDirectory> <protocPlugins> <protocPlugin> - <id>dubbo</id> + <id>dubbo-triple</id> <groupId>org.apache.dubbo</groupId> <artifactId>dubbo-compiler</artifactId> - <version>${dubbo.compiler.version}</version> - <mainClass>org.apache.dubbo.gen.dubbo.Dubbo3Generator</mainClass> + <version>${dubbo.version}</version> + <mainClass>org.apache.dubbo.gen.tri.Dubbo3TripleGenerator</mainClass> </protocPlugin> </protocPlugins> </configuration> diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protobuf-test/src/main/resources/spring/dubbo-demo-provider.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protobuf-test/src/main/resources/spring/dubbo-demo-provider.xml index a0fa283..d11b407 100644 --- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protobuf-test/src/main/resources/spring/dubbo-demo-provider.xml +++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protobuf-test/src/main/resources/spring/dubbo-demo-provider.xml @@ -30,6 +30,6 @@ <bean id="demoService" class="org.apache.dubbo.test.serialization.protobuf.DemoServiceImpl"/> <dubbo:service interface="org.apache.dubbo.test.serialization.protobuf.DemoService" ref="demoService" - serialization="protobuf"/> + serialization="protobuf-json"/> </beans> diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protostuff-test/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protostuff-test/pom.xml index a088977..2bd5324 100644 --- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protostuff-test/pom.xml +++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-protostuff-test/pom.xml @@ -18,9 +18,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>scenarios-dubbo-serialization</artifactId> <groupId>org.apache.dubbo.extensions</groupId> - <version>3.2.0</version> + <artifactId>scenarios-dubbo-serialization</artifactId> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -29,10 +30,6 @@ <properties> <source.level>1.8</source.level> <target.level>1.8</target.level> - <dubbo.version>3.0.4</dubbo.version> - <junit.version>4.13.1</junit.version> - <spring.version>4.3.30.RELEASE</spring.version> - <dubbo.serialization.version>3.2.0</dubbo.serialization.version> <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version> </properties> @@ -96,13 +93,13 @@ <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-protostuff</artifactId> - <version>${dubbo.serialization.version}</version> + <version>${revision}</version> </dependency> <dependency> <groupId>org.apache.dubbo.extensions</groupId> <artifactId>dubbo-serialization-testcase</artifactId> - <version>${project.version}</version> + <version>${revision}</version> </dependency> </dependencies> diff --git a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-testcase/pom.xml b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-testcase/pom.xml index 7dc5792..da3859d 100644 --- a/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-testcase/pom.xml +++ b/test/scenarios/scenarios-dubbo-serialization/dubbo-serialization-testcase/pom.xml @@ -18,9 +18,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>scenarios-dubbo-serialization</artifactId> <groupId>org.apache.dubbo.extensions</groupId> - <version>3.2.0</version> + <artifactId>scenarios-dubbo-serialization</artifactId> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/test/scenarios/scenarios-dubbo-serialization/pom.xml b/test/scenarios/scenarios-dubbo-serialization/pom.xml index 2bd6124..37ea2af 100644 --- a/test/scenarios/scenarios-dubbo-serialization/pom.xml +++ b/test/scenarios/scenarios-dubbo-serialization/pom.xml @@ -18,12 +18,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <artifactId>dubbo-scenarios</artifactId> <groupId>org.apache.dubbo.extensions</groupId> - <version>3.2.0</version> + <artifactId>dubbo-scenarios</artifactId> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>scenarios-dubbo-serialization</artifactId> <packaging>pom</packaging> + <modules> <module>dubbo-serialization-avro-test</module> <module>dubbo-serialization-gson-test</module> @@ -34,7 +38,6 @@ <module>dubbo-serialization-protostuff-test</module> <module>dubbo-serialization-testcase</module> </modules> - <artifactId>scenarios-dubbo-serialization</artifactId> <properties> <maven.compiler.source>8</maven.compiler.source>