From ad11b5b96f1d58703eee80e2136f37f6022eefb3 Mon Sep 17 00:00:00 2001
From: flystar32 <flystar32@163.com>
Date: Tue, 30 Oct 2018 12:44:22 +0800
Subject: [PATCH] Adds spring profile to circleci, Adds circleci support

---
 .gitignore                                |  1 +
 README.md                                 |  2 +
 Roadmap-zh.md                             |  2 +-
 pom.xml                                   | 75 +++++++++++++++++++++--
 spring-cloud-alibaba-dependencies/pom.xml |  6 +-
 5 files changed, 77 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index e4b662ae..e02b722f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,5 @@ hs_err_pid*
 .project
 .settings
 target
+.DS_Store
 
diff --git a/README.md b/README.md
index c0941db3..c69092a1 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Spring Cloud Alibaba
 
+A project maintained by Alibaba.
+
 See the [中文文档](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/README-zh.md) for Chinese readme.
 
 Spring Cloud Alibaba provides a one-stop solution for distributed application development. It contains all the components required to develop distributed applications, making it easy for you to develop your applications using Spring Cloud.
diff --git a/Roadmap-zh.md b/Roadmap-zh.md
index 53ac35f2..2fc24448 100644
--- a/Roadmap-zh.md
+++ b/Roadmap-zh.md
@@ -15,7 +15,7 @@ Spring Cloud Alibaba 致力于提供分布式应用服务开发的一站式解
 **Nacos**
 阿里巴巴开源产品，一个更易于构建云原生应用的动态服务发现、配置管理和服务管理平台。
 
-**Aliyun OSS**
+**AliCloud OSS**
 阿里云对象存储服务（Object Storage Service，简称 OSS），是阿里云提供的海量、安全、低成本、高可靠的云存储服务。您可以在任何应用、任何时间、任何地点存储和访问任意类型的数据。
 
 ## 即将加入的组件
diff --git a/pom.xml b/pom.xml
index dd251b12..d0a8acb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-build</artifactId>
-        <version>1.3.10.RELEASE</version>
+        <version>1.3.11.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -28,12 +28,12 @@
     </licenses>
 
     <scm>
-        <url>https://github.com/spring-cloud-incubator/spring-cloud-alibabacloud</url>
+        <url>https://github.com/spring-cloud-incubator/spring-cloud-alibaba</url>
         <connection>
-            scm:git:git://github.com/spring-cloud-incubator/spring-cloud-alibabacloud.git
+            scm:git:git://github.com/spring-cloud-incubator/spring-cloud-alibaba.git
         </connection>
         <developerConnection>
-            scm:git:ssh://git@github.com/spring-cloud-incubator/spring-cloud-alibabacloud.git
+            scm:git:ssh://git@github.com/spring-cloud-incubator/spring-cloud-alibaba.git
         </developerConnection>
         <tag>HEAD</tag>
     </scm>
@@ -59,7 +59,7 @@
 
     <properties>
         <!-- Dependency Versions -->
-        <spring-cloud-commons.version>1.3.3.RELEASE</spring-cloud-commons.version>
+        <spring-cloud-commons.version>1.3.5.RELEASE</spring-cloud-commons.version>
         <spring-cloud-netflix.version>1.4.4.RELEASE</spring-cloud-netflix.version>
 
         <junit.version>4.12</junit.version>
@@ -144,4 +144,69 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>spring</id>
+            <repositories>
+                <repository>
+                    <id>spring-snapshots</id>
+                    <name>Spring Snapshots</name>
+                    <url>https://repo.spring.io/libs-snapshot-local</url>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
+                </repository>
+                <repository>
+                    <id>spring-milestones</id>
+                    <name>Spring Milestones</name>
+                    <url>https://repo.spring.io/libs-milestone-local</url>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </repository>
+                <repository>
+                    <id>spring-releases</id>
+                    <name>Spring Releases</name>
+                    <url>https://repo.spring.io/release</url>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </repository>
+            </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>spring-snapshots</id>
+                    <name>Spring Snapshots</name>
+                    <url>https://repo.spring.io/libs-snapshot-local</url>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
+                </pluginRepository>
+                <pluginRepository>
+                    <id>spring-milestones</id>
+                    <name>Spring Milestones</name>
+                    <url>https://repo.spring.io/libs-milestone-local</url>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </pluginRepository>
+                <pluginRepository>
+                    <id>spring-releases</id>
+                    <name>Spring Releases</name>
+                    <url>https://repo.spring.io/libs-release-local</url>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+
 </project>
\ No newline at end of file
diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml
index 36e1bf05..01aeed94 100644
--- a/spring-cloud-alibaba-dependencies/pom.xml
+++ b/spring-cloud-alibaba-dependencies/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>spring-cloud-dependencies-parent</artifactId>
         <groupId>org.springframework.cloud</groupId>
-        <version>1.3.10.RELEASE</version>
+        <version>1.3.11.RELEASE</version>
         <relativePath/>
     </parent>
     <artifactId>spring-cloud-alibaba-dependencies</artifactId>
@@ -117,7 +117,7 @@
             </dependency>
 
 
-            <!-- Aliyun storage dependencies -->
+            <!-- Aliyun OSS dependencies -->
             <dependency>
                 <groupId>com.aliyun.oss</groupId>
                 <artifactId>aliyun-sdk-oss</artifactId>
@@ -125,7 +125,7 @@
             </dependency>
 
 
-            <!-- Own dependencies autoconfigure -->
+            <!-- Own dependencies  -->
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-alibaba-sentinel</artifactId>