升级版本到5.0.3

discovery-common-apollo/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-common-nacos/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-common-redis/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-common/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-common/src/main/java/com/nepxion/discovery/common/constant/DiscoveryConstant.java

@@ -10,7 +10,7 @@ package com.nepxion.discovery.common.constant;
  */
 
 public class DiscoveryConstant {
-    public static final String DISCOVERY_VERSION = "4.8.9";
+    public static final String DISCOVERY_VERSION = "5.0.3";
 
     public static final String SPRING_APPLICATION_DISCOVERY_PLUGIN = "spring.application.discovery.plugin";
     public static final String SPRING_APPLICATION_DISCOVERY_VERSION = "spring.application.discovery.version";

discovery-console-desktop/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <properties>

discovery-console-starter-apollo/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-console-starter-nacos/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-console-starter-redis/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-console/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-admin-center/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-config-center-starter-apollo/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-config-center-starter-nacos/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-config-center-starter-redis/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-config-center/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-framework-consul/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-framework-eureka/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-framework-nacos/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-framework-zookeeper/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-framework/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-starter-consul/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-starter-eureka/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-starter-nacos/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-starter-zookeeper/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-strategy-starter-gateway/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-strategy-starter-hystrix/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-strategy-starter-service/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-strategy-starter-zuul/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-plugin-strategy/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.nepxion</groupId>
         <artifactId>discovery</artifactId>
-        <version>4.8.9</version>
+        <version>5.0.3</version>
     </parent>
 
     <dependencies>

discovery-springcloud-example-admin/pom.xml

@@ -13,13 +13,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.7.RELEASE</version>
+        <version>2.1.4.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.admin.version>2.0.5</spring.boot.admin.version>
+        <spring.cloud.version>Greenwich.SR1</spring.cloud.version>
+        <spring.cloud.alibaba.version>0.9.0.RELEASE</spring.cloud.alibaba.version>
+        <spring.boot.admin.version>2.1.4</spring.boot.admin.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

discovery-springcloud-example-console/pom.xml

@@ -13,14 +13,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.7.RELEASE</version>
+        <version>2.1.4.RELEASE</version>
     </parent>
 
     <properties>
-        <discovery.version>4.8.9</discovery.version>
-        <spring.cloud.version>Finchley.SR3</spring.cloud.version>
-        <spring.cloud.alibaba.version>0.2.2.RELEASE</spring.cloud.alibaba.version>
-        <spring.boot.admin.version>2.0.5</spring.boot.admin.version>
+        <discovery.version>5.0.3</discovery.version>
+        <spring.cloud.version>Greenwich.SR1</spring.cloud.version>
+        <spring.cloud.alibaba.version>0.9.0.RELEASE</spring.cloud.alibaba.version>
+        <spring.boot.admin.version>2.1.4</spring.boot.admin.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

discovery-springcloud-example-eureka/pom.xml

@@ -13,11 +13,11 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.7.RELEASE</version>
+        <version>2.1.4.RELEASE</version>
     </parent>
 
     <properties>
-        <spring.cloud.version>Finchley.SR3</spring.cloud.version>
+        <spring.cloud.version>Greenwich.SR1</spring.cloud.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

discovery-springcloud-example-gateway/pom.xml

@@ -13,14 +13,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.7.RELEASE</version>
+        <version>2.1.4.RELEASE</version>
     </parent>
 
     <properties>
-        <discovery.version>4.8.9</discovery.version>
-        <spring.cloud.version>Finchley.SR3</spring.cloud.version>
-        <spring.cloud.alibaba.version>0.2.2.RELEASE</spring.cloud.alibaba.version>
-        <spring.boot.admin.version>2.0.5</spring.boot.admin.version>
+        <discovery.version>5.0.3</discovery.version>
+        <spring.cloud.version>Greenwich.SR1</spring.cloud.version>
+        <spring.cloud.alibaba.version>0.9.0.RELEASE</spring.cloud.alibaba.version>
+        <spring.boot.admin.version>2.1.4</spring.boot.admin.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

discovery-springcloud-example-service/pom.xml

@@ -13,14 +13,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.7.RELEASE</version>
+        <version>2.1.4.RELEASE</version>
     </parent>
 
     <properties>
-        <discovery.version>4.8.9</discovery.version>
-        <spring.cloud.version>Finchley.SR3</spring.cloud.version>
-        <spring.cloud.alibaba.version>0.2.2.RELEASE</spring.cloud.alibaba.version>
-        <spring.boot.admin.version>2.0.5</spring.boot.admin.version>
+        <discovery.version>5.0.3</discovery.version>
+        <spring.cloud.version>Greenwich.SR1</spring.cloud.version>
+        <spring.cloud.alibaba.version>0.9.0.RELEASE</spring.cloud.alibaba.version>
+        <spring.boot.admin.version>2.1.4</spring.boot.admin.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

discovery-springcloud-example-service/src/main/resources/bootstrap.properties

@@ -24,6 +24,9 @@ spring.cloud.nacos.discovery.server-addr=localhost:8848
 ribbon.ConnectTimeout=60000
 ribbon.ReadTimeout=60000
 
+# 支持G版，FeignClientSpecification的问题
+spring.main.allow-bean-definition-overriding=true
+
 # Apollo config for rule
 app.id=discovery
 apollo.meta=http://localhost:8080

discovery-springcloud-example-zuul/pom.xml

@@ -13,14 +13,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.7.RELEASE</version>
+        <version>2.1.4.RELEASE</version>
     </parent>
 
     <properties>
-        <discovery.version>4.8.9</discovery.version>
-        <spring.cloud.version>Finchley.SR3</spring.cloud.version>
-        <spring.cloud.alibaba.version>0.2.2.RELEASE</spring.cloud.alibaba.version>
-        <spring.boot.admin.version>2.0.5</spring.boot.admin.version>
+        <discovery.version>5.0.3</discovery.version>
+        <spring.cloud.version>Greenwich.SR1</spring.cloud.version>
+        <spring.cloud.alibaba.version>0.9.0.RELEASE</spring.cloud.alibaba.version>
+        <spring.boot.admin.version>2.1.4</spring.boot.admin.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

pom.xml

@@ -6,7 +6,7 @@
     <name>Nepxion Discovery</name>
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
-    <version>4.8.9</version>
+    <version>5.0.3</version>
     <description>Nepxion Discovery is an enhancement for Spring Cloud Discovery</description>
     <url>http://www.nepxion.com</url>
 
@@ -60,9 +60,9 @@
         <guava.version>27.0-jre</guava.version>
         <caffeine.version>2.7.0</caffeine.version>
         <swagger.version>2.7.0</swagger.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.cloud.version>Greenwich.SR1</spring.cloud.version>
+        <spring.cloud.alibaba.version>0.9.0.RELEASE</spring.cloud.alibaba.version>
+        <spring.boot.version>2.1.4.RELEASE</spring.boot.version>
         <disruptor.version>3.3.7</disruptor.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

version.bat

@@ -15,6 +15,6 @@
 @title Nepxion Discovery
 @color 0a
 
-call mvn versions:set -DnewVersion=4.8.9
+call mvn versions:set -DnewVersion=5.0.3
 
 pause
\ No newline at end of file