This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push: new 95d438ea Add jdk 17 support (#650) 95d438ea is described below commit 95d438ea888c31c1f5568bff48caaf2c0dc4965a Author: Albumen Kevin <jhq0...@gmail.com> AuthorDate: Wed Dec 21 16:15:03 2022 +0800 Add jdk 17 support (#650) --- .github/workflows/dubbo-3_2.yml | 11 +++++------ 1-basic/dubbo-samples-annotation/case-versions.conf | 3 ++- 1-basic/dubbo-samples-annotation/pom.xml | 4 ++-- 1-basic/dubbo-samples-api/case-versions.conf | 1 + 1-basic/dubbo-samples-api/pom.xml | 4 ++-- 1-basic/dubbo-samples-basic/case-versions.conf | 1 + 1-basic/dubbo-samples-basic/pom.xml | 4 ++-- .../dubbo-samples-async-generated-future/case-versions.conf | 1 + .../dubbo-samples-async-onerror/case-versions.conf | 1 + .../dubbo-samples-async-original-future/case-versions.conf | 1 + .../dubbo-samples-async-provider/case-versions.conf | 1 + .../dubbo-samples-async-simple/case-versions.conf | 1 + 2-advanced/dubbo-samples-attachment/case-versions.conf | 1 + 2-advanced/dubbo-samples-autowire/case-versions.conf | 1 + 2-advanced/dubbo-samples-cache/case-versions.conf | 1 + 2-advanced/dubbo-samples-callback/case-versions.conf | 1 + 2-advanced/dubbo-samples-chain/case-versions.conf | 1 + .../dubbo-call-sc/case-versions.conf | 3 ++- .../dubbo-call-scdubbo/case-versions.conf | 3 ++- .../dubbo-demo-servicediscovery-xml/case-versions.conf | 3 ++- .../dubbo-servicediscovery-migration/case-versions.conf | 3 ++- .../sc-call-dubbo/case-versions.conf | 3 ++- .../servicediscovery-transfer/case-versions.conf | 3 ++- 2-advanced/dubbo-samples-compatible/case-versions.conf | 1 + 2-advanced/dubbo-samples-context/case-versions.conf | 1 + 2-advanced/dubbo-samples-direct/case-versions.conf | 1 + 2-advanced/dubbo-samples-docker/case-versions.conf | 1 + 2-advanced/dubbo-samples-echo/case-versions.conf | 1 + 2-advanced/dubbo-samples-environment-keys/case-versions.conf | 1 + .../dubbo-samples-generic-call/case-versions.conf | 1 + .../dubbo-samples-generic-impl/case-versions.conf | 1 + .../dubbo-samples-generic-type/case-versions.conf | 1 + 2-advanced/dubbo-samples-group/case-versions.conf | 1 + 2-advanced/dubbo-samples-local/case-versions.conf | 1 + 2-advanced/dubbo-samples-merge/case-versions.conf | 1 + .../case-versions.conf | 1 + .../dubbo-samples-migration-case-default/case-versions.conf | 1 + 2-advanced/dubbo-samples-mock/case-versions.conf | 1 + 2-advanced/dubbo-samples-notify/case-versions.conf | 1 + 2-advanced/dubbo-samples-scala/case-versions.conf | 1 + 2-advanced/dubbo-samples-spi-compatible/case-versions.conf | 1 + 2-advanced/dubbo-samples-stub/case-versions.conf | 1 + 2-advanced/dubbo-samples-tengine/case-versions.conf | 1 + 2-advanced/dubbo-samples-transaction/case-versions.conf | 1 + 2-advanced/dubbo-samples-validation/case-versions.conf | 1 + 2-advanced/dubbo-samples-version/case-versions.conf | 1 + .../dubbo-samples-configcenter-annotation/case-versions.conf | 1 + .../dubbo-samples-configcenter-api/case-versions.conf | 1 + .../dubbo-samples-configcenter-apollo/case-versions.conf | 1 + .../case-versions.conf | 1 + .../case-versions.conf | 1 + .../case-versions.conf | 1 + .../dubbo-samples-configcenter-xml/case-versions.conf | 1 + .../dubbo-samples-original/case-versions.conf | 1 + .../dubbo-samples-reactor/case-versions.conf | 1 + 3-extensions/protocol/dubbo-samples-http/case-versions.conf | 1 + .../dubbo-samples-port-unification/case-versions.conf | 1 + 3-extensions/protocol/dubbo-samples-rest/case-versions.conf | 1 + 3-extensions/protocol/dubbo-samples-thrift/case-versions.conf | 1 + .../protocol/dubbo-samples-triple-reactor/case-versions.conf | 1 + 3-extensions/protocol/dubbo-samples-triple/case-versions.conf | 1 + .../protocol/dubbo-samples-webservice/case-versions.conf | 1 + 3-extensions/registry/dubbo-samples-consul/case-versions.conf | 1 + .../registry/dubbo-samples-default-config/case-versions.conf | 1 + .../registry/dubbo-samples-multi-registry/case-versions.conf | 1 + .../dubbo-samples-nacos-conditionrouter/case-versions.conf | 1 + .../dubbo-samples-nacos-configcenter/case-versions.conf | 1 + .../dubbo-samples-nacos-group/case-versions.conf | 1 + .../dubbo-samples-nacos-override/case-versions.conf | 1 + .../dubbo-samples-nacos-registry/case-versions.conf | 1 + .../dubbo-samples-nacos-tagrouter/case-versions.conf | 1 + .../case-versions.conf | 1 + .../case-versions.conf | 1 + .../case-versions.conf | 1 + .../dubbo-samples-simplified-registry-xml/case-versions.conf | 1 + .../registry/dubbo-samples-zookeeper/case-versions.conf | 1 + .../dubbo-samples-prefer-serialization/case-versions.conf | 1 + .../dubbo-samples-protobuf-json/case-versions.conf | 1 + .../serialization/dubbo-samples-protobuf/case-versions.conf | 1 + .../serialization/dubbo-samples-protostuff/case-versions.conf | 1 + .../dubbo-samples-serialization-java/case-versions.conf | 1 + .../dubbo-samples-applevel-override/case-versions.conf | 1 + .../dubbo-samples-configconditionrouter/case-versions.conf | 1 + 4-governance/dubbo-samples-meshrule-router/case-versions.conf | 1 + 4-governance/dubbo-samples-metrics/case-versions.conf | 1 + 4-governance/dubbo-samples-monitor/case-versions.conf | 1 + 4-governance/dubbo-samples-sentinel/case-versions.conf | 1 + .../dubbo-samples-servicelevel-override/case-versions.conf | 1 + .../dubbo-samples-spring-boot-hystrix/case-versions.conf | 1 + 4-governance/dubbo-samples-spring-hystrix/case-versions.conf | 1 + 4-governance/dubbo-samples-ssl/case-versions.conf | 1 + 4-governance/dubbo-samples-tagrouter/case-versions.conf | 1 + .../dubbo-samples-empty-protection-nacos/case-versions.conf | 1 + .../dubbo-samples-empty-protection/case-versions.conf | 1 + 99-integration/dubbo-samples-hibernate/case-versions.conf | 1 + .../dubbo-samples-isolation-executor/case-versions.conf | 1 + .../case-versions.conf | 1 + .../case-versions.conf | 1 + .../case-versions.conf | 1 + .../case-versions.conf | 1 + 99-integration/dubbo-samples-mybatis/case-versions.conf | 1 + 99-integration/dubbo-samples-nacos-merge/case-versions.conf | 1 + .../dubbo-samples-port-unification-netty3/case-versions.conf | 1 + .../dubbo-samples-router-chain-switch/case-versions.conf | 1 + 99-integration/dubbo-samples-sd-group/case-versions.conf | 1 + 99-integration/dubbo-samples-sd-merge/case-versions.conf | 1 + 99-integration/dubbo-samples-sd-version/case-versions.conf | 1 + .../case-versions.conf | 1 + 99-integration/dubbo-samples-test-10704/case-versions.conf | 1 + 99-integration/dubbo-samples-test-11096/case-versions.conf | 1 + 99-integration/dubbo-samples-test-11137/case-versions.conf | 1 + 99-integration/dubbo-samples-test-11159/case-versions.conf | 1 + 99-integration/dubbo-samples-test-9806/case-versions.conf | 1 + test/dubbo-test-runner/src/docker/Dockerfile | 2 +- .../java/org/apache/dubbo/test/runner/TestRunnerMain.java | 6 ++++-- test/run-tests.sh | 8 ++++++-- test/scripts/merge-test-results.sh | 2 +- 117 files changed, 139 insertions(+), 25 deletions(-) diff --git a/.github/workflows/dubbo-3_2.yml b/.github/workflows/dubbo-3_2.yml index 6468561b..2e633d73 100644 --- a/.github/workflows/dubbo-3_2.yml +++ b/.github/workflows/dubbo-3_2.yml @@ -23,9 +23,8 @@ env: VERSIONS_LIMIT: 4 #candidate versions (the dubbo snapshot version will be extracted from pom.xml and appended before CANDIDATE_VERSIONS ) CANDIDATE_VERSIONS: ' - spring.version:4.3.30.RELEASE; - spring-boot.version:1.5.22.RELEASE; - spring-boot.version:2.4.1; + spring.version:5.3.24; + spring-boot.version:2.7.6; ' DUBBO_REF: '3.2' @@ -126,7 +125,7 @@ jobs: strategy: fail-fast: false matrix: - java: [8, 11] + java: [8, 11, 17] #testjob id list MUST match 'JOB_COUNT' of 'prepare_test' job_id: [1,2,3,4,5] steps: @@ -155,7 +154,7 @@ jobs: - name: Init Candidate Versions run: | DUBBO_VERSION="${{needs.build-dubbo.outputs.version}}" - CANDIDATE_VERSIONS="dubbo.version:$DUBBO_VERSION;compiler.version:$DUBBO_VERSION;dubbo.compiler.version:$DUBBO_VERSION;$CANDIDATE_VERSIONS" + CANDIDATE_VERSIONS="dubbo.version:$DUBBO_VERSION;compiler.version:$DUBBO_VERSION;dubbo.compiler.version:$DUBBO_VERSION;java.version:${{matrix.java}};$CANDIDATE_VERSIONS" echo "CANDIDATE_VERSIONS=$CANDIDATE_VERSIONS" >> $GITHUB_ENV - name: Build test image run: | @@ -177,7 +176,7 @@ jobs: strategy: fail-fast: false matrix: - java: [8, 11] + java: [8, 11, 17] env: JAVA_VER: ${{matrix.java}} steps: diff --git a/1-basic/dubbo-samples-annotation/case-versions.conf b/1-basic/dubbo-samples-annotation/case-versions.conf index 17bd6d1f..647a422d 100644 --- a/1-basic/dubbo-samples-annotation/case-versions.conf +++ b/1-basic/dubbo-samples-annotation/case-versions.conf @@ -20,4 +20,5 @@ # Spring app dubbo.version=2.7*, 3.* -spring.version=4.*, 5.* +spring.version=4.*, 5.*, 6.* +java.version= [ >= 8] diff --git a/1-basic/dubbo-samples-annotation/pom.xml b/1-basic/dubbo-samples-annotation/pom.xml index c7ef19b2..5ff2cf0f 100644 --- a/1-basic/dubbo-samples-annotation/pom.xml +++ b/1-basic/dubbo-samples-annotation/pom.xml @@ -57,7 +57,7 @@ </dependency> <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-dependencies-zookeeper</artifactId> + <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId> <version>${dubbo.version}</version> <type>pom</type> </dependency> @@ -72,7 +72,7 @@ <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-dependencies-zookeeper</artifactId> + <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId> <type>pom</type> </dependency> diff --git a/1-basic/dubbo-samples-api/case-versions.conf b/1-basic/dubbo-samples-api/case-versions.conf index 0e26c8bf..51bf3b7c 100644 --- a/1-basic/dubbo-samples-api/case-versions.conf +++ b/1-basic/dubbo-samples-api/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [ >= 8 ] \ No newline at end of file diff --git a/1-basic/dubbo-samples-api/pom.xml b/1-basic/dubbo-samples-api/pom.xml index 9c2c717b..9b84165a 100644 --- a/1-basic/dubbo-samples-api/pom.xml +++ b/1-basic/dubbo-samples-api/pom.xml @@ -54,7 +54,7 @@ <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-dependencies-zookeeper</artifactId> + <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId> <version>${dubbo.version}</version> <type>pom</type> </dependency> @@ -76,7 +76,7 @@ <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-dependencies-zookeeper</artifactId> + <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId> <type>pom</type> </dependency> diff --git a/1-basic/dubbo-samples-basic/case-versions.conf b/1-basic/dubbo-samples-basic/case-versions.conf index 0e26c8bf..f7373a53 100644 --- a/1-basic/dubbo-samples-basic/case-versions.conf +++ b/1-basic/dubbo-samples-basic/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [>= 8] diff --git a/1-basic/dubbo-samples-basic/pom.xml b/1-basic/dubbo-samples-basic/pom.xml index d4ffbea1..88a2af85 100644 --- a/1-basic/dubbo-samples-basic/pom.xml +++ b/1-basic/dubbo-samples-basic/pom.xml @@ -56,7 +56,7 @@ <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-dependencies-zookeeper</artifactId> + <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId> <version>${dubbo.version}</version> <type>pom</type> </dependency> @@ -77,7 +77,7 @@ <dependency> <groupId>org.apache.dubbo</groupId> - <artifactId>dubbo-dependencies-zookeeper</artifactId> + <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId> <type>pom</type> </dependency> diff --git a/2-advanced/dubbo-samples-async/dubbo-samples-async-generated-future/case-versions.conf b/2-advanced/dubbo-samples-async/dubbo-samples-async-generated-future/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-async/dubbo-samples-async-generated-future/case-versions.conf +++ b/2-advanced/dubbo-samples-async/dubbo-samples-async-generated-future/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-async/dubbo-samples-async-onerror/case-versions.conf b/2-advanced/dubbo-samples-async/dubbo-samples-async-onerror/case-versions.conf index 0d93f05f..40c48370 100644 --- a/2-advanced/dubbo-samples-async/dubbo-samples-async-onerror/case-versions.conf +++ b/2-advanced/dubbo-samples-async/dubbo-samples-async-onerror/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring-boot.version=1.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/case-versions.conf b/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/case-versions.conf index d718a9f3..9a2ae827 100644 --- a/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/case-versions.conf +++ b/2-advanced/dubbo-samples-async/dubbo-samples-async-original-future/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-async/dubbo-samples-async-provider/case-versions.conf b/2-advanced/dubbo-samples-async/dubbo-samples-async-provider/case-versions.conf index d718a9f3..9a2ae827 100644 --- a/2-advanced/dubbo-samples-async/dubbo-samples-async-provider/case-versions.conf +++ b/2-advanced/dubbo-samples-async/dubbo-samples-async-provider/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-async/dubbo-samples-async-simple/case-versions.conf b/2-advanced/dubbo-samples-async/dubbo-samples-async-simple/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-async/dubbo-samples-async-simple/case-versions.conf +++ b/2-advanced/dubbo-samples-async/dubbo-samples-async-simple/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-attachment/case-versions.conf b/2-advanced/dubbo-samples-attachment/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-attachment/case-versions.conf +++ b/2-advanced/dubbo-samples-attachment/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-autowire/case-versions.conf b/2-advanced/dubbo-samples-autowire/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-autowire/case-versions.conf +++ b/2-advanced/dubbo-samples-autowire/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-cache/case-versions.conf b/2-advanced/dubbo-samples-cache/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-cache/case-versions.conf +++ b/2-advanced/dubbo-samples-cache/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-callback/case-versions.conf b/2-advanced/dubbo-samples-callback/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-callback/case-versions.conf +++ b/2-advanced/dubbo-samples-callback/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-chain/case-versions.conf b/2-advanced/dubbo-samples-chain/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-chain/case-versions.conf +++ b/2-advanced/dubbo-samples-chain/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-cloud-native/dubbo-call-sc/case-versions.conf b/2-advanced/dubbo-samples-cloud-native/dubbo-call-sc/case-versions.conf index 10c9f4b4..fca7c7ed 100644 --- a/2-advanced/dubbo-samples-cloud-native/dubbo-call-sc/case-versions.conf +++ b/2-advanced/dubbo-samples-cloud-native/dubbo-call-sc/case-versions.conf @@ -21,4 +21,5 @@ # SpringBoot/SpringCloud app dubbo.version=2.7* -spring-boot.version=1.* \ No newline at end of file +spring-boot.version=1.* +java.version= [ <= 11] diff --git a/2-advanced/dubbo-samples-cloud-native/dubbo-call-scdubbo/case-versions.conf b/2-advanced/dubbo-samples-cloud-native/dubbo-call-scdubbo/case-versions.conf index 10c9f4b4..15802f7d 100644 --- a/2-advanced/dubbo-samples-cloud-native/dubbo-call-scdubbo/case-versions.conf +++ b/2-advanced/dubbo-samples-cloud-native/dubbo-call-scdubbo/case-versions.conf @@ -21,4 +21,5 @@ # SpringBoot/SpringCloud app dubbo.version=2.7* -spring-boot.version=1.* \ No newline at end of file +spring-boot.version=1.* +java.version= [ <= 11] \ No newline at end of file diff --git a/2-advanced/dubbo-samples-cloud-native/dubbo-demo-servicediscovery-xml/case-versions.conf b/2-advanced/dubbo-samples-cloud-native/dubbo-demo-servicediscovery-xml/case-versions.conf index c5a87cb6..9a2ae827 100644 --- a/2-advanced/dubbo-samples-cloud-native/dubbo-demo-servicediscovery-xml/case-versions.conf +++ b/2-advanced/dubbo-samples-cloud-native/dubbo-demo-servicediscovery-xml/case-versions.conf @@ -21,4 +21,5 @@ # Spring app dubbo.version=3.* -spring.version=4.*, 5.* \ No newline at end of file +spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-cloud-native/dubbo-servicediscovery-migration/case-versions.conf b/2-advanced/dubbo-samples-cloud-native/dubbo-servicediscovery-migration/case-versions.conf index c5a87cb6..36a1e3cf 100644 --- a/2-advanced/dubbo-samples-cloud-native/dubbo-servicediscovery-migration/case-versions.conf +++ b/2-advanced/dubbo-samples-cloud-native/dubbo-servicediscovery-migration/case-versions.conf @@ -21,4 +21,5 @@ # Spring app dubbo.version=3.* -spring.version=4.*, 5.* \ No newline at end of file +spring.version=4.*, 5.* +java.version= [<= 11] \ No newline at end of file diff --git a/2-advanced/dubbo-samples-cloud-native/sc-call-dubbo/case-versions.conf b/2-advanced/dubbo-samples-cloud-native/sc-call-dubbo/case-versions.conf index 10c9f4b4..bcd2f750 100644 --- a/2-advanced/dubbo-samples-cloud-native/sc-call-dubbo/case-versions.conf +++ b/2-advanced/dubbo-samples-cloud-native/sc-call-dubbo/case-versions.conf @@ -21,4 +21,5 @@ # SpringBoot/SpringCloud app dubbo.version=2.7* -spring-boot.version=1.* \ No newline at end of file +spring-boot.version=1.* +java.version= [<= 11] \ No newline at end of file diff --git a/2-advanced/dubbo-samples-cloud-native/servicediscovery-transfer/case-versions.conf b/2-advanced/dubbo-samples-cloud-native/servicediscovery-transfer/case-versions.conf index c5a87cb6..36a1e3cf 100644 --- a/2-advanced/dubbo-samples-cloud-native/servicediscovery-transfer/case-versions.conf +++ b/2-advanced/dubbo-samples-cloud-native/servicediscovery-transfer/case-versions.conf @@ -21,4 +21,5 @@ # Spring app dubbo.version=3.* -spring.version=4.*, 5.* \ No newline at end of file +spring.version=4.*, 5.* +java.version= [<= 11] \ No newline at end of file diff --git a/2-advanced/dubbo-samples-compatible/case-versions.conf b/2-advanced/dubbo-samples-compatible/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-compatible/case-versions.conf +++ b/2-advanced/dubbo-samples-compatible/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-context/case-versions.conf b/2-advanced/dubbo-samples-context/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-context/case-versions.conf +++ b/2-advanced/dubbo-samples-context/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-direct/case-versions.conf b/2-advanced/dubbo-samples-direct/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-direct/case-versions.conf +++ b/2-advanced/dubbo-samples-direct/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-docker/case-versions.conf b/2-advanced/dubbo-samples-docker/case-versions.conf index 7f356daa..b468fa4e 100644 --- a/2-advanced/dubbo-samples-docker/case-versions.conf +++ b/2-advanced/dubbo-samples-docker/case-versions.conf @@ -22,3 +22,4 @@ # SpringBoot app dubbo.version=2.7*, 3.* spring-boot.version=1.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-echo/case-versions.conf b/2-advanced/dubbo-samples-echo/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-echo/case-versions.conf +++ b/2-advanced/dubbo-samples-echo/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-environment-keys/case-versions.conf b/2-advanced/dubbo-samples-environment-keys/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-environment-keys/case-versions.conf +++ b/2-advanced/dubbo-samples-environment-keys/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-generic/dubbo-samples-generic-call/case-versions.conf b/2-advanced/dubbo-samples-generic/dubbo-samples-generic-call/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-generic/dubbo-samples-generic-call/case-versions.conf +++ b/2-advanced/dubbo-samples-generic/dubbo-samples-generic-call/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-generic/dubbo-samples-generic-impl/case-versions.conf b/2-advanced/dubbo-samples-generic/dubbo-samples-generic-impl/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-generic/dubbo-samples-generic-impl/case-versions.conf +++ b/2-advanced/dubbo-samples-generic/dubbo-samples-generic-impl/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-generic/dubbo-samples-generic-type/case-versions.conf b/2-advanced/dubbo-samples-generic/dubbo-samples-generic-type/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-generic/dubbo-samples-generic-type/case-versions.conf +++ b/2-advanced/dubbo-samples-generic/dubbo-samples-generic-type/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-group/case-versions.conf b/2-advanced/dubbo-samples-group/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-group/case-versions.conf +++ b/2-advanced/dubbo-samples-group/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-local/case-versions.conf b/2-advanced/dubbo-samples-local/case-versions.conf index d718a9f3..9a2ae827 100644 --- a/2-advanced/dubbo-samples-local/case-versions.conf +++ b/2-advanced/dubbo-samples-local/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-merge/case-versions.conf b/2-advanced/dubbo-samples-merge/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-merge/case-versions.conf +++ b/2-advanced/dubbo-samples-merge/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/case-versions.conf b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/case-versions.conf index 6b125d84..3028193d 100644 --- a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/case-versions.conf +++ b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/case-versions.conf @@ -20,6 +20,7 @@ # Spring app spring.version=4.*, 5.* +java.version= [<= 11] # Support Compatibility test dubbo.provider.version=3.* diff --git a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/case-versions.conf b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/case-versions.conf index b5a235b0..6b1986c9 100644 --- a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/case-versions.conf +++ b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/case-versions.conf @@ -20,6 +20,7 @@ # Spring app spring.version=4.*, 5.* +java.version= [<= 11] # Support Compatibility test dubbo.provider.version=3.* diff --git a/2-advanced/dubbo-samples-mock/case-versions.conf b/2-advanced/dubbo-samples-mock/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-mock/case-versions.conf +++ b/2-advanced/dubbo-samples-mock/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-notify/case-versions.conf b/2-advanced/dubbo-samples-notify/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-notify/case-versions.conf +++ b/2-advanced/dubbo-samples-notify/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-scala/case-versions.conf b/2-advanced/dubbo-samples-scala/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-scala/case-versions.conf +++ b/2-advanced/dubbo-samples-scala/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-spi-compatible/case-versions.conf b/2-advanced/dubbo-samples-spi-compatible/case-versions.conf index d718a9f3..9a2ae827 100644 --- a/2-advanced/dubbo-samples-spi-compatible/case-versions.conf +++ b/2-advanced/dubbo-samples-spi-compatible/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-stub/case-versions.conf b/2-advanced/dubbo-samples-stub/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-stub/case-versions.conf +++ b/2-advanced/dubbo-samples-stub/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-tengine/case-versions.conf b/2-advanced/dubbo-samples-tengine/case-versions.conf index d0c0cc45..2e27b0ba 100644 --- a/2-advanced/dubbo-samples-tengine/case-versions.conf +++ b/2-advanced/dubbo-samples-tengine/case-versions.conf @@ -22,3 +22,4 @@ # SpringBoot app dubbo.version=2.7*, 3.* spring-boot.version=2.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-transaction/case-versions.conf b/2-advanced/dubbo-samples-transaction/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-transaction/case-versions.conf +++ b/2-advanced/dubbo-samples-transaction/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-validation/case-versions.conf b/2-advanced/dubbo-samples-validation/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-validation/case-versions.conf +++ b/2-advanced/dubbo-samples-validation/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/2-advanced/dubbo-samples-version/case-versions.conf b/2-advanced/dubbo-samples-version/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/2-advanced/dubbo-samples-version/case-versions.conf +++ b/2-advanced/dubbo-samples-version/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/configcenter/dubbo-samples-configcenter-annotation/case-versions.conf b/3-extensions/configcenter/dubbo-samples-configcenter-annotation/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-annotation/case-versions.conf +++ b/3-extensions/configcenter/dubbo-samples-configcenter-annotation/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/configcenter/dubbo-samples-configcenter-api/case-versions.conf b/3-extensions/configcenter/dubbo-samples-configcenter-api/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-api/case-versions.conf +++ b/3-extensions/configcenter/dubbo-samples-configcenter-api/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/configcenter/dubbo-samples-configcenter-apollo/case-versions.conf b/3-extensions/configcenter/dubbo-samples-configcenter-apollo/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-apollo/case-versions.conf +++ b/3-extensions/configcenter/dubbo-samples-configcenter-apollo/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/configcenter/dubbo-samples-configcenter-externalconfiguration/case-versions.conf b/3-extensions/configcenter/dubbo-samples-configcenter-externalconfiguration/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-externalconfiguration/case-versions.conf +++ b/3-extensions/configcenter/dubbo-samples-configcenter-externalconfiguration/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/configcenter/dubbo-samples-configcenter-multi-registries/case-versions.conf b/3-extensions/configcenter/dubbo-samples-configcenter-multi-registries/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-multi-registries/case-versions.conf +++ b/3-extensions/configcenter/dubbo-samples-configcenter-multi-registries/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/configcenter/dubbo-samples-configcenter-multiprotocol/case-versions.conf b/3-extensions/configcenter/dubbo-samples-configcenter-multiprotocol/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-multiprotocol/case-versions.conf +++ b/3-extensions/configcenter/dubbo-samples-configcenter-multiprotocol/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/configcenter/dubbo-samples-configcenter-xml/case-versions.conf b/3-extensions/configcenter/dubbo-samples-configcenter-xml/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-xml/case-versions.conf +++ b/3-extensions/configcenter/dubbo-samples-configcenter-xml/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/protocol/dubbo-samples-grpc/dubbo-samples-original/case-versions.conf b/3-extensions/protocol/dubbo-samples-grpc/dubbo-samples-original/case-versions.conf index 2a90995e..495aab36 100644 --- a/3-extensions/protocol/dubbo-samples-grpc/dubbo-samples-original/case-versions.conf +++ b/3-extensions/protocol/dubbo-samples-grpc/dubbo-samples-original/case-versions.conf @@ -22,4 +22,5 @@ # SpringBoot app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] compiler.version=0.0.*, 3.* diff --git a/3-extensions/protocol/dubbo-samples-grpc/dubbo-samples-reactor/case-versions.conf b/3-extensions/protocol/dubbo-samples-grpc/dubbo-samples-reactor/case-versions.conf index 9bfd86a9..3428d1ce 100644 --- a/3-extensions/protocol/dubbo-samples-grpc/dubbo-samples-reactor/case-versions.conf +++ b/3-extensions/protocol/dubbo-samples-grpc/dubbo-samples-reactor/case-versions.conf @@ -22,4 +22,5 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] compiler.version=0.0.*, 3.* \ No newline at end of file diff --git a/3-extensions/protocol/dubbo-samples-http/case-versions.conf b/3-extensions/protocol/dubbo-samples-http/case-versions.conf index 581882b6..d1063e70 100644 --- a/3-extensions/protocol/dubbo-samples-http/case-versions.conf +++ b/3-extensions/protocol/dubbo-samples-http/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/protocol/dubbo-samples-port-unification/case-versions.conf b/3-extensions/protocol/dubbo-samples-port-unification/case-versions.conf index 75070ca6..20fd4e19 100644 --- a/3-extensions/protocol/dubbo-samples-port-unification/case-versions.conf +++ b/3-extensions/protocol/dubbo-samples-port-unification/case-versions.conf @@ -21,3 +21,4 @@ # Spring app dubbo.version=[ >=3.1.0 ] +java.version= [<= 11] diff --git a/3-extensions/protocol/dubbo-samples-rest/case-versions.conf b/3-extensions/protocol/dubbo-samples-rest/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/protocol/dubbo-samples-rest/case-versions.conf +++ b/3-extensions/protocol/dubbo-samples-rest/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/protocol/dubbo-samples-thrift/case-versions.conf b/3-extensions/protocol/dubbo-samples-thrift/case-versions.conf index 581882b6..d1063e70 100644 --- a/3-extensions/protocol/dubbo-samples-thrift/case-versions.conf +++ b/3-extensions/protocol/dubbo-samples-thrift/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/protocol/dubbo-samples-triple-reactor/case-versions.conf b/3-extensions/protocol/dubbo-samples-triple-reactor/case-versions.conf index 2d003ad1..b580faac 100644 --- a/3-extensions/protocol/dubbo-samples-triple-reactor/case-versions.conf +++ b/3-extensions/protocol/dubbo-samples-triple-reactor/case-versions.conf @@ -21,3 +21,4 @@ # Spring app dubbo.version=[ >=3.1.0 ] compiler.version=[ >=3.1.0 ] +java.version= [<= 11] diff --git a/3-extensions/protocol/dubbo-samples-triple/case-versions.conf b/3-extensions/protocol/dubbo-samples-triple/case-versions.conf index 0bde5201..18147577 100644 --- a/3-extensions/protocol/dubbo-samples-triple/case-versions.conf +++ b/3-extensions/protocol/dubbo-samples-triple/case-versions.conf @@ -21,4 +21,5 @@ # Spring app dubbo.version=[ >=3.1.0 ] spring.version=4.*, 5.* +java.version= [<= 11] compiler.version=0.0.*, 3.* diff --git a/3-extensions/protocol/dubbo-samples-webservice/case-versions.conf b/3-extensions/protocol/dubbo-samples-webservice/case-versions.conf index 4f6e401f..f0d8f01f 100644 --- a/3-extensions/protocol/dubbo-samples-webservice/case-versions.conf +++ b/3-extensions/protocol/dubbo-samples-webservice/case-versions.conf @@ -4,3 +4,4 @@ # Spring app dubbo.version=2.7* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/registry/dubbo-samples-consul/case-versions.conf b/3-extensions/registry/dubbo-samples-consul/case-versions.conf index 581882b6..d1063e70 100644 --- a/3-extensions/registry/dubbo-samples-consul/case-versions.conf +++ b/3-extensions/registry/dubbo-samples-consul/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/registry/dubbo-samples-default-config/case-versions.conf b/3-extensions/registry/dubbo-samples-default-config/case-versions.conf index 581882b6..d1063e70 100644 --- a/3-extensions/registry/dubbo-samples-default-config/case-versions.conf +++ b/3-extensions/registry/dubbo-samples-default-config/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/registry/dubbo-samples-multi-registry/case-versions.conf b/3-extensions/registry/dubbo-samples-multi-registry/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/registry/dubbo-samples-multi-registry/case-versions.conf +++ b/3-extensions/registry/dubbo-samples-multi-registry/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/case-versions.conf b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/case-versions.conf +++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-conditionrouter/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/case-versions.conf b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/case-versions.conf +++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-configcenter/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-group/case-versions.conf b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-group/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-group/case-versions.conf +++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-group/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-override/case-versions.conf b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-override/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-override/case-versions.conf +++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-override/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-versions.conf b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-versions.conf +++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/case-versions.conf b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/case-versions.conf +++ b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-tagrouter/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/case-versions.conf b/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/case-versions.conf +++ b/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-annotation/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-nosimple/case-versions.conf b/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-nosimple/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-nosimple/case-versions.conf +++ b/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-nosimple/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/case-versions.conf b/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/case-versions.conf +++ b/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-properties/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/case-versions.conf b/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/case-versions.conf +++ b/3-extensions/registry/dubbo-samples-simplified-registry/dubbo-samples-simplified-registry-xml/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/registry/dubbo-samples-zookeeper/case-versions.conf b/3-extensions/registry/dubbo-samples-zookeeper/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/registry/dubbo-samples-zookeeper/case-versions.conf +++ b/3-extensions/registry/dubbo-samples-zookeeper/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/serialization/dubbo-samples-prefer-serialization/case-versions.conf b/3-extensions/serialization/dubbo-samples-prefer-serialization/case-versions.conf index 444eaa30..a370983f 100644 --- a/3-extensions/serialization/dubbo-samples-prefer-serialization/case-versions.conf +++ b/3-extensions/serialization/dubbo-samples-prefer-serialization/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=[ >=3.2.0 ] spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/serialization/dubbo-samples-protobuf-json/case-versions.conf b/3-extensions/serialization/dubbo-samples-protobuf-json/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/serialization/dubbo-samples-protobuf-json/case-versions.conf +++ b/3-extensions/serialization/dubbo-samples-protobuf-json/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/3-extensions/serialization/dubbo-samples-protobuf/case-versions.conf b/3-extensions/serialization/dubbo-samples-protobuf/case-versions.conf index 758f0f44..969be67c 100644 --- a/3-extensions/serialization/dubbo-samples-protobuf/case-versions.conf +++ b/3-extensions/serialization/dubbo-samples-protobuf/case-versions.conf @@ -22,4 +22,5 @@ # Spring app dubbo.version=2.7* spring.version=4.*, 5.* +java.version= [<= 11] compiler.version=0.0.*, 3.* diff --git a/3-extensions/serialization/dubbo-samples-protostuff/case-versions.conf b/3-extensions/serialization/dubbo-samples-protostuff/case-versions.conf index 5398c8e5..aad5efdc 100644 --- a/3-extensions/serialization/dubbo-samples-protostuff/case-versions.conf +++ b/3-extensions/serialization/dubbo-samples-protostuff/case-versions.conf @@ -22,3 +22,4 @@ # SpringBoot app dubbo.version=2.7* spring-boot.version=2.* +java.version= [<= 11] diff --git a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/case-versions.conf b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/case-versions.conf +++ b/3-extensions/serialization/dubbo-samples-serialization/dubbo-samples-serialization-java/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/4-governance/dubbo-samples-applevel-override/case-versions.conf b/4-governance/dubbo-samples-applevel-override/case-versions.conf index d718a9f3..9a2ae827 100644 --- a/4-governance/dubbo-samples-applevel-override/case-versions.conf +++ b/4-governance/dubbo-samples-applevel-override/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/4-governance/dubbo-samples-configconditionrouter/case-versions.conf b/4-governance/dubbo-samples-configconditionrouter/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/4-governance/dubbo-samples-configconditionrouter/case-versions.conf +++ b/4-governance/dubbo-samples-configconditionrouter/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/4-governance/dubbo-samples-meshrule-router/case-versions.conf b/4-governance/dubbo-samples-meshrule-router/case-versions.conf index d718a9f3..9a2ae827 100644 --- a/4-governance/dubbo-samples-meshrule-router/case-versions.conf +++ b/4-governance/dubbo-samples-meshrule-router/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/4-governance/dubbo-samples-metrics/case-versions.conf b/4-governance/dubbo-samples-metrics/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/4-governance/dubbo-samples-metrics/case-versions.conf +++ b/4-governance/dubbo-samples-metrics/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/4-governance/dubbo-samples-monitor/case-versions.conf b/4-governance/dubbo-samples-monitor/case-versions.conf index 6eb2dd0e..9b0ef8c8 100644 --- a/4-governance/dubbo-samples-monitor/case-versions.conf +++ b/4-governance/dubbo-samples-monitor/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*,3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/4-governance/dubbo-samples-sentinel/case-versions.conf b/4-governance/dubbo-samples-sentinel/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/4-governance/dubbo-samples-sentinel/case-versions.conf +++ b/4-governance/dubbo-samples-sentinel/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/4-governance/dubbo-samples-servicelevel-override/case-versions.conf b/4-governance/dubbo-samples-servicelevel-override/case-versions.conf index d718a9f3..9a2ae827 100644 --- a/4-governance/dubbo-samples-servicelevel-override/case-versions.conf +++ b/4-governance/dubbo-samples-servicelevel-override/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/4-governance/dubbo-samples-spring-boot-hystrix/case-versions.conf b/4-governance/dubbo-samples-spring-boot-hystrix/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/4-governance/dubbo-samples-spring-boot-hystrix/case-versions.conf +++ b/4-governance/dubbo-samples-spring-boot-hystrix/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/4-governance/dubbo-samples-spring-hystrix/case-versions.conf b/4-governance/dubbo-samples-spring-hystrix/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/4-governance/dubbo-samples-spring-hystrix/case-versions.conf +++ b/4-governance/dubbo-samples-spring-hystrix/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/4-governance/dubbo-samples-ssl/case-versions.conf b/4-governance/dubbo-samples-ssl/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/4-governance/dubbo-samples-ssl/case-versions.conf +++ b/4-governance/dubbo-samples-ssl/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/4-governance/dubbo-samples-tagrouter/case-versions.conf b/4-governance/dubbo-samples-tagrouter/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/4-governance/dubbo-samples-tagrouter/case-versions.conf +++ b/4-governance/dubbo-samples-tagrouter/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-empty-protection-nacos/case-versions.conf b/99-integration/dubbo-samples-empty-protection-nacos/case-versions.conf index d718a9f3..9a2ae827 100644 --- a/99-integration/dubbo-samples-empty-protection-nacos/case-versions.conf +++ b/99-integration/dubbo-samples-empty-protection-nacos/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-empty-protection/case-versions.conf b/99-integration/dubbo-samples-empty-protection/case-versions.conf index d718a9f3..9a2ae827 100644 --- a/99-integration/dubbo-samples-empty-protection/case-versions.conf +++ b/99-integration/dubbo-samples-empty-protection/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-hibernate/case-versions.conf b/99-integration/dubbo-samples-hibernate/case-versions.conf index eabd60bc..28f07efd 100644 --- a/99-integration/dubbo-samples-hibernate/case-versions.conf +++ b/99-integration/dubbo-samples-hibernate/case-versions.conf @@ -23,3 +23,4 @@ #dubbo.version=2.7.*, 3.* dubbo.version=4.* spring.version=4.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-isolation-executor/case-versions.conf b/99-integration/dubbo-samples-isolation-executor/case-versions.conf index 444eaa30..a370983f 100644 --- a/99-integration/dubbo-samples-isolation-executor/case-versions.conf +++ b/99-integration/dubbo-samples-isolation-executor/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=[ >=3.2.0 ] spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/case-versions.conf b/99-integration/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/99-integration/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/case-versions.conf +++ b/99-integration/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/case-versions.conf b/99-integration/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/99-integration/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/case-versions.conf +++ b/99-integration/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/case-versions.conf b/99-integration/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/99-integration/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/case-versions.conf +++ b/99-integration/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/case-versions.conf b/99-integration/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/99-integration/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/case-versions.conf +++ b/99-integration/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-mybatis/case-versions.conf b/99-integration/dubbo-samples-mybatis/case-versions.conf index deacb9ea..ec7136bb 100644 --- a/99-integration/dubbo-samples-mybatis/case-versions.conf +++ b/99-integration/dubbo-samples-mybatis/case-versions.conf @@ -23,3 +23,4 @@ #dubbo.version=2.7.*, 3.* dubbo.version=4.* spring-boot.version=2.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-nacos-merge/case-versions.conf b/99-integration/dubbo-samples-nacos-merge/case-versions.conf index 901e42fb..6fad8d8a 100644 --- a/99-integration/dubbo-samples-nacos-merge/case-versions.conf +++ b/99-integration/dubbo-samples-nacos-merge/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=[ >= 3.1.0 ] spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-port-unification-netty3/case-versions.conf b/99-integration/dubbo-samples-port-unification-netty3/case-versions.conf index f1355f39..d877829a 100644 --- a/99-integration/dubbo-samples-port-unification-netty3/case-versions.conf +++ b/99-integration/dubbo-samples-port-unification-netty3/case-versions.conf @@ -21,3 +21,4 @@ # Spring app dubbo.version=[ >=3.2.0 ] +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-router-chain-switch/case-versions.conf b/99-integration/dubbo-samples-router-chain-switch/case-versions.conf index f1355f39..d877829a 100644 --- a/99-integration/dubbo-samples-router-chain-switch/case-versions.conf +++ b/99-integration/dubbo-samples-router-chain-switch/case-versions.conf @@ -21,3 +21,4 @@ # Spring app dubbo.version=[ >=3.2.0 ] +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-sd-group/case-versions.conf b/99-integration/dubbo-samples-sd-group/case-versions.conf index 901e42fb..6fad8d8a 100644 --- a/99-integration/dubbo-samples-sd-group/case-versions.conf +++ b/99-integration/dubbo-samples-sd-group/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=[ >= 3.1.0 ] spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-sd-merge/case-versions.conf b/99-integration/dubbo-samples-sd-merge/case-versions.conf index 901e42fb..6fad8d8a 100644 --- a/99-integration/dubbo-samples-sd-merge/case-versions.conf +++ b/99-integration/dubbo-samples-sd-merge/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=[ >= 3.1.0 ] spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-sd-version/case-versions.conf b/99-integration/dubbo-samples-sd-version/case-versions.conf index 901e42fb..6fad8d8a 100644 --- a/99-integration/dubbo-samples-sd-version/case-versions.conf +++ b/99-integration/dubbo-samples-sd-version/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=[ >= 3.1.0 ] spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-switch-serialization-thread/case-versions.conf b/99-integration/dubbo-samples-switch-serialization-thread/case-versions.conf index 0e26c8bf..20c45c86 100644 --- a/99-integration/dubbo-samples-switch-serialization-thread/case-versions.conf +++ b/99-integration/dubbo-samples-switch-serialization-thread/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-test-10704/case-versions.conf b/99-integration/dubbo-samples-test-10704/case-versions.conf index d718a9f3..9a2ae827 100644 --- a/99-integration/dubbo-samples-test-10704/case-versions.conf +++ b/99-integration/dubbo-samples-test-10704/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-test-11096/case-versions.conf b/99-integration/dubbo-samples-test-11096/case-versions.conf index 901e42fb..6fad8d8a 100644 --- a/99-integration/dubbo-samples-test-11096/case-versions.conf +++ b/99-integration/dubbo-samples-test-11096/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=[ >= 3.1.0 ] spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-test-11137/case-versions.conf b/99-integration/dubbo-samples-test-11137/case-versions.conf index 901e42fb..6fad8d8a 100644 --- a/99-integration/dubbo-samples-test-11137/case-versions.conf +++ b/99-integration/dubbo-samples-test-11137/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=[ >= 3.1.0 ] spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-test-11159/case-versions.conf b/99-integration/dubbo-samples-test-11159/case-versions.conf index 901e42fb..6fad8d8a 100644 --- a/99-integration/dubbo-samples-test-11159/case-versions.conf +++ b/99-integration/dubbo-samples-test-11159/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=[ >= 3.1.0 ] spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/99-integration/dubbo-samples-test-9806/case-versions.conf b/99-integration/dubbo-samples-test-9806/case-versions.conf index 901e42fb..6fad8d8a 100644 --- a/99-integration/dubbo-samples-test-9806/case-versions.conf +++ b/99-integration/dubbo-samples-test-9806/case-versions.conf @@ -22,3 +22,4 @@ # Spring app dubbo.version=[ >= 3.1.0 ] spring.version=4.*, 5.* +java.version= [<= 11] diff --git a/test/dubbo-test-runner/src/docker/Dockerfile b/test/dubbo-test-runner/src/docker/Dockerfile index f21b8948..64a1d5d6 100644 --- a/test/dubbo-test-runner/src/docker/Dockerfile +++ b/test/dubbo-test-runner/src/docker/Dockerfile @@ -14,7 +14,7 @@ # limitations under the License. ARG JAVA_VER=8 -FROM openjdk:$JAVA_VER +FROM openjdk:${JAVA_VER}-jdk-buster ARG DEBIAN_MIRROR RUN if [ -n "$DEBIAN_MIRROR" ]; then \ diff --git a/test/dubbo-test-runner/src/main/java/org/apache/dubbo/test/runner/TestRunnerMain.java b/test/dubbo-test-runner/src/main/java/org/apache/dubbo/test/runner/TestRunnerMain.java index 11d7784c..fa6cf41b 100644 --- a/test/dubbo-test-runner/src/main/java/org/apache/dubbo/test/runner/TestRunnerMain.java +++ b/test/dubbo-test-runner/src/main/java/org/apache/dubbo/test/runner/TestRunnerMain.java @@ -221,8 +221,10 @@ public class TestRunnerMain { List<String> classpath = new ArrayList<>(); ClassLoader cl = ClassLoader.getSystemClassLoader(); URL[] urls = ClassLoaderUtils.getUrls(cl); - for (URL url : urls) { - classpath.add(url.getFile()); + if (urls != null) { + for (URL url : urls) { + classpath.add(url.getFile()); + } } return new Classpath(classpath); } diff --git a/test/run-tests.sh b/test/run-tests.sh index b150f7cb..910a7e28 100755 --- a/test/run-tests.sh +++ b/test/run-tests.sh @@ -25,11 +25,15 @@ echo "FORK_COUNT: $maxForks" export DEBUG=$DEBUG echo "DEBUG=$DEBUG" -DUBBO_VERSION=${DUBBO_VERSION:-2.7.12} +DUBBO_VERSION=${DUBBO_VERSION:-3.1.3} if [ "$CANDIDATE_VERSIONS" == "" ];then CANDIDATE_VERSIONS="dubbo.version:$DUBBO_VERSION;spring.version:4.3.16.RELEASE;spring-boot.version:1.5.13.RELEASE,2.1.1.RELEASE" # CANDIDATE_VERSIONS="dubbo.version:2.7.12;spring.version:4.3.16.RELEASE,5.3.3;spring-boot.version:1.5.13.RELEASE,2.1.1.RELEASE" fi +JAVA_VERSION="java.version" +if [[ $CANDIDATE_VERSIONS != *$JAVA_VERSION* ]];then + CANDIDATE_VERSIONS="$CANDIDATE_VERSIONS;java.version:$JAVA_VER" +fi export CANDIDATE_VERSIONS=$CANDIDATE_VERSIONS echo "CANDIDATE_VERSIONS: ${CANDIDATE_VERSIONS[@]}" @@ -428,7 +432,7 @@ fi echo "Total: $totalCount, Success: $successTest, Failures: $failedTest, Ignored: $ignoredTest" -if [[ $successTest -gt 0 && $(($successTest + $ignoredTest)) == $totalCount ]]; then +if [[ $(($successTest + $ignoredTest)) == $totalCount ]]; then test_result=0 echo "All tests pass" else diff --git a/test/scripts/merge-test-results.sh b/test/scripts/merge-test-results.sh index 174768a6..0515c469 100755 --- a/test/scripts/merge-test-results.sh +++ b/test/scripts/merge-test-results.sh @@ -50,7 +50,7 @@ fi echo "Total: $totalCount, Success: $successTest, Failures: $failedTest, Ignored: $ignoredTest" -if [[ $successTest -gt 0 && $(($successTest + $ignoredTest)) == $totalCount ]]; then +if [[ $(($successTest + $ignoredTest)) == $totalCount ]]; then test_result=0 echo "All tests pass" else --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@dubbo.apache.org For additional commands, e-mail: notifications-h...@dubbo.apache.org