Commit Graph

2497 Commits (0aafb74c4e4854fe87e1a5c7e37205d89e7832a0)
 

Author SHA1 Message Date
Freeman Lau 9cc900136d Not run integration test
Freeman Lau db566f14a5 Update logging level path
Freeman Lau bc78984df8 Merge remote-tracking branch 'upstream/2021.x' into fix_2455
# Conflicts:
#	spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/configdata/NacosConfigDataLoader.java
Freeman Lau 18701ad3d7
Merge pull request from ruansheng8/fix-debug-logger
Nacos config use DeferredLogFactory
ruansheng 2fb0893eda remove deprecated constructor
ruansheng 520907d63e Nacos config use DeferredLogFactory
Freeman Lau 7211d05c90 Support print content
Freeman Lau 8d72682b07 Do not print content
Freeman Lau 204b9a7032 Merge remote-tracking branch 'upstream/2021.x' into fix_2455
# Conflicts:
#	spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/configdata/NacosConfigDataLoader.java
Freeman Lau 146fd38c47 Support configure preference for single config
Add log info.
Steve Rao 1ab8b13f69
Merge pull request from
[ISSUE ] Add debug log
Freeman Lau 2bdb34e9d0
Merge pull request from ruansheng8/fix-nacos-example
Fix multiple meaning of PropertySource
ruansheng d2c427369e Fix multiple meaning of example
lixiaoshuang 5f82af2271 add debug log
lixiaoshuang 854c9ec196 add debug log
sorie 154775dd13 Fix NacosConfigEndpointTests instability issues
sorie 0cd03778fa Write some tests for
Freeman Lau e02ef61969 Add config preference example
sorie bd800de133 Fixs group must be configured for channel
And delete rocketmq-comprehensive-example's consumer group configurations.
Freeman Lau 5d49b63200 Support config preference.
Freeman Lau 2f0ad20323 Optimize pom.
Freeman Lau a7d3c7f76d
Merge pull request from Sorieee/2021.x.sorie_nacos_discovery_mock
Replace powermock with mockito in Nacos Discovery.
Freeman Lau ec29e197e5 Migrate junit4 to junit5.
Freeman Lau 3bd3f52d90 Migrate junit4 to junit5.
sorie 2b8e919215 Improve MockNamingService: return emptyList rather than null
sorie 94871e20ec Replace powermock with mockito in Nacos Discovery
Steve Rao 5f5f2e6d84
Merge pull request from ruansheng8/remove-dubbo-module
Remove dubbo module
ruansheng ad69d6824b Remove dubbo starter
ruansheng dcfe35dbba Remove sentinel-dubbo adapter
ruansheng 2ca7b25834 Remove dubbo examples and doc
chengpu.rzh 2531b68cc0 Modified Contributor info
chengpu.rzh 85da43b3f1 Fix wrong branch info
Steve Rao 481da281aa
Merge pull request from alibaba/2.2.x
Merge some fix from 2.2.x to 2021.x
Steve Rao b01e29a989
Merge pull request from wuwen5/patch-1
Lower log level
chengpu.rzh 93e38655f2 Add steering and committer member info
chengpu.rzh 41642d8c81 Add steering member and committer info
Steve Rao e38900ba55
Merge pull request from ruansheng8/fix-npe
fix dubbo ServiceParameterResolver NPE
Freeman Lau 0aea430aa8 Change revision.
ruansheng 22862402d2 fix dubbo ServiceParameterResolver NPE
Freeman Lau b09767aa88
Merge pull request from Sorieee/2021.x_sorie_nacos_config_powermock
Replace powermock with mockito in Nacos config. Fixes 
sorie 299726a8b8 Replace powermock with mockito in Nacos config
chengpu.rzh c4c167b593 Print nacos config log switch
chengpu.rzh b8706abc86 Print nacos config log switch
Freeman Lau a1280bff9a Add since tag.
Freeman Lau 4edecfc38e Fix unit test may fail.
Freeman Lau 2aaef56dc4 Support refresh specific ConfigurationPropertiesBean.
Freeman Lau a2d7366dc4 Merge remote-tracking branch 'upstream/2021.x' into refresh_specific_configuration_properties
# Conflicts:
#	spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java
Freeman Lau e6eb4b653e Change StringUtil package.
Freeman Lau 8b3ee924c0
Merge pull request from DanielLiu1123/fix-2431
Change util package, fix 
Freeman Lau 3199f44837 Change util package.