1
0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00

79 Commits

Author SHA1 Message Date
pbting
92519a7a09
Merge branch 'master' into master 2019-02-22 20:55:30 +08:00
得少
3934115863 1、change the nacos system properties named
2、upgrade nacos client dependency with 0.8.2
2019-02-22 20:45:58 +08:00
mercyblitz
0337f0fa6c Polish spring-cloud-incubator/spring-cloud-alibaba#378 : Optimize The dependencies for Dubbo Spring Cloud 2019-02-22 12:39:29 +08:00
mercyblitz
47733ea41f Polish spring-cloud-incubator/spring-cloud-alibaba#378 : Optimize The dependencies for Dubbo Spring Cloud 2019-02-22 11:36:54 +08:00
mercyblitz
969dece586 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc
#	spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc
2019-02-21 14:53:05 +08:00
mercyblitz
2fdeeec3ff Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc
#	spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc
2019-02-21 14:49:26 +08:00
fangjian0423
ca249d213e upgrade sentinel version to 1.4.2 2019-02-20 17:55:05 +08:00
fangjian0423
1dc80d7a6f Updates to spring cloud greenwich 2019-02-19 17:01:09 +08:00
format
9b84df9015
Merge pull request #358 from pbting/master
nacos discovery starter support connect to aliyun with master branch
2019-02-19 16:41:44 +08:00
mercyblitz
fc8d8e3628 Polish spring-cloud-incubator/spring-cloud-alibaba#348 : @DubboTransported supports RestTemplate (part 1) 2019-02-19 15:05:25 +08:00
gaoyunpeng
394485a12d replace cobertura to jacoco 2019-02-18 20:05:08 +08:00
得少
997faff710 add nacos discovery starter support to connect to aliyun 2019-02-18 09:52:41 +08:00
mercyblitz
ff6e68d522 Update Dubbo Spring Boot 0.2.1.RELEASE 2019-02-01 22:33:47 +08:00
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
2019-02-01 22:08:21 +08:00
flystar32
30b6456558 resolve conflict 2019-01-30 13:43:08 +08:00
flystar32
a6a894a110 add module Fescar, Polish #303 2019-01-30 13:40:26 +08:00
flystar32
990bf1bff7 update nacos version to 0.8.0 ,Polish #295, #317 2019-01-29 10:47:32 +08:00
mercyblitz
744e33229a 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
2019-01-22 15:16:21 +08:00
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
2019-01-22 14:51:54 +08:00
chenzhu.zxl
2de5362f4d Fix SchedulerX cycle ref error. 2019-01-17 16:52:03 +08:00
fangjian0423
b39fb80a53 upgrade sentinel version to 1.4.1 and remove NacosDataSourceWithAuthorization 2019-01-16 20:20:21 +08:00
gaoyunpeng
20eb325e59 update cobertura settings for reduce build time 2019-01-15 15:50:23 +08:00
mercyblitz
571d0eca15 Polish spring-cloud-incubator/spring-cloud-alibaba#262 2019-01-10 17:31:12 +08:00
得少
ee2c696bdf ans starter suport eureka/consule registry and add sms module 2019-01-09 18:38:08 +08:00
xiaolongzuo
a756948248 Upgrade alicloud-context version. 2019-01-07 15:46:40 +08:00
Spencer Gibb
612e6913e6
Update to 0.2.2.BUILD-SNAPSHOT 2018-12-21 11:09:29 -05:00
Spencer Gibb
b28e82dc3c
Update SNAPSHOT to 0.2.1.RELEASE 2018-12-21 10:48:36 -05:00
flystar32
b6a7bf0ee6 update nacos version 2018-12-19 22:31:07 +08:00
pengbingting
92f728176a sentinel support custom block response by sentinelClientHttpResponse 2018-12-18 15:14:35 +08:00
flystar32
4a1cd617e2 update nacos and alicloud-context version 2018-12-17 17:49:48 +08:00
fangjian0423
564acbb2a8 upgrade sentinel version to 1.4.0 2018-12-17 11:36:38 +08:00
flystar32
51b0766f11 update ans version to 1.0.1 2018-12-14 11:51:47 +08:00
flystar32
772fdf707f update schedulerx version 2018-12-14 01:13:50 +08:00
chenzhu.zxl
4bf7c9c7c4 Add Sonatype Repository to AliCloud Context. 2018-12-13 21:22:06 +08:00
chenzhu.zxl
a4e4192d33 Force update Sonatype Repository snapshots. 2018-12-13 20:52:24 +08:00
chenzhu.zxl
7cf8fcefc0 Add Sonatype Repository. 2018-12-13 20:45:20 +08:00
chenzhu.zxl
4fbc01405a Fix compile error. 2018-12-13 20:38:42 +08:00
chenzhu.zxl
120cb4f096 Fix compile error. 2018-12-13 16:50:33 +08:00
chenzhu.zxl
f1bd3fd2c2 Add SchedulerX modules. 2018-12-13 15:04:00 +08:00
chenzhu.zxl
2bcdbb0eb5 Fix schedulerx version error. 2018-12-13 14:39:56 +08:00
chenzhu.zxl
96856af7a1 Fix schedulerx version error. 2018-12-13 14:29:48 +08:00
xiaolongzuo
1fc98ebe7c closes #162, fixes #138. Add spring-cloud-alicloud-schedulerX module, and fix ACM starter rely on actuator. 2018-12-12 17:56:16 +08:00
flystar32
c26da5643a Add spring-cloud-alibaba-nacos-config-server module, close #34 2018-12-11 20:02:43 +08:00
fangjian0423
cd6f79b16b Polish #115 2018-12-06 16:02:18 +08:00
format
47b1f05e86
Merge pull request #119 from mercyblitz/master
[Feature] Add Spring Cloud Bus module for Apache RocketMQ
2018-11-28 15:27:27 +08:00
flystar32
c6d955f589 update nacos version to 0.5.0 , close #113 2018-11-27 14:31:37 +08:00
mercyblitz
b75b19b58c Polish Spring Cloud Bus 2018-11-23 14:52:45 +08:00
mercybltz
0ad0014cbf Polish spring-cloud-starter-bus-rocketmq 2018-11-22 13:02:33 +08:00
fangjian0423
2596f014f7 add rocketmq starter and fix some small problems 2018-11-20 14:21:31 +08:00
fangjian0423
d88e27e45c fix conflict 2018-11-20 12:00:36 +08:00