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/1.x' into binder-dev-1.x

Browse Source
This commit is contained in:
fangjian0423
2019-03-12 15:30:07 +08:00
parent 97ddae22fc ad34e8a5e9
commit 2ad46027cf
61 changed files with 2068 additions and 1168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,8 +18,8 @@
<properties>
<sentinel.version>1.4.2</sentinel.version>
<oss.version>3.1.0</oss.version>
<nacos.version>0.8.2</nacos.version>
<fescar.version>0.1.3</fescar.version>
<nacos.version>0.9.1</nacos.version>
<fescar.version>0.2.3</fescar.version>
<acm.version>1.0.8</acm.version>
<ans.version>1.0.1</ans.version>
<aliyun.sdk.version>4.0.1</aliyun.sdk.version>
@@ -29,7 +29,6 @@
<schedulerX.client.version>2.1.6</schedulerX.client.version>
<aliyun.java.sdk.dysmsapi>1.1.0</aliyun.java.sdk.dysmsapi>
<aliyun.sdk.mns>1.1.8</aliyun.sdk.mns>
<aliyun.java.sdk.dysmsapi>1.1.0</aliyun.java.sdk.dysmsapi>
</properties>
<dependencyManagement>
@@ -134,6 +133,11 @@
<artifactId>sentinel-web-servlet</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-zuul-adapter</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-transport-simple-http</artifactId>