Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba

spring-cloud-alibaba-dependencies/pom.xml

@@ -16,9 +16,9 @@
     <description>Spring Cloud Alibaba Dependencies</description>
 
     <properties>
-        <sentinel.version>0.2.0</sentinel.version>
+        <sentinel.version>1.3.0-GA</sentinel.version>
         <oss.version>3.1.0</oss.version>
-        <nacos.version>0.3.0-RC1</nacos.version>
+        <nacos.version>0.3.0</nacos.version>
         <acm.version>1.0.8</acm.version>
         <ans.version>0.1.1</ans.version>
         <aliyun.sdk.version>4.0.1</aliyun.sdk.version>

spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml

@@ -19,5 +19,13 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
     </dependencies>
 </project>

spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/resources/application.properties

@@ -1,4 +1,4 @@
 server.port=18083
 # The following configuration can be omitted.
-spring.cloud.ans.server.list=127.0.0.1
+spring.cloud.alicloud.ans.server.list=127.0.0.1
-spring.cloud.ans.server.port=8080
+spring.cloud.alicloud.ans.server.port=8080

spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml

@@ -15,5 +15,13 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-alicloud-ans</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
     </dependencies>
 </project>

spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/resources/application.properties

@@ -1,4 +1,4 @@
 server.port=18082
 # The following configuration can be omitted.
-spring.cloud.ans.server.list=127.0.0.1
+spring.cloud.alicloud.ans.server.list=127.0.0.1
-spring.cloud.ans.server.port=8080
+spring.cloud.alicloud.ans.server.port=8080

spring-cloud-alibaba-examples/ans-example/ans-provider-example/pom.xml

@@ -15,5 +15,13 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-alicloud-ans</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
     </dependencies>
 </project>

spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/resources/application.properties

@@ -1,2 +1,4 @@
 spring.application.name=ans-provider
-server.port=18081
+server.port=18081
+spring.cloud.alicloud.ans.server.list=127.0.0.1
+spring.cloud.alicloud.ans.server.port=8080

spring-cloud-alicloud-acm/pom.xml

@@ -11,6 +11,7 @@
     </parent>
 
     <artifactId>spring-cloud-alicloud-acm</artifactId>
+    <name>Spring Cloud Alibaba Cloud ACM</name>
 
     <dependencies>
 

spring-cloud-alicloud-ans/pom.xml

@@ -75,10 +75,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

spring-cloud-alicloud-ans/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1,28 +0,0 @@
-{
-  "properties": [
-    {
-      "name": "spring.cloud.ans.server.list",
-      "type": "java.lang.String",
-      "defaultValue": "127.0.0.1",
-      "description": "ANS server list."
-    },
-    {
-      "name": "spring.cloud.ans.server.port",
-      "type": "java.lang.Integer",
-      "defaultValue": "80",
-      "description": "ANS server port."
-    },
-    {
-      "name": "spring.cloud.ans.client.domains",
-      "type": "java.lang.String",
-      "defaultValue": "",
-      "description": "Service name list, default value is ${spring.application.name}."
-    },
-    {
-      "name": "spring.cloud.ans.client.env",
-      "type": "java.lang.String",
-      "defaultValue": "DEFAULT",
-      "description": "The env for ans, default value is DEFAULT."
-    }
-  ]
-}

spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-ans/pom.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>spring-cloud-starter-alibaba</artifactId>
         <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-starter-alicloud</artifactId>
         <version>0.2.0.BUILD-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <artifactId>spring-cloud-starter-alicloud-ans</artifactId>
     <name>Spring Cloud Starter Alibaba Cloud ANS</name>