diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 54cbb7c7..d716f57b 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -29,8 +29,8 @@ 2.16.0 2.0.2 2.1.6 - 2.6.5 - 0.2.1.RELEASE + 2.7.1 + 2.7.1 0.0.2 1.1.0 1.1.8 @@ -167,6 +167,11 @@ sentinel-dubbo-adapter ${sentinel.version} + + com.alibaba.csp + sentinel-apache-dubbo-adapter + ${sentinel.version} + org.springframework.cloud sentinel-dubbo-api @@ -194,7 +199,7 @@ - com.alibaba + org.apache.dubbo dubbo ${dubbo.version} @@ -215,7 +220,7 @@ - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-starter ${dubbo-spring-boot.version} diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml index 88a4c663..a587640d 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml @@ -28,12 +28,17 @@ - com.alibaba.boot + com.alibaba.csp + sentinel-apache-dubbo-adapter + + + + org.apache.dubbo dubbo-spring-boot-starter - com.alibaba + org.apache.dubbo dubbo diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/FooServiceConsumer.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/FooServiceConsumer.java index 0caae729..705ddbc5 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/FooServiceConsumer.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/FooServiceConsumer.java @@ -1,14 +1,13 @@ package org.springframework.cloud.alibaba.cloud.examples; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; /** * @author fangjian */ public class FooServiceConsumer { - @Reference(version = "${foo.service.version}", application = "${dubbo.application.id}", - url = "dubbo://localhost:12345", timeout = 30000) + @Reference(version = "${foo.service.version}", application = "${dubbo.application.id}", url = "dubbo://localhost:12345", timeout = 30000) private FooService fooService; public String hello(String name) { diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml index d9c20878..8cce2fdf 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml @@ -21,18 +21,24 @@ org.springframework.cloud spring-cloud-starter-alibaba-sentinel + org.springframework.cloud sentinel-dubbo-api - com.alibaba.boot + com.alibaba.csp + sentinel-apache-dubbo-adapter + + + + org.apache.dubbo dubbo-spring-boot-starter - com.alibaba + org.apache.dubbo dubbo diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/FooServiceImpl.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/FooServiceImpl.java index 11dd2263..857b31bc 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/FooServiceImpl.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/FooServiceImpl.java @@ -1,20 +1,15 @@ package org.springframework.cloud.alibaba.cloud.examples; -import com.alibaba.dubbo.config.annotation.Service; +import org.apache.dubbo.config.annotation.Service; /** * @author fangjian */ -@Service( - version = "${foo.service.version}", - application = "${dubbo.application.id}", - protocol = "${dubbo.protocol.id}", - registry = "${dubbo.registry.id}" -) +@Service(version = "${foo.service.version}", application = "${dubbo.application.id}", protocol = "${dubbo.protocol.id}", registry = "${dubbo.registry.id}") public class FooServiceImpl implements FooService { - @Override - public String hello(String name) { - return "hello, " + name; - } + @Override + public String hello(String name) { + return "hello, " + name; + } } \ No newline at end of file diff --git a/spring-cloud-alibaba-sentinel/pom.xml b/spring-cloud-alibaba-sentinel/pom.xml index 1c0d9934..f52c6241 100644 --- a/spring-cloud-alibaba-sentinel/pom.xml +++ b/spring-cloud-alibaba-sentinel/pom.xml @@ -33,6 +33,13 @@ com.alibaba.csp sentinel-dubbo-adapter + true + + + + com.alibaba.csp + sentinel-apache-dubbo-adapter + true