From 57860066b266e99b61d60696eb700ec749ee9201 Mon Sep 17 00:00:00 2001
From: lengleng <wangiegie@gmail.com>
Date: Wed, 23 Dec 2020 10:34:55 +0800
Subject: [PATCH] :arrow_up: Upgrading dependencies. spring cloud 2020

---
 pig-auth/pom.xml                          |  8 ++---
 pig-common/pig-common-core/pom.xml        |  2 +-
 pig-common/pig-common-datasource/pom.xml  |  2 +-
 pig-common/pig-common-job/pom.xml         |  2 +-
 pig-common/pig-common-log/pom.xml         |  6 ++--
 pig-common/pig-common-mybatis/pom.xml     |  2 +-
 pig-common/pig-common-security/pom.xml    |  6 ++--
 pig-common/pig-common-sentinel/pom.xml    |  6 ++--
 pig-common/pig-common-swagger/pom.xml     |  2 +-
 pig-common/pig-common-test/pom.xml        |  4 +--
 pig-common/pom.xml                        |  2 +-
 pig-gateway/pom.xml                       |  2 +-
 pig-register/pom.xml                      |  2 +-
 pig-upms/pig-upms-api/pom.xml             |  2 +-
 pig-upms/pig-upms-biz/pom.xml             |  2 +-
 pig-upms/pom.xml                          |  2 +-
 pig-visual/pig-codegen/pom.xml            |  2 +-
 pig-visual/pig-monitor/pom.xml            |  2 +-
 pig-visual/pig-sentinel-dashboard/pom.xml |  2 +-
 pig-visual/pig-xxl-job-admin/pom.xml      |  2 +-
 pig-visual/pom.xml                        |  2 +-
 pom.xml                                   | 38 +++--------------------
 22 files changed, 36 insertions(+), 64 deletions(-)

diff --git a/pig-auth/pom.xml b/pig-auth/pom.xml
index a57e657c..7a3e4d81 100755
--- a/pig-auth/pom.xml
+++ b/pig-auth/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-auth</artifactId>
@@ -44,19 +44,19 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-sentinel</artifactId>
-			<version>2.10.4-SNAPSHOT</version>
+			<version>2.11.0</version>
 		</dependency>
 		<!--upms api、model 模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>2.10.4-SNAPSHOT</version>
+			<version>2.11.0</version>
 		</dependency>
 		<!--security-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-security</artifactId>
-			<version>2.10.4-SNAPSHOT</version>
+			<version>2.11.0</version>
 		</dependency>
 		<!--JDBC相关-->
 		<dependency>
diff --git a/pig-common/pig-common-core/pom.xml b/pig-common/pig-common-core/pom.xml
index cdcf525a..ea0aea47 100755
--- a/pig-common/pig-common-core/pom.xml
+++ b/pig-common/pig-common-core/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-common-core</artifactId>
diff --git a/pig-common/pig-common-datasource/pom.xml b/pig-common/pig-common-datasource/pom.xml
index d87b0de1..35117696 100644
--- a/pig-common/pig-common-datasource/pom.xml
+++ b/pig-common/pig-common-datasource/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>pig-common</artifactId>
 		<groupId>com.pig4cloud</groupId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/pig-common/pig-common-job/pom.xml b/pig-common/pig-common-job/pom.xml
index 47535e79..9d6ea4a7 100755
--- a/pig-common/pig-common-job/pom.xml
+++ b/pig-common/pig-common-job/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-common-job</artifactId>
diff --git a/pig-common/pig-common-log/pom.xml b/pig-common/pig-common-log/pom.xml
index bbca0e28..5e088888 100755
--- a/pig-common/pig-common-log/pom.xml
+++ b/pig-common/pig-common-log/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-common-log</artifactId>
@@ -35,13 +35,13 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>2.10.4-SNAPSHOT</version>
+			<version>2.11.0</version>
 		</dependency>
 		<!--UPMS接口模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>2.10.4-SNAPSHOT</version>
+			<version>2.11.0</version>
 		</dependency>
 		<!--安全依赖获取上下文信息-->
 		<dependency>
diff --git a/pig-common/pig-common-mybatis/pom.xml b/pig-common/pig-common-mybatis/pom.xml
index ac6723d1..4f053031 100755
--- a/pig-common/pig-common-mybatis/pom.xml
+++ b/pig-common/pig-common-mybatis/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-common-mybatis</artifactId>
diff --git a/pig-common/pig-common-security/pom.xml b/pig-common/pig-common-security/pom.xml
index f3a16065..9a164be4 100755
--- a/pig-common/pig-common-security/pom.xml
+++ b/pig-common/pig-common-security/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-common-security</artifactId>
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>2.10.4-SNAPSHOT</version>
+			<version>2.11.0</version>
 		</dependency>
 		<!--安全模块-->
 		<dependency>
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>2.10.4-SNAPSHOT</version>
+			<version>2.11.0</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/pig-common/pig-common-sentinel/pom.xml b/pig-common/pig-common-sentinel/pom.xml
index dcd81a89..8650a11a 100755
--- a/pig-common/pig-common-sentinel/pom.xml
+++ b/pig-common/pig-common-sentinel/pom.xml
@@ -21,18 +21,19 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
 	<artifactId>pig-common-sentinel</artifactId>
 	<description>sentinel服务降级熔断、限流组件</description>
+
 	<dependencies>
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>2.10.4-SNAPSHOT</version>
+			<version>2.11.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba.cloud</groupId>
@@ -47,6 +48,7 @@
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-hystrix</artifactId>
+			<version>10.10.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/pig-common/pig-common-swagger/pom.xml b/pig-common/pig-common-swagger/pom.xml
index e72f7c63..8f9fcdd3 100644
--- a/pig-common/pig-common-swagger/pom.xml
+++ b/pig-common/pig-common-swagger/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-common-swagger</artifactId>
diff --git a/pig-common/pig-common-test/pom.xml b/pig-common/pig-common-test/pom.xml
index 42ae5dfb..d89e8db6 100755
--- a/pig-common/pig-common-test/pom.xml
+++ b/pig-common/pig-common-test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-common-test</artifactId>
@@ -18,7 +18,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-security</artifactId>
-			<version>2.10.4-SNAPSHOT</version>
+			<version>2.11.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
diff --git a/pig-common/pom.xml b/pig-common/pom.xml
index 612caac2..aa317a45 100755
--- a/pig-common/pom.xml
+++ b/pig-common/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-common</artifactId>
diff --git a/pig-gateway/pom.xml b/pig-gateway/pom.xml
index 0ac54a16..8d0c6f49 100755
--- a/pig-gateway/pom.xml
+++ b/pig-gateway/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-gateway</artifactId>
diff --git a/pig-register/pom.xml b/pig-register/pom.xml
index e09414a3..dab8f7ca 100755
--- a/pig-register/pom.xml
+++ b/pig-register/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-register</artifactId>
diff --git a/pig-upms/pig-upms-api/pom.xml b/pig-upms/pig-upms-api/pom.xml
index 7398b3a8..62de3f53 100755
--- a/pig-upms/pig-upms-api/pom.xml
+++ b/pig-upms/pig-upms-api/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-upms</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-upms-api</artifactId>
diff --git a/pig-upms/pig-upms-biz/pom.xml b/pig-upms/pig-upms-biz/pom.xml
index 0332ebba..6854ab79 100644
--- a/pig-upms/pig-upms-biz/pom.xml
+++ b/pig-upms/pig-upms-biz/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-upms</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-upms-biz</artifactId>
diff --git a/pig-upms/pom.xml b/pig-upms/pom.xml
index d8c23f75..05ecf2c0 100755
--- a/pig-upms/pom.xml
+++ b/pig-upms/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-upms</artifactId>
diff --git a/pig-visual/pig-codegen/pom.xml b/pig-visual/pig-codegen/pom.xml
index 51be4d62..e357cadc 100755
--- a/pig-visual/pig-codegen/pom.xml
+++ b/pig-visual/pig-codegen/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-visual</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-codegen</artifactId>
diff --git a/pig-visual/pig-monitor/pom.xml b/pig-visual/pig-monitor/pom.xml
index 8bf41726..e505726b 100755
--- a/pig-visual/pig-monitor/pom.xml
+++ b/pig-visual/pig-monitor/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-visual</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-monitor</artifactId>
diff --git a/pig-visual/pig-sentinel-dashboard/pom.xml b/pig-visual/pig-sentinel-dashboard/pom.xml
index c12f0d71..8cb4d124 100755
--- a/pig-visual/pig-sentinel-dashboard/pom.xml
+++ b/pig-visual/pig-sentinel-dashboard/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-visual</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-sentinel-dashboard</artifactId>
diff --git a/pig-visual/pig-xxl-job-admin/pom.xml b/pig-visual/pig-xxl-job-admin/pom.xml
index 94bae1e4..314249fd 100644
--- a/pig-visual/pig-xxl-job-admin/pom.xml
+++ b/pig-visual/pig-xxl-job-admin/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-visual</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-xxl-job-admin</artifactId>
diff --git a/pig-visual/pom.xml b/pig-visual/pom.xml
index 05e2f330..7941bef0 100755
--- a/pig-visual/pom.xml
+++ b/pig-visual/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.10.4-SNAPSHOT</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<artifactId>pig-visual</artifactId>
diff --git a/pom.xml b/pom.xml
index 3d18548b..f45455ce 100755
--- a/pom.xml
+++ b/pom.xml
@@ -23,25 +23,25 @@
 		<!-- 源码: https://gitee.com/log4j/pig-cloud-dependencies-parent -->
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-cloud-dependencies-parent</artifactId>
-		<version>2.10.3</version>
+		<version>2.11.0</version>
 	</parent>
 
 	<groupId>com.pig4cloud</groupId>
 	<artifactId>pig</artifactId>
-	<version>2.10.3</version>
+	<version>2.11.0</version>
 	<name>${project.artifactId}</name>
 	<packaging>pom</packaging>
 	<url>https://www.pig4cloud.com</url>
 
 	<properties>
 		<spring-boot.version>2.4.1</spring-boot.version>
-		<spring-cloud.version>2020.0.0-RC1</spring-cloud.version>
+		<spring-cloud.version>2020.0.0</spring-cloud.version>
 		<spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<spring-boot-admin.version>2.3.1</spring-boot-admin.version>
-		<hutool.version>5.5.1</hutool.version>
+		<hutool.version>5.5.3</hutool.version>
 		<mybatis-plus.version>3.4.1</mybatis-plus.version>
 		<dynamic-ds.version>3.2.0</dynamic-ds.version>
 		<captcha.version>2.2.0</captcha.version>
@@ -211,34 +211,4 @@
 		</profile>
 	</profiles>
 
-	<repositories>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-		</repository>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
 </project>
-- 
GitLab