From e6c7c823d6d15cee6b71e30ea93054a70c4d42b8 Mon Sep 17 00:00:00 2001
From: flystar32 <flystar32@163.com>
Date: Tue, 30 Oct 2018 12:50:28 +0800
Subject: [PATCH 1/4] update ans pom.xml

---
 .../ans-example/ans-consumer-feign-example/pom.xml        | 8 ++++++++
 .../ans-example/ans-consumer-ribbon-example/pom.xml       | 8 ++++++++
 .../ans-example/ans-provider-example/pom.xml              | 8 ++++++++
 spring-cloud-alicloud-ans/pom.xml                         | 2 ++
 .../spring-cloud-starter-alicloud-ans/pom.xml             | 8 ++++----
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml
index e0966d4f..662099e4 100644
--- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml
+++ b/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>
\ No newline at end of file
diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml
index 238ea7f4..a94cbe07 100644
--- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml
+++ b/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>
\ No newline at end of file
diff --git a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/pom.xml b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/pom.xml
index d79e46f1..41f880f9 100644
--- a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/pom.xml
+++ b/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>
\ No newline at end of file
diff --git a/spring-cloud-alicloud-ans/pom.xml b/spring-cloud-alicloud-ans/pom.xml
index 6c33b9ee..ff488264 100644
--- a/spring-cloud-alicloud-ans/pom.xml
+++ b/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>
diff --git a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-ans/pom.xml b/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-ans/pom.xml
index 418614fa..acb713d2 100644
--- a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-ans/pom.xml
+++ b/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"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
 

From 5873ac3c1a35776e249c5e6eff2b328da0b39d09 Mon Sep 17 00:00:00 2001
From: flystar32 <flystar32@163.com>
Date: Tue, 30 Oct 2018 15:29:31 +0800
Subject: [PATCH 2/4] update example configuration

---
 .../src/main/resources/application.properties |  4 +--
 .../src/main/resources/application.properties |  4 +--
 .../src/main/resources/application.properties |  4 ++-
 ...itional-spring-configuration-metadata.json | 28 -------------------
 4 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 spring-cloud-alicloud-ans/src/main/resources/META-INF/additional-spring-configuration-metadata.json

diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/resources/application.properties
index 1b25ea1e..542653d9 100644
--- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/resources/application.properties
+++ b/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.ans.server.port=8080
\ No newline at end of file
+spring.cloud.alicloud.ans.server.list=127.0.0.1
+spring.cloud.alicloud.ans.server.port=8080
\ No newline at end of file
diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/resources/application.properties
index c7bf8206..315a9033 100644
--- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/resources/application.properties
+++ b/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.ans.server.port=8080
\ No newline at end of file
+spring.cloud.alicloud.ans.server.list=127.0.0.1
+spring.cloud.alicloud.ans.server.port=8080
\ No newline at end of file
diff --git a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/resources/application.properties
index 76862f6b..2fb389e2 100644
--- a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/resources/application.properties
+++ b/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
\ No newline at end of file
+server.port=18081
+spring.cloud.alicloud.ans.server.list=127.0.0.1
+spring.cloud.alicloud.ans.server.port=8080
\ No newline at end of file
diff --git a/spring-cloud-alicloud-ans/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-alicloud-ans/src/main/resources/META-INF/additional-spring-configuration-metadata.json
deleted file mode 100644
index 69ade28d..00000000
--- a/spring-cloud-alicloud-ans/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ /dev/null
@@ -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."
-    }
-  ]
-}
\ No newline at end of file

From 3afa47f87c52a3530d3c3d60031afbeb02a74beb Mon Sep 17 00:00:00 2001
From: flystar32 <flystar32@163.com>
Date: Tue, 30 Oct 2018 15:43:19 +0800
Subject: [PATCH 3/4] update nacos version to 0.3.0

---
 spring-cloud-alibaba-dependencies/pom.xml | 2 +-
 spring-cloud-alicloud-acm/pom.xml         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml
index e08a9dc2..cb1f7646 100644
--- a/spring-cloud-alibaba-dependencies/pom.xml
+++ b/spring-cloud-alibaba-dependencies/pom.xml
@@ -18,7 +18,7 @@
     <properties>
         <sentinel.version>0.2.0</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>
diff --git a/spring-cloud-alicloud-acm/pom.xml b/spring-cloud-alicloud-acm/pom.xml
index 971d3382..97aa9501 100644
--- a/spring-cloud-alicloud-acm/pom.xml
+++ b/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>
 

From 742a039ccd8553bc707621c5714feb9f44298259 Mon Sep 17 00:00:00 2001
From: flystar32 <flystar32@163.com>
Date: Tue, 30 Oct 2018 20:41:52 +0800
Subject: [PATCH 4/4] update sentinel version to 1.3.0-GA

---
 spring-cloud-alibaba-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml
index cb1f7646..fd9887ec 100644
--- a/spring-cloud-alibaba-dependencies/pom.xml
+++ b/spring-cloud-alibaba-dependencies/pom.xml
@@ -16,7 +16,7 @@
     <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</nacos.version>
         <acm.version>1.0.8</acm.version>