Commit Graph

24 Commits (9c04b327a1fc844b2f4007ace010f1a98283b542)

Author SHA1 Message Date
gaoyunpeng 87bfb3734a ignore failure testcase
mercyblitz a5e950186f Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java
#	spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java
#	spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/NacosDataSourceProperties.java
#	spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelDataSourceHandler.java
fangjian0423 fd6d3a7717 remove sentinel commercialization logic & optimize NacosDataSource
mercyblitz 59a969049d Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	pom.xml
#	spring-cloud-alibaba-dependencies/pom.xml
#	spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml
fangjian0423 6a758dd42f add sentinel datasource test case
fangjian0423 3ab6b1dc63 update nacos example & using final replace of protected in field
fangjian0423 b39fb80a53 upgrade sentinel version to 1.4.1 and remove NacosDataSourceWithAuthorization
fangjian0423 40f6290184 code format
fangjian0423 1db45e85c4 add jsr 303 validation for SentinelProperties
fangjian0423 6806cd77ac using Enum replace of String
fangjian0423 0e75da3b8d add ruleType property for AbstractDataSourceProperties and fixes
Spencer Gibb 612e6913e6
Update to 0.2.2.BUILD-SNAPSHOT
Spencer Gibb b28e82dc3c
Update SNAPSHOT to 0.2.1.RELEASE
fangjian0423 8af824dc2f sentinel commercialization feature
fangjian0423 bf40e5261d refactor sentinel datasource and support commercialized
fangjian0423 564acbb2a8 upgrade sentinel version to 1.4.0
fangjian0423 cd6f79b16b Polish
fangjian0423 80ecc84d54 fixes
fangjian0423 3c33b234c8 fixes
Spencer Gibb 6e355cc807
Update to 0.2.1.BUILD-SNAPSHOT
Spencer Gibb d2fd77c274
Update SNAPSHOT to 0.2.0.RELEASE
fangjian0423 1d44d73eba sentinel add logs to query datasource process.
fangjian0423 00aeb90df2 Updates to snapshot versions
fangjian0423 1d15cdaee5 Polish . Add a new module spring-cloud-alibaba-sentinel-datasource separate from spring-cloud-alibaba-sentinel.