diff --git a/pom.xml b/pom.xml index b1ad7acb..2d5e2810 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-build - 2.2.0.BUILD-SNAPSHOT + 2.2.0.RELEASE @@ -73,13 +73,14 @@ - 2.2.0.BUILD-SNAPSHOT - 2.2.0.BUILD-SNAPSHOT - 2.2.0.BUILD-SNAPSHOT - 2.2.0.BUILD-SNAPSHOT - 2.2.0.BUILD-SNAPSHOT - Horsham.BUILD-SNAPSHOT - 2.2.0.BUILD-SNAPSHOT + 2.2.0.RELEASE + 2.2.0.RELEASE + 2.2.0.RELEASE + 2.2.0.RELEASE + 2.2.0.RELEASE + Horsham.RELEASE + 2.2.0.RELEASE + 2.2.0.RELEASE 4.12 3.0 @@ -163,7 +164,7 @@ org.springframework.cloud - spring-cloud-netflix + spring-cloud-netflix-dependencies ${spring-cloud-netflix.version} pom import @@ -177,6 +178,14 @@ import + + org.springframework.cloud + spring-cloud-config-dependencies + ${spring-cloud-config.version} + pom + import + + org.springframework.cloud spring-cloud-bus-dependencies diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 16acbef6..13dc4f59 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -6,7 +6,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.2.0.BUILD-SNAPSHOT + 2.2.0.RELEASE diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/readme.md b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/readme.md index 8cc2f53e..1856a4a0 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/readme.md +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/readme.md @@ -193,14 +193,27 @@ Now ReadableDataSource type support 5 categories: `file`, `nacos`, `zk`, `apollo If you want to use `nacos`, `zk`, `apollo` or `redis` ReadableDataSource, you could add `sentinel-datasource-nacos`, `sentinel-datasource-zookeeper`,`sentinel-datasource-apollo` or `sentinel-datasource-redis` dependency. + + When ReadableDataSource load rule data successfully, console will print some logs: ``` [Sentinel Starter] DataSource ds1-sentinel-file-datasource load 3 DegradeRule [Sentinel Starter] DataSource ds2-sentinel-nacos-datasource load 2 FlowRule ``` +## Warning +You should use `file` ReadableDataSource in a fatjar carefully or you may get error like this below + +``` +java.lang.RuntimeException: [Sentinel Starter] DataSource ds1 handle file [classpath: flowrule.json] error: class path resource [flowrule.json] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:xxx/xxx.jar!/BOOT-INF/classes!/flowrule.jso +``` + +You could use absolute path when you use File datasource & fat jar. +It is recommended to use Nacos/Apollo/Zookeeper/Redis datasource to store rules. + +https://github.com/alibaba/spring-cloud-alibaba/issues/428 ## More For more information about Sentinel, see [Sentinel Project](https://github.com/alibaba/Sentinel). -If you have any ideas or suggestions for Spring Cloud Sentinel starter, please don't hesitate to tell us by submitting github issues. \ No newline at end of file +If you have any ideas or suggestions for Spring Cloud Sentinel starter, please don't hesitate to tell us by submitting github issues. diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml index 3e3455f7..ff17d363 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-build - 2.2.0.BUILD-SNAPSHOT + 2.2.0.RELEASE 4.0.0 @@ -28,11 +28,11 @@ 2.7.3 - 2.2.0.BUILD-SNAPSHOT - 2.2.0.BUILD-SNAPSHOT - 2.2.0.BUILD-SNAPSHOT - 2.2.0.BUILD-SNAPSHOT - 2.2.0.BUILD-SNAPSHOT + 2.2.0.RELEASE + 2.2.0.RELEASE + 2.2.0.RELEASE + 2.2.0.RELEASE + 2.2.0.RELEASE 4.0.1 @@ -58,7 +58,7 @@ org.springframework.cloud - spring-cloud-netflix + spring-cloud-netflix-dependencies ${spring-cloud-netflix.version} pom import