diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 1c39170ae..1b7b735f9 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -22,6 +22,8 @@ + + com.alibaba.csp sentinel-core @@ -57,18 +59,25 @@ sentinel-transport-simple-http ${sentinel.version} - com.alibaba.csp sentinel-annotation-aspectj ${sentinel.version} - com.alibaba.csp sentinel-dubbo-adapter ${sentinel.version} + + org.springframework.cloud + sentinel-dubbo-api + ${project.version} + + + + + com.aliyun.oss aliyun-sdk-oss diff --git a/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/pom.xml index ca3a2538c..55ca2bfc9 100644 --- a/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-alibaba-examples - 0.2.0.BUILD-SNAPSHOT + 0.1.0.BUILD-SNAPSHOT 4.0.0 diff --git a/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelDubboConsumerApp.java b/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelDubboConsumerApp.java index d0aba6857..61b0ff81c 100644 --- a/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelDubboConsumerApp.java +++ b/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelDubboConsumerApp.java @@ -2,7 +2,6 @@ package org.springframework.cloud.alibaba.cloud.examples; import java.util.Collections; -import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.ApplicationContext; @@ -36,7 +35,7 @@ public class SentinelDubboConsumerApp { SpringApplicationBuilder consumerBuilder = new SpringApplicationBuilder(); ApplicationContext applicationContext = consumerBuilder - .web(WebApplicationType.NONE).sources(SentinelDubboConsumerApp.class) + .web(false).sources(SentinelDubboConsumerApp.class) .run(args); FooServiceConsumer service = applicationContext.getBean(FooServiceConsumer.class); diff --git a/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/pom.xml index f1a0a832c..a0df26546 100644 --- a/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-alibaba-examples - 0.2.0.BUILD-SNAPSHOT + 0.1.0.BUILD-SNAPSHOT 4.0.0 diff --git a/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelDubboProviderApp.java b/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelDubboProviderApp.java index 346fb48fc..9c97d4be9 100644 --- a/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelDubboProviderApp.java +++ b/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelDubboProviderApp.java @@ -1,6 +1,5 @@ package org.springframework.cloud.alibaba.cloud.examples; -import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -12,7 +11,7 @@ public class SentinelDubboProviderApp { public static void main(String[] args) { SpringApplicationBuilder providerBuilder = new SpringApplicationBuilder(); - providerBuilder.web(WebApplicationType.NONE) + providerBuilder.web(false) .sources(SentinelDubboProviderApp.class).run(args); }