diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 822eb72a..b47c708e 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -29,6 +29,8 @@ 2.1.6 1.1.0 1.1.8 + 2.7.1 + 2.7.1 @@ -153,6 +155,11 @@ sentinel-dubbo-adapter ${sentinel.version} + + com.alibaba.csp + sentinel-apache-dubbo-adapter + ${sentinel.version} + org.springframework.cloud sentinel-dubbo-api @@ -177,6 +184,34 @@ ${fescar.version} + + + org.apache.dubbo + dubbo + ${dubbo.version} + + + org.springframework + spring-context + + + javax.servlet + servlet-api + + + log4j + log4j + + + + + + + org.apache.dubbo + dubbo-spring-boot-starter + ${dubbo-spring-boot.version} + + com.aliyun.oss 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 275dec17..fbaaffe9 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,9 +28,18 @@ - com.alibaba.boot + com.alibaba.csp + sentinel-apache-dubbo-adapter + + + + org.apache.dubbo dubbo-spring-boot-starter - 0.1.1 + + + + 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 d064f6a1..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,6 +1,6 @@ package org.springframework.cloud.alibaba.cloud.examples; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; /** * @author fangjian 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 c614e96a..bd9fa210 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,16 +21,27 @@ org.springframework.cloud spring-cloud-starter-alibaba-sentinel + org.springframework.cloud sentinel-dubbo-api - com.alibaba.boot - dubbo-spring-boot-starter - 0.1.1 + com.alibaba.csp + sentinel-apache-dubbo-adapter + + + org.apache.dubbo + dubbo-spring-boot-starter + + + + 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 401eb983..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,6 +1,6 @@ package org.springframework.cloud.alibaba.cloud.examples; -import com.alibaba.dubbo.config.annotation.Service; +import org.apache.dubbo.config.annotation.Service; /** * @author fangjian diff --git a/spring-cloud-alibaba-sentinel/pom.xml b/spring-cloud-alibaba-sentinel/pom.xml index b971956e..de12f473 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 diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java index b0db45dd..ec361c25 100644 --- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java +++ b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java @@ -178,6 +178,7 @@ public class SentinelAutoConfiguration { return new SentinelDataSourceHandler(beanFactory); } + @ConditionalOnClass(ObjectMapper.class) protected static class SentinelConverterConfiguration { private ObjectMapper objectMapper = new ObjectMapper();