study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into springboot

Browse Source 
Signed-off-by: slievrly <slievrly@163.com>

# Conflicts:
#	spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/GlobalTransactionAutoConfiguration.java
This commit is contained in:
slievrly
2019-12-31 18:45:14 +08:00
parent 34d8267068 aba89ed5ba
commit 7b79b6a11b
83 changed files with 231 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-alibaba-dependencies/pom.xml
View File

@@ -29,7 +29,6 @@
<alicloud.context.version>1.0.5</alicloud.context.version>
<aliyun.sdk.edas.version>2.44.0</aliyun.sdk.edas.version>
<schedulerX.client.version>2.1.6</schedulerX.client.version>
<dubbo.version>2.7.3</dubbo.version>
<aliyun.java.sdk.dysmsapi>1.1.0</aliyun.java.sdk.dysmsapi>
<aliyun.sdk.mns>1.1.8.6</aliyun.sdk.mns>
<aliyun.java.sdk.dyvmsapi>1.1.1</aliyun.java.sdk.dyvmsapi>