diff --git a/.github/workflows/dubbo-3_3.yml b/.github/workflows/dubbo-3_3.yml index c43e8f35b1..ec292c53a0 100644 --- a/.github/workflows/dubbo-3_3.yml +++ b/.github/workflows/dubbo-3_3.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.3' diff --git a/1-basic/dubbo-samples-spring-boot/case-versions.conf b/1-basic/dubbo-samples-spring-boot/case-versions.conf index 9a2ae82744..b03fb1ae45 100644 --- a/1-basic/dubbo-samples-spring-boot/case-versions.conf +++ b/1-basic/dubbo-samples-spring-boot/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-async/dubbo-sample-async-generated-future-springboot/case-versions.conf b/2-advanced/dubbo-samples-async/dubbo-sample-async-generated-future-springboot/case-versions.conf index bc59826382..f7373a530c 100644 --- a/2-advanced/dubbo-samples-async/dubbo-sample-async-generated-future-springboot/case-versions.conf +++ b/2-advanced/dubbo-samples-async/dubbo-sample-async-generated-future-springboot/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 17] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-async/dubbo-samples-async-generated-future-springboot/case-versions.conf b/2-advanced/dubbo-samples-async/dubbo-samples-async-generated-future-springboot/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/2-advanced/dubbo-samples-async/dubbo-samples-async-generated-future-springboot/case-versions.conf +++ b/2-advanced/dubbo-samples-async/dubbo-samples-async-generated-future-springboot/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 40c4837062..ccd033cca2 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring-boot.version=1.* -java.version= [<= 11] +java.version= [>= 8] 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 9a2ae82744..b03fb1ae45 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,4 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 9a2ae82744..b03fb1ae45 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,4 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-async/dubbo-samples-async-simple-boot/case-versions.conf b/2-advanced/dubbo-samples-async/dubbo-samples-async-simple-boot/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/2-advanced/dubbo-samples-async/dubbo-samples-async-simple-boot/case-versions.conf +++ b/2-advanced/dubbo-samples-async/dubbo-samples-async-simple-boot/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-attachment/case-versions.conf b/2-advanced/dubbo-samples-attachment/case-versions.conf index 7dff7a42b4..9df1485930 100644 --- a/2-advanced/dubbo-samples-attachment/case-versions.conf +++ b/2-advanced/dubbo-samples-attachment/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=[>= 3.1.0] spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-autowire/case-versions.conf b/2-advanced/dubbo-samples-autowire/case-versions.conf index 9a2ae82744..b03fb1ae45 100644 --- a/2-advanced/dubbo-samples-autowire/case-versions.conf +++ b/2-advanced/dubbo-samples-autowire/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-cache/case-versions.conf b/2-advanced/dubbo-samples-cache/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/2-advanced/dubbo-samples-cache/case-versions.conf +++ b/2-advanced/dubbo-samples-cache/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-callback/case-versions.conf b/2-advanced/dubbo-samples-callback/case-versions.conf index 816839de19..0a8a7738ff 100644 --- a/2-advanced/dubbo-samples-callback/case-versions.conf +++ b/2-advanced/dubbo-samples-callback/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring-boot.version=2.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-chain/case-versions.conf b/2-advanced/dubbo-samples-chain/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/2-advanced/dubbo-samples-chain/case-versions.conf +++ b/2-advanced/dubbo-samples-chain/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-compatible/case-versions.conf b/2-advanced/dubbo-samples-compatible/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/2-advanced/dubbo-samples-compatible/case-versions.conf +++ b/2-advanced/dubbo-samples-compatible/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-context/case-versions.conf b/2-advanced/dubbo-samples-context/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/2-advanced/dubbo-samples-context/case-versions.conf +++ b/2-advanced/dubbo-samples-context/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-direct/case-versions.conf b/2-advanced/dubbo-samples-direct/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/2-advanced/dubbo-samples-direct/case-versions.conf +++ b/2-advanced/dubbo-samples-direct/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-docker/case-versions.conf b/2-advanced/dubbo-samples-docker/case-versions.conf index b468fa4e2e..40b02f236b 100644 --- a/2-advanced/dubbo-samples-docker/case-versions.conf +++ b/2-advanced/dubbo-samples-docker/case-versions.conf @@ -22,4 +22,4 @@ # SpringBoot app dubbo.version=2.7*, 3.* spring-boot.version=1.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-echo/case-versions.conf b/2-advanced/dubbo-samples-echo/case-versions.conf index 9a2ae82744..b03fb1ae45 100644 --- a/2-advanced/dubbo-samples-echo/case-versions.conf +++ b/2-advanced/dubbo-samples-echo/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-environment-keys/case-versions.conf b/2-advanced/dubbo-samples-environment-keys/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/2-advanced/dubbo-samples-environment-keys/case-versions.conf +++ b/2-advanced/dubbo-samples-environment-keys/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-group/case-versions.conf b/2-advanced/dubbo-samples-group/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/2-advanced/dubbo-samples-group/case-versions.conf +++ b/2-advanced/dubbo-samples-group/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-local/case-versions.conf b/2-advanced/dubbo-samples-local/case-versions.conf index 9a2ae82744..b03fb1ae45 100644 --- a/2-advanced/dubbo-samples-local/case-versions.conf +++ b/2-advanced/dubbo-samples-local/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-local/pom.xml b/2-advanced/dubbo-samples-local/pom.xml index 63bd98b790..a69a4a489e 100644 --- a/2-advanced/dubbo-samples-local/pom.xml +++ b/2-advanced/dubbo-samples-local/pom.xml @@ -31,8 +31,8 @@ 1.8 1.8 3.2.6 - 4.3.30.RELEASE - 4.13.1 + 5.3.25 + 5.9.2 3.7.0 1.8 1.8 @@ -74,14 +74,24 @@ dubbo-dependencies-zookeeper-curator5 pom - - junit - junit - ${junit.version} + org.junit.jupiter + junit-jupiter-engine + ${junit5.version} + test + + + org.junit.jupiter + junit-jupiter-api + ${junit5.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit5.version} test - org.springframework spring-test diff --git a/2-advanced/dubbo-samples-local/src/test/java/org/apache/dubbo/samples/local/DemoServiceIT.java b/2-advanced/dubbo-samples-local/src/test/java/org/apache/dubbo/samples/local/DemoServiceIT.java index a865062d76..4c4f93608d 100644 --- a/2-advanced/dubbo-samples-local/src/test/java/org/apache/dubbo/samples/local/DemoServiceIT.java +++ b/2-advanced/dubbo-samples-local/src/test/java/org/apache/dubbo/samples/local/DemoServiceIT.java @@ -19,35 +19,50 @@ import org.apache.dubbo.samples.local.api.DemoService; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledForJreRange; +import org.junit.jupiter.api.condition.EnabledForJreRange; +import org.junit.jupiter.api.condition.JRE; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(locations = {"classpath:/spring/dubbo-demo.xml"}) public class DemoServiceIT { @Autowired private DemoService demoService; - @BeforeClass + @BeforeAll public static void setUp() throws Exception { new EmbeddedZooKeeper(2181, false).start(); } @Test - public void test() throws Exception { + @DisabledForJreRange(min = JRE.JAVA_15) + public void testZk() throws Exception { // see also: org.apache.dubbo.rpc.protocol.injvm.InjvmInvoker.doInvoke // InjvmInvoker set remote address to 127.0.0.1:0 String result = demoService.sayHello("world"); - Assert.assertEquals(result, "Hello world, response from provider: 127.0.0.1:0"); + Assertions.assertEquals(result, "Hello world, response from provider: 127.0.0.1:0"); result = demoService.sayHelloAsync("world"); - Assert.assertEquals(result, "Hello world, response from provider: 127.0.0.1:0"); + Assertions.assertEquals(result, "Hello world, response from provider: 127.0.0.1:0"); + } + @Test + @EnabledForJreRange(min = JRE.JAVA_15) + public void testZkHigh() throws Exception { + // see also: org.apache.dubbo.rpc.protocol.injvm.InjvmInvoker.doInvoke + // InjvmInvoker set remote address to 127.0.0.1:0 + String result = demoService.sayHello("world"); + Assertions.assertEquals(result, "Hello world, response from provider: 127.0.0.1/:0"); + + result = demoService.sayHelloAsync("world"); + Assertions.assertEquals(result, "Hello world, response from provider: 127.0.0.1/:0"); } } diff --git a/2-advanced/dubbo-samples-merge/case-versions.conf b/2-advanced/dubbo-samples-merge/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/2-advanced/dubbo-samples-merge/case-versions.conf +++ b/2-advanced/dubbo-samples-merge/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-mock/case-versions.conf b/2-advanced/dubbo-samples-mock/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/2-advanced/dubbo-samples-mock/case-versions.conf +++ b/2-advanced/dubbo-samples-mock/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-notify/case-versions.conf b/2-advanced/dubbo-samples-notify/case-versions.conf index 9a2ae82744..b03fb1ae45 100644 --- a/2-advanced/dubbo-samples-notify/case-versions.conf +++ b/2-advanced/dubbo-samples-notify/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-scala/case-versions.conf b/2-advanced/dubbo-samples-scala/case-versions.conf index 9210b7714a..9b9a512bd9 100644 --- a/2-advanced/dubbo-samples-scala/case-versions.conf +++ b/2-advanced/dubbo-samples-scala/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version= [>=3.2.0] spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-service-discovery/dubbo-demo-servicediscovery-xml/case-versions.conf b/2-advanced/dubbo-samples-service-discovery/dubbo-demo-servicediscovery-xml/case-versions.conf index 2d83b63d42..f9b78d6905 100644 --- a/2-advanced/dubbo-samples-service-discovery/dubbo-demo-servicediscovery-xml/case-versions.conf +++ b/2-advanced/dubbo-samples-service-discovery/dubbo-demo-servicediscovery-xml/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.1* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/case-versions.conf b/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/case-versions.conf index 36a1e3cf3a..b03fb1ae45 100644 --- a/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/case-versions.conf +++ b/2-advanced/dubbo-samples-service-discovery/dubbo-servicediscovery-migration/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* -java.version= [<= 11] \ No newline at end of file +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-service-discovery/servicediscovery-transfer/case-versions.conf b/2-advanced/dubbo-samples-service-discovery/servicediscovery-transfer/case-versions.conf index 36a1e3cf3a..b03fb1ae45 100644 --- a/2-advanced/dubbo-samples-service-discovery/servicediscovery-transfer/case-versions.conf +++ b/2-advanced/dubbo-samples-service-discovery/servicediscovery-transfer/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* -java.version= [<= 11] \ No newline at end of file +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-spi-compatible/case-versions.conf b/2-advanced/dubbo-samples-spi-compatible/case-versions.conf index 9a2ae82744..b03fb1ae45 100644 --- a/2-advanced/dubbo-samples-spi-compatible/case-versions.conf +++ b/2-advanced/dubbo-samples-spi-compatible/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-springcloud/dubbo-call-sc/case-versions.conf b/2-advanced/dubbo-samples-springcloud/dubbo-call-sc/case-versions.conf index d998630398..2d57f160ed 100644 --- a/2-advanced/dubbo-samples-springcloud/dubbo-call-sc/case-versions.conf +++ b/2-advanced/dubbo-samples-springcloud/dubbo-call-sc/case-versions.conf @@ -22,4 +22,4 @@ # SpringBoot/SpringCloud app dubbo.version=3.3.* spring-boot.version=2.7.* -java.version= [ <= 11] +java.version= [ >= 8] diff --git a/2-advanced/dubbo-samples-springcloud/sc-call-dubbo/case-versions.conf b/2-advanced/dubbo-samples-springcloud/sc-call-dubbo/case-versions.conf index 1b4da911c7..3752048473 100644 --- a/2-advanced/dubbo-samples-springcloud/sc-call-dubbo/case-versions.conf +++ b/2-advanced/dubbo-samples-springcloud/sc-call-dubbo/case-versions.conf @@ -22,4 +22,4 @@ # SpringBoot/SpringCloud app dubbo.version=3.3.* spring-boot.version=2.7.* -java.version= [<= 11] \ No newline at end of file +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-stub/case-versions.conf b/2-advanced/dubbo-samples-stub/case-versions.conf index 9a2ae82744..b03fb1ae45 100644 --- a/2-advanced/dubbo-samples-stub/case-versions.conf +++ b/2-advanced/dubbo-samples-stub/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-tengine/case-versions.conf b/2-advanced/dubbo-samples-tengine/case-versions.conf index 2e27b0ba59..4638ce5684 100644 --- a/2-advanced/dubbo-samples-tengine/case-versions.conf +++ b/2-advanced/dubbo-samples-tengine/case-versions.conf @@ -22,4 +22,4 @@ # SpringBoot app dubbo.version=2.7*, 3.* spring-boot.version=2.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-validation/case-versions.conf b/2-advanced/dubbo-samples-validation/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/2-advanced/dubbo-samples-validation/case-versions.conf +++ b/2-advanced/dubbo-samples-validation/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/2-advanced/dubbo-samples-version/case-versions.conf b/2-advanced/dubbo-samples-version/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/2-advanced/dubbo-samples-version/case-versions.conf +++ b/2-advanced/dubbo-samples-version/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-annotation/case-versions.conf +++ b/3-extensions/configcenter/dubbo-samples-configcenter-annotation/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-api/case-versions.conf +++ b/3-extensions/configcenter/dubbo-samples-configcenter-api/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-apollo/case-versions.conf +++ b/3-extensions/configcenter/dubbo-samples-configcenter-apollo/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-externalconfiguration/case-versions.conf +++ b/3-extensions/configcenter/dubbo-samples-configcenter-externalconfiguration/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/3-extensions/configcenter/dubbo-samples-configcenter-externalconfiguration/pom.xml b/3-extensions/configcenter/dubbo-samples-configcenter-externalconfiguration/pom.xml index e18adb7ca8..0519633898 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-externalconfiguration/pom.xml +++ b/3-extensions/configcenter/dubbo-samples-configcenter-externalconfiguration/pom.xml @@ -35,6 +35,7 @@ 1.8 3.2.6 1.5.21.RELEASE + 3.29.2-GA 4.13.1 3.8.1 3.7.0 @@ -107,6 +108,12 @@ test + + org.javassist + javassist + ${javassist.version} + + org.springframework.boot spring-boot-starter 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-multiprotocol/case-versions.conf +++ b/3-extensions/configcenter/dubbo-samples-configcenter-multiprotocol/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 100644 --- a/3-extensions/configcenter/dubbo-samples-configcenter-xml/case-versions.conf +++ b/3-extensions/configcenter/dubbo-samples-configcenter-xml/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20fd4e197b..849454557b 100644 --- a/3-extensions/protocol/dubbo-samples-port-unification/case-versions.conf +++ b/3-extensions/protocol/dubbo-samples-port-unification/case-versions.conf @@ -21,4 +21,4 @@ # Spring app dubbo.version=[ >=3.1.0 ] -java.version= [<= 11] +java.version= [>= 8] diff --git a/3-extensions/protocol/dubbo-samples-rest/case-versions.conf b/3-extensions/protocol/dubbo-samples-rest/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/3-extensions/protocol/dubbo-samples-rest/case-versions.conf +++ b/3-extensions/protocol/dubbo-samples-rest/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/3-extensions/protocol/dubbo-samples-rest/pom.xml b/3-extensions/protocol/dubbo-samples-rest/pom.xml index aba5d085a7..b3f04fa6a0 100644 --- a/3-extensions/protocol/dubbo-samples-rest/pom.xml +++ b/3-extensions/protocol/dubbo-samples-rest/pom.xml @@ -32,6 +32,7 @@ 1.8 1.8 4.3.30.RELEASE + 3.29.2-GA 3.2.6 1.1.0.Final 4.2.0.Final @@ -137,6 +138,12 @@ + + + org.javassist + javassist + ${javassist.version} + org.slf4j slf4j-simple diff --git a/3-extensions/protocol/dubbo-samples-thrift/case-versions.conf b/3-extensions/protocol/dubbo-samples-thrift/case-versions.conf index d1063e7038..dbcb9607dc 100644 --- a/3-extensions/protocol/dubbo-samples-thrift/case-versions.conf +++ b/3-extensions/protocol/dubbo-samples-thrift/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 b580faac31..4f23a3e586 100644 --- a/3-extensions/protocol/dubbo-samples-triple-reactor/case-versions.conf +++ b/3-extensions/protocol/dubbo-samples-triple-reactor/case-versions.conf @@ -21,4 +21,4 @@ # Spring app dubbo.version=[ >=3.1.0 ] compiler.version=[ >=3.1.0 ] -java.version= [<= 11] +java.version= [>= 8] diff --git a/3-extensions/protocol/dubbo-samples-triple/case-versions.conf b/3-extensions/protocol/dubbo-samples-triple/case-versions.conf index 1814757737..ed4bf2017f 100644 --- a/3-extensions/protocol/dubbo-samples-triple/case-versions.conf +++ b/3-extensions/protocol/dubbo-samples-triple/case-versions.conf @@ -21,5 +21,5 @@ # Spring app dubbo.version=[ >=3.1.0 ] spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] compiler.version=0.0.*, 3.* diff --git a/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/util/TriSampleConstants.java b/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/util/TriSampleConstants.java index 40dacfae4e..47af3cb20d 100644 --- a/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/util/TriSampleConstants.java +++ b/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/util/TriSampleConstants.java @@ -20,6 +20,8 @@ import org.apache.dubbo.common.constants.CommonConstants; +import com.alibaba.fastjson2.util.JDKUtils; + import static org.apache.dubbo.common.constants.RegistryConstants.DEFAULT_REGISTER_MODE_ALL; import static org.apache.dubbo.common.constants.RegistryConstants.DEFAULT_REGISTER_MODE_INSTANCE; import static org.apache.dubbo.common.constants.RegistryConstants.DEFAULT_REGISTER_MODE_INTERFACE; @@ -52,7 +54,7 @@ public class TriSampleConstants { public static final String LOCAL_HOST = "localhost"; - public static final String DEFAULT_ADDRESS = CommonConstants.TRIPLE + "://" + HOST + ":" + SERVER_PORT; + public static final String DEFAULT_ADDRESS = CommonConstants.TRIPLE + "://" + HOST + ":" + SERVER_PORT + "?serialization=" + (JDKUtils.JVM_VERSION >= 17 ? "fastjson2" : "hessian2"); public static final String DEFAULT_MULTI_ADDRESS = CommonConstants.TRIPLE + "://" + HOST + ":" + SERVER_PORT + ";" + CommonConstants.TRIPLE + "://" + LOCAL_HOST + ":" + SERVER_PORT; diff --git a/3-extensions/protocol/dubbo-samples-webservice/case-versions.conf b/3-extensions/protocol/dubbo-samples-webservice/case-versions.conf index f0d8f01fc1..349af2a7b0 100644 --- a/3-extensions/protocol/dubbo-samples-webservice/case-versions.conf +++ b/3-extensions/protocol/dubbo-samples-webservice/case-versions.conf @@ -4,4 +4,4 @@ # Spring app dubbo.version=2.7* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 100644 --- a/3-extensions/registry/dubbo-samples-multi-registry/case-versions.conf +++ b/3-extensions/registry/dubbo-samples-multi-registry/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 1001c2715d..dc1ca0a596 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,6 +22,6 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] nacos.version="!*-BETA","!*-ALPHA*",2.* #nacos-server.version="!*-slim","!*-BETA",2.* 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/3-extensions/registry/dubbo-samples-zookeeper/case-versions.conf b/3-extensions/registry/dubbo-samples-zookeeper/case-versions.conf index ce7fbe6fd1..39e5469330 100644 --- a/3-extensions/registry/dubbo-samples-zookeeper/case-versions.conf +++ b/3-extensions/registry/dubbo-samples-zookeeper/case-versions.conf @@ -22,5 +22,5 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] zookeeper-server.version=["!*-temurin", >= 3.6.0 ] 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 a370983f5b..e2baf7bda9 100644 --- a/3-extensions/serialization/dubbo-samples-prefer-serialization/case-versions.conf +++ b/3-extensions/serialization/dubbo-samples-prefer-serialization/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=[ >=3.2.0 ] spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..b03fb1ae45 100644 --- a/3-extensions/serialization/dubbo-samples-protobuf-json/case-versions.conf +++ b/3-extensions/serialization/dubbo-samples-protobuf-json/case-versions.conf @@ -20,6 +20,6 @@ # Supported component versions of the test case # Spring app -dubbo.version=2.7*, 3.* +dubbo.version=3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/3-extensions/serialization/dubbo-samples-protobuf-json/pom.xml b/3-extensions/serialization/dubbo-samples-protobuf-json/pom.xml index 55dfce7dbd..40421735e9 100644 --- a/3-extensions/serialization/dubbo-samples-protobuf-json/pom.xml +++ b/3-extensions/serialization/dubbo-samples-protobuf-json/pom.xml @@ -37,7 +37,7 @@ 1.8 1.8 - 2.7.13 + 3.2.6 3.24.3 4.13.1 4.3.30.RELEASE @@ -63,7 +63,7 @@ org.apache.dubbo - dubbo-dependencies-zookeeper + dubbo-dependencies-zookeeper-curator5 ${dubbo.version} pom diff --git a/3-extensions/serialization/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/pom.xml b/3-extensions/serialization/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/pom.xml index 6fd43fd164..dd9c742021 100644 --- a/3-extensions/serialization/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/pom.xml +++ b/3-extensions/serialization/dubbo-samples-protobuf-json/protobuf-json-serialization-demo/pom.xml @@ -39,7 +39,7 @@ org.apache.dubbo - dubbo-dependencies-zookeeper + dubbo-dependencies-zookeeper-curator5 pom diff --git a/3-extensions/serialization/dubbo-samples-protobuf/case-versions.conf b/3-extensions/serialization/dubbo-samples-protobuf/case-versions.conf index 969be67c4e..f38471a00b 100644 --- a/3-extensions/serialization/dubbo-samples-protobuf/case-versions.conf +++ b/3-extensions/serialization/dubbo-samples-protobuf/case-versions.conf @@ -22,5 +22,5 @@ # Spring app dubbo.version=2.7* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 aad5efdc51..9763c599e8 100644 --- a/3-extensions/serialization/dubbo-samples-protostuff/case-versions.conf +++ b/3-extensions/serialization/dubbo-samples-protostuff/case-versions.conf @@ -22,4 +22,4 @@ # SpringBoot app dubbo.version=2.7* spring-boot.version=2.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/4-governance/dubbo-samples-applevel-override/case-versions.conf b/4-governance/dubbo-samples-applevel-override/case-versions.conf index 9719b5b6be..29e6ce3d3c 100644 --- a/4-governance/dubbo-samples-applevel-override/case-versions.conf +++ b/4-governance/dubbo-samples-applevel-override/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version= [ >= 3.1.0 ] spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/4-governance/dubbo-samples-configconditionrouter/case-versions.conf b/4-governance/dubbo-samples-configconditionrouter/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/4-governance/dubbo-samples-configconditionrouter/case-versions.conf +++ b/4-governance/dubbo-samples-configconditionrouter/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/4-governance/dubbo-samples-meshrule-router/case-versions.conf b/4-governance/dubbo-samples-meshrule-router/case-versions.conf index 9a2ae82744..b03fb1ae45 100644 --- a/4-governance/dubbo-samples-meshrule-router/case-versions.conf +++ b/4-governance/dubbo-samples-meshrule-router/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/4-governance/dubbo-samples-metrics-prometheus/case-versions.conf b/4-governance/dubbo-samples-metrics-prometheus/case-versions.conf index 88cbf175b2..387472e68f 100644 --- a/4-governance/dubbo-samples-metrics-prometheus/case-versions.conf +++ b/4-governance/dubbo-samples-metrics-prometheus/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version[ >= 3.2.6 ] spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/4-governance/dubbo-samples-metrics-spring-boot/case-versions.conf b/4-governance/dubbo-samples-metrics-spring-boot/case-versions.conf index f9b0baa6b0..78b611b016 100644 --- a/4-governance/dubbo-samples-metrics-spring-boot/case-versions.conf +++ b/4-governance/dubbo-samples-metrics-spring-boot/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=3.2.0 spring.version=5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/4-governance/dubbo-samples-metrics/case-versions.conf b/4-governance/dubbo-samples-metrics/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/4-governance/dubbo-samples-metrics/case-versions.conf +++ b/4-governance/dubbo-samples-metrics/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/4-governance/dubbo-samples-monitor/case-versions.conf b/4-governance/dubbo-samples-monitor/case-versions.conf index 9b0ef8c86a..ac83f45c3b 100644 --- a/4-governance/dubbo-samples-monitor/case-versions.conf +++ b/4-governance/dubbo-samples-monitor/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*,3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/4-governance/dubbo-samples-servicelevel-override/case-versions.conf b/4-governance/dubbo-samples-servicelevel-override/case-versions.conf index 9a2ae82744..b03fb1ae45 100644 --- a/4-governance/dubbo-samples-servicelevel-override/case-versions.conf +++ b/4-governance/dubbo-samples-servicelevel-override/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..98c69db97c 100644 --- a/4-governance/dubbo-samples-spring-boot-hystrix/case-versions.conf +++ b/4-governance/dubbo-samples-spring-boot-hystrix/case-versions.conf @@ -21,5 +21,4 @@ # Spring app dubbo.version=2.7*, 3.* -spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/4-governance/dubbo-samples-spring-boot-hystrix/pom.xml b/4-governance/dubbo-samples-spring-boot-hystrix/pom.xml index 9d84c15e20..e0022958bd 100644 --- a/4-governance/dubbo-samples-spring-boot-hystrix/pom.xml +++ b/4-governance/dubbo-samples-spring-boot-hystrix/pom.xml @@ -32,9 +32,10 @@ 1.8 1.8 3.2.6 - 4.3.30.RELEASE - 1.5.21.RELEASE - 1.4.7.RELEASE + 2.3.12.RELEASE + 2.2.10.RELEASE + 1.9.20.1 + 3.29.2-GA 4.13.1 3.8.1 3.7.0 @@ -78,6 +79,12 @@ org.apache.dubbo dubbo + + + spring-context + org.springframework + + @@ -96,6 +103,32 @@ org.springframework.cloud spring-cloud-starter-netflix-hystrix ${hystrix-starter.version} + + + aspectjweaver + org.aspectj + + + jackson-annotations + com.fasterxml.jackson.core + + + jackson-core + com.fasterxml.jackson.core + + + + + + org.aspectj + aspectjweaver + ${aspectjweaver.version} + + + + org.javassist + javassist + ${javassist.version} @@ -108,6 +141,7 @@ org.springframework.boot spring-boot-starter + ${spring-boot.version} diff --git a/4-governance/dubbo-samples-spring-hystrix/case-versions.conf b/4-governance/dubbo-samples-spring-hystrix/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/4-governance/dubbo-samples-spring-hystrix/case-versions.conf +++ b/4-governance/dubbo-samples-spring-hystrix/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/4-governance/dubbo-samples-spring-hystrix/pom.xml b/4-governance/dubbo-samples-spring-hystrix/pom.xml index 8d6199f0a0..bb2d62f4f1 100644 --- a/4-governance/dubbo-samples-spring-hystrix/pom.xml +++ b/4-governance/dubbo-samples-spring-hystrix/pom.xml @@ -33,7 +33,9 @@ 1.8 3.2.6 4.3.30.RELEASE + 1.9.20.1 1.5.18 + 3.29.2-GA 4.13.1 3.8.1 3.7.0 @@ -91,12 +93,24 @@ + + org.aspectj + aspectjweaver + ${aspectjweaver.version} + + com.netflix.hystrix hystrix-core ${hystrix.version} + + org.javassist + javassist + ${javassist.version} + + com.netflix.hystrix hystrix-serialization diff --git a/4-governance/dubbo-samples-ssl/case-versions.conf b/4-governance/dubbo-samples-ssl/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/4-governance/dubbo-samples-ssl/case-versions.conf +++ b/4-governance/dubbo-samples-ssl/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/4-governance/dubbo-samples-tagrouter/case-versions.conf b/4-governance/dubbo-samples-tagrouter/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/4-governance/dubbo-samples-tagrouter/case-versions.conf +++ b/4-governance/dubbo-samples-tagrouter/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 9a2ae82744..b03fb1ae45 100644 --- a/99-integration/dubbo-samples-empty-protection-nacos/case-versions.conf +++ b/99-integration/dubbo-samples-empty-protection-nacos/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-empty-protection/case-versions.conf b/99-integration/dubbo-samples-empty-protection/case-versions.conf index 9a2ae82744..b03fb1ae45 100644 --- a/99-integration/dubbo-samples-empty-protection/case-versions.conf +++ b/99-integration/dubbo-samples-empty-protection/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-grpc/dubbo-samples-original/case-versions.conf b/99-integration/dubbo-samples-grpc/dubbo-samples-original/case-versions.conf index 10334cee93..18dcecb3b5 100644 --- a/99-integration/dubbo-samples-grpc/dubbo-samples-original/case-versions.conf +++ b/99-integration/dubbo-samples-grpc/dubbo-samples-original/case-versions.conf @@ -22,5 +22,5 @@ # SpringBoot app dubbo.version=2.7*, 3.1.6 spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] compiler.version=0.0.*, 3.* diff --git a/99-integration/dubbo-samples-grpc/dubbo-samples-reactor/case-versions.conf b/99-integration/dubbo-samples-grpc/dubbo-samples-reactor/case-versions.conf index 53154e7069..7e6cd88e17 100644 --- a/99-integration/dubbo-samples-grpc/dubbo-samples-reactor/case-versions.conf +++ b/99-integration/dubbo-samples-grpc/dubbo-samples-reactor/case-versions.conf @@ -22,5 +22,5 @@ # Spring app dubbo.version=2.7*, 3.1.6 spring.version=4.*, 5.* -java.version= [<= 11] -compiler.version=0.0.*, 3.* \ No newline at end of file +java.version= [>= 8] +compiler.version=0.0.*, 3.* diff --git a/99-integration/dubbo-samples-hibernate/case-versions.conf b/99-integration/dubbo-samples-hibernate/case-versions.conf index 32a2e5be56..795d1a4922 100644 --- a/99-integration/dubbo-samples-hibernate/case-versions.conf +++ b/99-integration/dubbo-samples-hibernate/case-versions.conf @@ -22,4 +22,4 @@ # SpringBoot app dubbo.version=2.7*, 3.1* spring-boot.version=2.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-isolation-executor/case-versions.conf b/99-integration/dubbo-samples-isolation-executor/case-versions.conf index a370983f5b..e2baf7bda9 100644 --- a/99-integration/dubbo-samples-isolation-executor/case-versions.conf +++ b/99-integration/dubbo-samples-isolation-executor/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=[ >=3.2.0 ] spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 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,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-mybatis/case-versions.conf b/99-integration/dubbo-samples-mybatis/case-versions.conf index 32a2e5be56..795d1a4922 100644 --- a/99-integration/dubbo-samples-mybatis/case-versions.conf +++ b/99-integration/dubbo-samples-mybatis/case-versions.conf @@ -22,4 +22,4 @@ # SpringBoot app dubbo.version=2.7*, 3.1* spring-boot.version=2.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-nacos-merge/case-versions.conf b/99-integration/dubbo-samples-nacos-merge/case-versions.conf index 6fad8d8ad9..57a327c0de 100644 --- a/99-integration/dubbo-samples-nacos-merge/case-versions.conf +++ b/99-integration/dubbo-samples-nacos-merge/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=[ >= 3.1.0 ] spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] 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 d877829a09..6a3268023f 100644 --- a/99-integration/dubbo-samples-port-unification-netty3/case-versions.conf +++ b/99-integration/dubbo-samples-port-unification-netty3/case-versions.conf @@ -21,4 +21,4 @@ # Spring app dubbo.version=[ >=3.2.0 ] -java.version= [<= 11] +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-prefer-serialization-test/case-versions.conf b/99-integration/dubbo-samples-prefer-serialization-test/case-versions.conf index 1a75dd0962..56b50b2246 100644 --- a/99-integration/dubbo-samples-prefer-serialization-test/case-versions.conf +++ b/99-integration/dubbo-samples-prefer-serialization-test/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=[ >= 3.2.0 ] spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-registry-test-curator-instance/case-versions.conf b/99-integration/dubbo-samples-registry-test-curator-instance/case-versions.conf index 706c8278ee..070a339575 100644 --- a/99-integration/dubbo-samples-registry-test-curator-instance/case-versions.conf +++ b/99-integration/dubbo-samples-registry-test-curator-instance/case-versions.conf @@ -22,5 +22,5 @@ # Spring app dubbo.version=[ >= 3.2.0 ] spring.version=4.*, 5.* -java.version= [ <= 11 ] +java.version= [ >= 8 ] curator.version= [ >= 4.0.0 ] diff --git a/99-integration/dubbo-samples-registry-test-curator-instance/src/main/resources/log4j.properties b/99-integration/dubbo-samples-registry-test-curator-instance/src/main/resources/log4j.properties index d6ecd5ce34..3fa75995b9 100644 --- a/99-integration/dubbo-samples-registry-test-curator-instance/src/main/resources/log4j.properties +++ b/99-integration/dubbo-samples-registry-test-curator-instance/src/main/resources/log4j.properties @@ -18,9 +18,9 @@ # ###set log levels### -log4j.rootLogger=info, stdout +log4j.rootLogger=debug, stdout ###output to the console### log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.Target=System.out log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%d{dd/MM/yy hh:mm:ss:sss z}] %t %5p %c{2}: %m%n \ No newline at end of file +log4j.appender.stdout.layout.ConversionPattern=[%d{dd/MM/yy hh:mm:ss:sss z}] %t %5p %c{2}: %m%n diff --git a/99-integration/dubbo-samples-registry-test-curator-instance/src/test/java/org/apache/dubbo/samples/test/ZookeeperIT.java b/99-integration/dubbo-samples-registry-test-curator-instance/src/test/java/org/apache/dubbo/samples/test/ZookeeperIT.java index da45d47e1f..6c9a61ff9b 100644 --- a/99-integration/dubbo-samples-registry-test-curator-instance/src/test/java/org/apache/dubbo/samples/test/ZookeeperIT.java +++ b/99-integration/dubbo-samples-registry-test-curator-instance/src/test/java/org/apache/dubbo/samples/test/ZookeeperIT.java @@ -180,7 +180,7 @@ public void test() { for (int i = 0; i < 100; i++) { result.add(demoService1.getRemote()); } - Assert.assertEquals(3, result.size()); + Assert.assertEquals(result.toString(), 3, result.size()); Assert.assertTrue(result.contains("App1")); Assert.assertTrue(result.contains("App2")); Assert.assertTrue(result.contains("App3")); @@ -189,7 +189,7 @@ public void test() { for (int i = 0; i < 100; i++) { result.add(demoService2.getRemote()); } - Assert.assertEquals(3, result.size()); + Assert.assertEquals(result.toString(), 3, result.size()); Assert.assertTrue(result.contains("App1")); Assert.assertTrue(result.contains("App2")); Assert.assertTrue(result.contains("App3")); @@ -198,7 +198,7 @@ public void test() { for (int i = 0; i < 100; i++) { result.add(demoService3.getRemote()); } - Assert.assertEquals(3, result.size()); + Assert.assertEquals(result.toString(), 3, result.size()); Assert.assertTrue(result.contains("App1")); Assert.assertTrue(result.contains("App2")); Assert.assertTrue(result.contains("App3")); diff --git a/99-integration/dubbo-samples-rest-withtoken/case-versions.conf b/99-integration/dubbo-samples-rest-withtoken/case-versions.conf index 0e40e7abbe..5593f85e38 100644 --- a/99-integration/dubbo-samples-rest-withtoken/case-versions.conf +++ b/99-integration/dubbo-samples-rest-withtoken/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=[ >= 3.2.0 ] spring.version=5.* -java.version= [<= 11] +java.version= [>= 8] 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 d877829a09..6a3268023f 100644 --- a/99-integration/dubbo-samples-router-chain-switch/case-versions.conf +++ b/99-integration/dubbo-samples-router-chain-switch/case-versions.conf @@ -21,4 +21,4 @@ # Spring app dubbo.version=[ >=3.2.0 ] -java.version= [<= 11] +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-sd-group/case-versions.conf b/99-integration/dubbo-samples-sd-group/case-versions.conf index 6fad8d8ad9..57a327c0de 100644 --- a/99-integration/dubbo-samples-sd-group/case-versions.conf +++ b/99-integration/dubbo-samples-sd-group/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=[ >= 3.1.0 ] spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-sd-merge/case-versions.conf b/99-integration/dubbo-samples-sd-merge/case-versions.conf index 6fad8d8ad9..57a327c0de 100644 --- a/99-integration/dubbo-samples-sd-merge/case-versions.conf +++ b/99-integration/dubbo-samples-sd-merge/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=[ >= 3.1.0 ] spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-sd-version/case-versions.conf b/99-integration/dubbo-samples-sd-version/case-versions.conf index 6fad8d8ad9..57a327c0de 100644 --- a/99-integration/dubbo-samples-sd-version/case-versions.conf +++ b/99-integration/dubbo-samples-sd-version/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=[ >= 3.1.0 ] spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-sentinel-compact/case-versions.conf b/99-integration/dubbo-samples-sentinel-compact/case-versions.conf index f6cf51e21a..cac3bfc58d 100644 --- a/99-integration/dubbo-samples-sentinel-compact/case-versions.conf +++ b/99-integration/dubbo-samples-sentinel-compact/case-versions.conf @@ -22,5 +22,5 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] sentinel.version= [ >= 1.7.1 ] diff --git a/99-integration/dubbo-samples-sentinel-dubbo3/case-versions.conf b/99-integration/dubbo-samples-sentinel-dubbo3/case-versions.conf index b3e3d4d4fc..2c50b1157b 100644 --- a/99-integration/dubbo-samples-sentinel-dubbo3/case-versions.conf +++ b/99-integration/dubbo-samples-sentinel-dubbo3/case-versions.conf @@ -22,5 +22,5 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] -sentinel.version= [ >= 1.8.6 ] \ No newline at end of file +java.version= [>= 8] +sentinel.version= [ >= 1.8.6 ] diff --git a/99-integration/dubbo-samples-serialize-check/case-versions.conf b/99-integration/dubbo-samples-serialize-check/case-versions.conf index dc806f6fe9..f2ca8116b5 100644 --- a/99-integration/dubbo-samples-serialize-check/case-versions.conf +++ b/99-integration/dubbo-samples-serialize-check/case-versions.conf @@ -21,4 +21,4 @@ # Spring app dubbo.version=[ >= 3.1.0 ] -java.version= [<= 11] +java.version= [>= 8] 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 20c45c863f..f7373a530c 100644 --- a/99-integration/dubbo-samples-switch-serialization-thread/case-versions.conf +++ b/99-integration/dubbo-samples-switch-serialization-thread/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-test-10704/case-versions.conf b/99-integration/dubbo-samples-test-10704/case-versions.conf index 9a2ae82744..b03fb1ae45 100644 --- a/99-integration/dubbo-samples-test-10704/case-versions.conf +++ b/99-integration/dubbo-samples-test-10704/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-test-10704/pom.xml b/99-integration/dubbo-samples-test-10704/pom.xml index 6cf7b5b19c..5cdcd5af3b 100644 --- a/99-integration/dubbo-samples-test-10704/pom.xml +++ b/99-integration/dubbo-samples-test-10704/pom.xml @@ -34,8 +34,8 @@ 1.8 1.8 3.2.6 - 4.3.30.RELEASE - 4.13.1 + 5.3.25 + 5.9.2 3.7.0 1.8 1.8 @@ -77,11 +77,22 @@ dubbo-dependencies-zookeeper-curator5 pom - - junit - junit - ${junit.version} + org.junit.jupiter + junit-jupiter-engine + ${junit5.version} + test + + + org.junit.jupiter + junit-jupiter-api + ${junit5.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit5.version} test diff --git a/99-integration/dubbo-samples-test-10704/src/test/java/org/apache/dubbo/samples/local/DemoServiceIT.java b/99-integration/dubbo-samples-test-10704/src/test/java/org/apache/dubbo/samples/local/DemoServiceIT.java index a865062d76..4c4f93608d 100644 --- a/99-integration/dubbo-samples-test-10704/src/test/java/org/apache/dubbo/samples/local/DemoServiceIT.java +++ b/99-integration/dubbo-samples-test-10704/src/test/java/org/apache/dubbo/samples/local/DemoServiceIT.java @@ -19,35 +19,50 @@ import org.apache.dubbo.samples.local.api.DemoService; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledForJreRange; +import org.junit.jupiter.api.condition.EnabledForJreRange; +import org.junit.jupiter.api.condition.JRE; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(locations = {"classpath:/spring/dubbo-demo.xml"}) public class DemoServiceIT { @Autowired private DemoService demoService; - @BeforeClass + @BeforeAll public static void setUp() throws Exception { new EmbeddedZooKeeper(2181, false).start(); } @Test - public void test() throws Exception { + @DisabledForJreRange(min = JRE.JAVA_15) + public void testZk() throws Exception { // see also: org.apache.dubbo.rpc.protocol.injvm.InjvmInvoker.doInvoke // InjvmInvoker set remote address to 127.0.0.1:0 String result = demoService.sayHello("world"); - Assert.assertEquals(result, "Hello world, response from provider: 127.0.0.1:0"); + Assertions.assertEquals(result, "Hello world, response from provider: 127.0.0.1:0"); result = demoService.sayHelloAsync("world"); - Assert.assertEquals(result, "Hello world, response from provider: 127.0.0.1:0"); + Assertions.assertEquals(result, "Hello world, response from provider: 127.0.0.1:0"); + } + @Test + @EnabledForJreRange(min = JRE.JAVA_15) + public void testZkHigh() throws Exception { + // see also: org.apache.dubbo.rpc.protocol.injvm.InjvmInvoker.doInvoke + // InjvmInvoker set remote address to 127.0.0.1:0 + String result = demoService.sayHello("world"); + Assertions.assertEquals(result, "Hello world, response from provider: 127.0.0.1/:0"); + + result = demoService.sayHelloAsync("world"); + Assertions.assertEquals(result, "Hello world, response from provider: 127.0.0.1/:0"); } } diff --git a/99-integration/dubbo-samples-test-11096/case-versions.conf b/99-integration/dubbo-samples-test-11096/case-versions.conf index 6fad8d8ad9..57a327c0de 100644 --- a/99-integration/dubbo-samples-test-11096/case-versions.conf +++ b/99-integration/dubbo-samples-test-11096/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=[ >= 3.1.0 ] spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-test-11137/case-versions.conf b/99-integration/dubbo-samples-test-11137/case-versions.conf index 6fad8d8ad9..57a327c0de 100644 --- a/99-integration/dubbo-samples-test-11137/case-versions.conf +++ b/99-integration/dubbo-samples-test-11137/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=[ >= 3.1.0 ] spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-test-11159/case-versions.conf b/99-integration/dubbo-samples-test-11159/case-versions.conf index 6fad8d8ad9..57a327c0de 100644 --- a/99-integration/dubbo-samples-test-11159/case-versions.conf +++ b/99-integration/dubbo-samples-test-11159/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=[ >= 3.1.0 ] spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-test-12208/case-versions.conf b/99-integration/dubbo-samples-test-12208/case-versions.conf index 1a75dd0962..56b50b2246 100644 --- a/99-integration/dubbo-samples-test-12208/case-versions.conf +++ b/99-integration/dubbo-samples-test-12208/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=[ >= 3.2.0 ] spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-test-12697/case-versions.conf b/99-integration/dubbo-samples-test-12697/case-versions.conf index 20c45c863f..f7373a530c 100644 --- a/99-integration/dubbo-samples-test-12697/case-versions.conf +++ b/99-integration/dubbo-samples-test-12697/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=2.7*, 3.* spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/99-integration/dubbo-samples-test-9806/case-versions.conf b/99-integration/dubbo-samples-test-9806/case-versions.conf index 6fad8d8ad9..57a327c0de 100644 --- a/99-integration/dubbo-samples-test-9806/case-versions.conf +++ b/99-integration/dubbo-samples-test-9806/case-versions.conf @@ -22,4 +22,4 @@ # Spring app dubbo.version=[ >= 3.1.0 ] spring.version=4.*, 5.* -java.version= [<= 11] +java.version= [>= 8] diff --git a/pom.xml b/pom.xml index beb204c5a5..4b26462508 100644 --- a/pom.xml +++ b/pom.xml @@ -35,8 +35,6 @@ UTF-8 3.10.1 1.3.2 - 1.8 - 1.8