From a68120da9edd1ac972f72ad25c4dfa2b348b068b Mon Sep 17 00:00:00 2001
From: Nepxion <1394997@qq.com>
Date: Mon, 3 Jun 2019 13:46:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Pom=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 20 +++++++-------
 discovery-springcloud-example-admin/pom.xml   | 15 ++++++-----
 discovery-springcloud-example-console/pom.xml | 24 +++++++----------
 discovery-springcloud-example-eureka/pom.xml  | 15 ++++++-----
 discovery-springcloud-example-gateway/pom.xml | 27 +++++++++----------
 discovery-springcloud-example-service/pom.xml | 27 +++++++++----------
 discovery-springcloud-example-zuul/pom.xml    | 27 +++++++++----------
 7 files changed, 76 insertions(+), 79 deletions(-)

diff --git a/README.md b/README.md
index fc7afa0120..4daf54c576 100644
--- a/README.md
+++ b/README.md
@@ -294,16 +294,6 @@ Spring Boot Admin监控平台
 
 ## 依赖兼容
 ### 依赖
-```xml
-<dependency>
-    <groupId>com.nepxion</groupId>
-    <artifactId>discovery</artifactId>
-    <version>${discovery.version}</version>
-    <type>pom</type>
-    <scope>import</scope>
-</dependency>
-```
-
 :exclamation:下面标注[必须引入]是一定要引入的包，标注[选择引入]是可以选择一个引入，或者不引入
 
 核心插件引入，支持微服务端、网关Zuul端和网关Spring Cloud Gateway端，包括核心灰度发布功能，管理中心，配置中心等
@@ -314,7 +304,8 @@ Spring Boot Admin监控平台
     <artifactId>discovery-plugin-starter-eureka</artifactId>
     <artifactId>discovery-plugin-starter-consul</artifactId>
     <artifactId>discovery-plugin-starter-zookeeper</artifactId>
-    <artifactId>discovery-plugin-starter-nacos</artifactId>	
+    <artifactId>discovery-plugin-starter-nacos</artifactId>
+    <version>${discovery.version}</version>
 </dependency>
 
 [选择引入] 三个远程配置中心的中间件的扩展插件，如需要，请任选一个引入，或者也可以引入您自己的扩展
@@ -323,6 +314,7 @@ Spring Boot Admin监控平台
     <artifactId>discovery-plugin-config-center-starter-apollo</artifactId>
     <artifactId>discovery-plugin-config-center-starter-nacos</artifactId>
     <artifactId>discovery-plugin-config-center-starter-redis</artifactId>
+    <version>${discovery.version}</version>
 </dependency>
 ```
 
@@ -333,6 +325,7 @@ Spring Boot Admin监控平台
 <dependency>
     <groupId>com.nepxion</groupId>
     <artifactId>discovery-plugin-strategy-starter-service</artifactId>
+    <version>${discovery.version}</version>
 </dependency>
 
 网关Zuul端引入
@@ -340,6 +333,7 @@ Spring Boot Admin监控平台
 <dependency>
     <groupId>com.nepxion</groupId>
     <artifactId>discovery-plugin-strategy-starter-zuul</artifactId>
+    <version>${discovery.version}</version>
 </dependency>
 
 网关Spring Cloud Gateway端引入
@@ -347,6 +341,7 @@ Spring Boot Admin监控平台
 <dependency>
     <groupId>com.nepxion</groupId>
     <artifactId>discovery-plugin-strategy-starter-gateway</artifactId>
+    <version>${discovery.version}</version>
 </dependency>
 ```
 
@@ -354,6 +349,7 @@ Spring Boot Admin监控平台
 <dependency>
     <groupId>com.nepxion</groupId>
     <artifactId>discovery-plugin-strategy-starter-hystrix</artifactId>
+    <version>${discovery.version}</version>
 </dependency>
 ```
 
@@ -365,6 +361,7 @@ Spring Boot Admin监控平台
     <artifactId>discovery-console-starter-apollo</artifactId>
     <artifactId>discovery-console-starter-nacos</artifactId>
     <artifactId>discovery-console-starter-redis</artifactId>
+    <version>${discovery.version}</version>
 </dependency>
 ```
 
@@ -378,6 +375,7 @@ Spring Boot Admin监控平台
 <dependency>
     <groupId>com.nepxion</groupId>
     <artifactId>discovery-plugin-config-center-starter-xxx</artifactId>
+    <version>${discovery.version}</version>
 </dependency>
 ```
 - “用户自定义和编程灰度路由”是不会对服务注册发现等逻辑产生影响，所以建议下面两项配置改为false
diff --git a/discovery-springcloud-example-admin/pom.xml b/discovery-springcloud-example-admin/pom.xml
index c67a07efa9..1b6e612251 100644
--- a/discovery-springcloud-example-admin/pom.xml
+++ b/discovery-springcloud-example-admin/pom.xml
@@ -10,15 +10,10 @@
     <description>Nepxion Discovery is an enhancement for Spring Cloud Discovery</description>
     <url>http://www.nepxion.com</url>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.7.RELEASE</version>
-    </parent>
-
     <properties>
         <spring.cloud.version>Finchley.SR3</spring.cloud.version>
         <spring.cloud.alibaba.version>0.2.2.RELEASE</spring.cloud.alibaba.version>
+        <spring.boot.version>2.0.7.RELEASE</spring.boot.version>
         <spring.boot.admin.version>2.0.5</spring.boot.admin.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,6 +37,14 @@
                 <scope>import</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring.boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <dependency>
                 <groupId>de.codecentric</groupId>
                 <artifactId>spring-boot-admin-dependencies</artifactId>
diff --git a/discovery-springcloud-example-console/pom.xml b/discovery-springcloud-example-console/pom.xml
index f6f3ec92f5..620f8ef14c 100644
--- a/discovery-springcloud-example-console/pom.xml
+++ b/discovery-springcloud-example-console/pom.xml
@@ -10,16 +10,11 @@
     <description>Nepxion Discovery is an enhancement for Spring Cloud Discovery</description>
     <url>http://www.nepxion.com</url>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.7.RELEASE</version>
-    </parent>
-
     <properties>
         <discovery.version>4.8.13</discovery.version>
         <spring.cloud.version>Finchley.SR3</spring.cloud.version>
         <spring.cloud.alibaba.version>0.2.2.RELEASE</spring.cloud.alibaba.version>
+        <spring.boot.version>2.0.7.RELEASE</spring.boot.version>        
         <spring.boot.admin.version>2.0.5</spring.boot.admin.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -27,14 +22,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.nepxion</groupId>
-                <artifactId>discovery</artifactId>
-                <version>${discovery.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
@@ -51,6 +38,14 @@
                 <scope>import</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring.boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <dependency>
                 <groupId>de.codecentric</groupId>
                 <artifactId>spring-boot-admin-dependencies</artifactId>
@@ -67,6 +62,7 @@
             <!-- <artifactId>discovery-console-starter-apollo</artifactId> -->
             <artifactId>discovery-console-starter-nacos</artifactId>
             <!-- <artifactId>discovery-console-starter-redis</artifactId> -->
+            <version>${discovery.version}</version>
         </dependency>
 
         <dependency>
diff --git a/discovery-springcloud-example-eureka/pom.xml b/discovery-springcloud-example-eureka/pom.xml
index 3c6fe05057..2dc71fcd29 100644
--- a/discovery-springcloud-example-eureka/pom.xml
+++ b/discovery-springcloud-example-eureka/pom.xml
@@ -10,14 +10,9 @@
     <description>Nepxion Discovery is an enhancement for Spring Cloud Discovery</description>
     <url>http://www.nepxion.com</url>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.7.RELEASE</version>
-    </parent>
-
     <properties>
         <spring.cloud.version>Finchley.SR3</spring.cloud.version>
+        <spring.boot.version>2.0.7.RELEASE</spring.boot.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -31,6 +26,14 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring.boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/discovery-springcloud-example-gateway/pom.xml b/discovery-springcloud-example-gateway/pom.xml
index ea76c8b6b4..22163e9f12 100644
--- a/discovery-springcloud-example-gateway/pom.xml
+++ b/discovery-springcloud-example-gateway/pom.xml
@@ -10,16 +10,11 @@
     <description>Nepxion Discovery is an enhancement for Spring Cloud Discovery</description>
     <url>http://www.nepxion.com</url>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.7.RELEASE</version>
-    </parent>
-
     <properties>
         <discovery.version>4.8.13</discovery.version>
         <spring.cloud.version>Finchley.SR3</spring.cloud.version>
         <spring.cloud.alibaba.version>0.2.2.RELEASE</spring.cloud.alibaba.version>
+        <spring.boot.version>2.0.7.RELEASE</spring.boot.version>
         <spring.boot.admin.version>2.0.5</spring.boot.admin.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -27,14 +22,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.nepxion</groupId>
-                <artifactId>discovery</artifactId>
-                <version>${discovery.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
@@ -51,6 +38,14 @@
                 <scope>import</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring.boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <dependency>
                 <groupId>de.codecentric</groupId>
                 <artifactId>spring-boot-admin-dependencies</artifactId>
@@ -68,6 +63,7 @@
             <!-- <artifactId>discovery-plugin-starter-consul</artifactId> -->
             <!-- <artifactId>discovery-plugin-starter-zookeeper</artifactId> -->
             <artifactId>discovery-plugin-starter-nacos</artifactId>
+            <version>${discovery.version}</version>
         </dependency>
 
         <dependency>
@@ -75,17 +71,20 @@
             <!-- <artifactId>discovery-plugin-config-center-starter-apollo</artifactId> -->
             <artifactId>discovery-plugin-config-center-starter-nacos</artifactId>
             <!-- <artifactId>discovery-plugin-config-center-starter-redis</artifactId> -->
+            <version>${discovery.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.nepxion</groupId>
             <artifactId>discovery-plugin-strategy-starter-gateway</artifactId>
+            <version>${discovery.version}</version>
         </dependency>
 
         <!-- 当Spring Coud Gateway用Hystrix做线程隔离的时候，才需要导入下面的包 -->
         <!-- <dependency>
             <groupId>com.nepxion</groupId>
             <artifactId>discovery-plugin-strategy-starter-hystrix</artifactId>
+            <version>${discovery.version}</version>
         </dependency> -->
 
         <dependency>
diff --git a/discovery-springcloud-example-service/pom.xml b/discovery-springcloud-example-service/pom.xml
index 351ac453b8..fe50d007d7 100644
--- a/discovery-springcloud-example-service/pom.xml
+++ b/discovery-springcloud-example-service/pom.xml
@@ -10,16 +10,11 @@
     <description>Nepxion Discovery is an enhancement for Spring Cloud Discovery</description>
     <url>http://www.nepxion.com</url>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.7.RELEASE</version>
-    </parent>
-
     <properties>
         <discovery.version>4.8.13</discovery.version>
         <spring.cloud.version>Finchley.SR3</spring.cloud.version>
         <spring.cloud.alibaba.version>0.2.2.RELEASE</spring.cloud.alibaba.version>
+        <spring.boot.version>2.0.7.RELEASE</spring.boot.version>
         <spring.boot.admin.version>2.0.5</spring.boot.admin.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -27,14 +22,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.nepxion</groupId>
-                <artifactId>discovery</artifactId>
-                <version>${discovery.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
@@ -51,6 +38,14 @@
                 <scope>import</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring.boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <dependency>
                 <groupId>de.codecentric</groupId>
                 <artifactId>spring-boot-admin-dependencies</artifactId>
@@ -68,6 +63,7 @@
             <!-- <artifactId>discovery-plugin-starter-consul</artifactId> -->
             <!-- <artifactId>discovery-plugin-starter-zookeeper</artifactId> -->
             <artifactId>discovery-plugin-starter-nacos</artifactId>
+            <version>${discovery.version}</version>
         </dependency>
 
         <dependency>
@@ -75,17 +71,20 @@
             <!-- <artifactId>discovery-plugin-config-center-starter-apollo</artifactId> -->
             <artifactId>discovery-plugin-config-center-starter-nacos</artifactId>
             <!-- <artifactId>discovery-plugin-config-center-starter-redis</artifactId> -->
+            <version>${discovery.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.nepxion</groupId>
             <artifactId>discovery-plugin-strategy-starter-service</artifactId>
+            <version>${discovery.version}</version>
         </dependency>
 
         <!-- 当服务用Hystrix做线程隔离的时候，才需要导入下面的包 -->
         <!-- <dependency>
             <groupId>com.nepxion</groupId>
             <artifactId>discovery-plugin-strategy-starter-hystrix</artifactId>
+            <version>${discovery.version}</version>
         </dependency> -->
 
         <dependency>
diff --git a/discovery-springcloud-example-zuul/pom.xml b/discovery-springcloud-example-zuul/pom.xml
index 78c5d11b1f..86a07d90dd 100644
--- a/discovery-springcloud-example-zuul/pom.xml
+++ b/discovery-springcloud-example-zuul/pom.xml
@@ -10,16 +10,11 @@
     <description>Nepxion Discovery is an enhancement for Spring Cloud Discovery</description>
     <url>http://www.nepxion.com</url>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.7.RELEASE</version>
-    </parent>
-
     <properties>
         <discovery.version>4.8.13</discovery.version>
         <spring.cloud.version>Finchley.SR3</spring.cloud.version>
         <spring.cloud.alibaba.version>0.2.2.RELEASE</spring.cloud.alibaba.version>
+        <spring.boot.version>2.0.7.RELEASE</spring.boot.version>        
         <spring.boot.admin.version>2.0.5</spring.boot.admin.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -27,14 +22,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.nepxion</groupId>
-                <artifactId>discovery</artifactId>
-                <version>${discovery.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
@@ -51,6 +38,14 @@
                 <scope>import</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring.boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <dependency>
                 <groupId>de.codecentric</groupId>
                 <artifactId>spring-boot-admin-dependencies</artifactId>
@@ -68,6 +63,7 @@
             <!-- <artifactId>discovery-plugin-starter-consul</artifactId> -->
             <!-- <artifactId>discovery-plugin-starter-zookeeper</artifactId> -->
             <artifactId>discovery-plugin-starter-nacos</artifactId>
+            <version>${discovery.version}</version>
         </dependency>
 
         <dependency>
@@ -75,17 +71,20 @@
             <!-- <artifactId>discovery-plugin-config-center-starter-apollo</artifactId> -->
             <artifactId>discovery-plugin-config-center-starter-nacos</artifactId>
             <!-- <artifactId>discovery-plugin-config-center-starter-redis</artifactId> -->
+            <version>${discovery.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.nepxion</groupId>
             <artifactId>discovery-plugin-strategy-starter-zuul</artifactId>
+            <version>${discovery.version}</version>
         </dependency>
 
         <!-- 当Zuul用Hystrix做线程隔离的时候，才需要导入下面的包 -->
         <!-- <dependency>
             <groupId>com.nepxion</groupId>
             <artifactId>discovery-plugin-strategy-starter-hystrix</artifactId>
+            <version>${discovery.version}</version>
         </dependency> -->
 
         <dependency>