From 8b37844653616d5aa777a023290497f68b249c8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Mon, 11 Feb 2019 10:09:26 +0800
Subject: [PATCH] :bookmark: Releasing / Version tags.2.2.1

---
 pigx-auth/pom.xml                           |  3 +-
 pigx-common/pigx-common-bom/pom.xml         |  2 +-
 pigx-common/pigx-common-core/pom.xml        |  2 +-
 pigx-common/pigx-common-data/pom.xml        |  2 +-
 pigx-common/pigx-common-gateway/pom.xml     |  2 +-
 pigx-common/pigx-common-job/pom.xml         |  2 +-
 pigx-common/pigx-common-log/pom.xml         |  2 +-
 pigx-common/pigx-common-minio/pom.xml       |  2 +-
 pigx-common/pigx-common-security/pom.xml    |  2 +-
 pigx-common/pigx-common-swagger/pom.xml     |  2 +-
 pigx-common/pigx-common-transaction/pom.xml |  2 +-
 pigx-common/pom.xml                         |  2 +-
 pigx-config/pom.xml                         |  3 +-
 pigx-eureka/pom.xml                         |  3 +-
 pigx-gateway/pom.xml                        |  3 +-
 pigx-upms/pigx-upms-api/pom.xml             |  2 +-
 pigx-upms/pigx-upms-biz/pom.xml             |  3 +-
 pigx-upms/pom.xml                           |  2 +-
 pigx-visual/pigx-activiti/pom.xml           |  3 +-
 pigx-visual/pigx-codegen/pom.xml            |  3 +-
 pigx-visual/pigx-daemon/pom.xml             |  3 +-
 pigx-visual/pigx-monitor/pom.xml            |  5 +-
 pigx-visual/pigx-sso-client-demo/pom.xml    |  2 +-
 pigx-visual/pigx-tx-manager/pom.xml         |  2 +-
 pigx-visual/pom.xml                         |  2 +-
 pom.xml                                     | 54 +++++++++------------
 26 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml
index 066a46317..faef73739 100644
--- a/pigx-auth/pom.xml
+++ b/pigx-auth/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-auth</artifactId>
@@ -101,6 +101,7 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index 5d2e23a51..b602e7ee8 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -12,7 +12,7 @@
 
 	<artifactId>pigx-common-bom</artifactId>
 	<packaging>pom</packaging>
-	<version>2.2.0</version>
+	<version>2.2.1</version>
 	<description>pigx 公共版本控制</description>
 
 	<properties>
diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml
index 089c7a359..c5dd26420 100644
--- a/pigx-common/pigx-common-core/pom.xml
+++ b/pigx-common/pigx-common-core/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-common-core</artifactId>
diff --git a/pigx-common/pigx-common-data/pom.xml b/pigx-common/pigx-common-data/pom.xml
index d497c7040..c52963faa 100644
--- a/pigx-common/pigx-common-data/pom.xml
+++ b/pigx-common/pigx-common-data/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-common-data</artifactId>
diff --git a/pigx-common/pigx-common-gateway/pom.xml b/pigx-common/pigx-common-gateway/pom.xml
index d4d9cc8e8..322d546c0 100644
--- a/pigx-common/pigx-common-gateway/pom.xml
+++ b/pigx-common/pigx-common-gateway/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-common-gateway</artifactId>
diff --git a/pigx-common/pigx-common-job/pom.xml b/pigx-common/pigx-common-job/pom.xml
index 14f2d8421..0ddaa58eb 100644
--- a/pigx-common/pigx-common-job/pom.xml
+++ b/pigx-common/pigx-common-job/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-common-job</artifactId>
diff --git a/pigx-common/pigx-common-log/pom.xml b/pigx-common/pigx-common-log/pom.xml
index 0c4c20ff3..e4d0cf88f 100644
--- a/pigx-common/pigx-common-log/pom.xml
+++ b/pigx-common/pigx-common-log/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-common-log</artifactId>
diff --git a/pigx-common/pigx-common-minio/pom.xml b/pigx-common/pigx-common-minio/pom.xml
index a875f7c4e..52a0c041a 100755
--- a/pigx-common/pigx-common-minio/pom.xml
+++ b/pigx-common/pigx-common-minio/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-common-minio</artifactId>
diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml
index 3e19282b2..6a84b9c4e 100644
--- a/pigx-common/pigx-common-security/pom.xml
+++ b/pigx-common/pigx-common-security/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-common-security</artifactId>
diff --git a/pigx-common/pigx-common-swagger/pom.xml b/pigx-common/pigx-common-swagger/pom.xml
index 927ca6d2f..e450c17c8 100644
--- a/pigx-common/pigx-common-swagger/pom.xml
+++ b/pigx-common/pigx-common-swagger/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-common-swagger</artifactId>
diff --git a/pigx-common/pigx-common-transaction/pom.xml b/pigx-common/pigx-common-transaction/pom.xml
index 8a6b9df31..e7564369e 100644
--- a/pigx-common/pigx-common-transaction/pom.xml
+++ b/pigx-common/pigx-common-transaction/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-common</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-common-transaction</artifactId>
diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml
index a123e556d..f3139b1a2 100644
--- a/pigx-common/pom.xml
+++ b/pigx-common/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-common</artifactId>
diff --git a/pigx-config/pom.xml b/pigx-config/pom.xml
index 2712aaaf9..990b44d2f 100644
--- a/pigx-config/pom.xml
+++ b/pigx-config/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-config</artifactId>
@@ -67,6 +67,7 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/pigx-eureka/pom.xml b/pigx-eureka/pom.xml
index f95e8b803..8eaeeb1c2 100644
--- a/pigx-eureka/pom.xml
+++ b/pigx-eureka/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-eureka</artifactId>
@@ -76,6 +76,7 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml
index a73d733be..1b278f9e5 100644
--- a/pigx-gateway/pom.xml
+++ b/pigx-gateway/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-gateway</artifactId>
@@ -90,6 +90,7 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/pigx-upms/pigx-upms-api/pom.xml b/pigx-upms/pigx-upms-api/pom.xml
index 1ca9037ad..2b37ebfa3 100644
--- a/pigx-upms/pigx-upms-api/pom.xml
+++ b/pigx-upms/pigx-upms-api/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-upms</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-upms-api</artifactId>
diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml
index 563f55bda..c6b3f421a 100644
--- a/pigx-upms/pigx-upms-biz/pom.xml
+++ b/pigx-upms/pigx-upms-biz/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-upms</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-upms-biz</artifactId>
@@ -115,6 +115,7 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/pigx-upms/pom.xml b/pigx-upms/pom.xml
index d9619ef8f..7e60ae8e5 100644
--- a/pigx-upms/pom.xml
+++ b/pigx-upms/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-upms</artifactId>
diff --git a/pigx-visual/pigx-activiti/pom.xml b/pigx-visual/pigx-activiti/pom.xml
index 463a28260..bb4eb154b 100644
--- a/pigx-visual/pigx-activiti/pom.xml
+++ b/pigx-visual/pigx-activiti/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-visual</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-activiti</artifactId>
@@ -144,6 +144,7 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 		<resources>
diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml
index 0d382fe61..9d76a9032 100755
--- a/pigx-visual/pigx-codegen/pom.xml
+++ b/pigx-visual/pigx-codegen/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-visual</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-codegen</artifactId>
@@ -83,6 +83,7 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/pigx-visual/pigx-daemon/pom.xml b/pigx-visual/pigx-daemon/pom.xml
index 58e2c6df1..0d778a82b 100644
--- a/pigx-visual/pigx-daemon/pom.xml
+++ b/pigx-visual/pigx-daemon/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-visual</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-daemon</artifactId>
@@ -104,6 +104,7 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml
index d4aa39176..c3adba447 100644
--- a/pigx-visual/pigx-monitor/pom.xml
+++ b/pigx-visual/pigx-monitor/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-visual</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-monitor</artifactId>
@@ -36,7 +36,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-core</artifactId>
-			<version>2.2.0</version>
+			<version>2.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -96,6 +96,7 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
+				<version>${docker.plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/pigx-visual/pigx-sso-client-demo/pom.xml b/pigx-visual/pigx-sso-client-demo/pom.xml
index 78f4b43ca..5ae5f44a3 100644
--- a/pigx-visual/pigx-sso-client-demo/pom.xml
+++ b/pigx-visual/pigx-sso-client-demo/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-visual</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<dependencies>
diff --git a/pigx-visual/pigx-tx-manager/pom.xml b/pigx-visual/pigx-tx-manager/pom.xml
index d8f08b04e..eab88c7c0 100644
--- a/pigx-visual/pigx-tx-manager/pom.xml
+++ b/pigx-visual/pigx-tx-manager/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx-visual</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-tx-manager</artifactId>
diff --git a/pigx-visual/pom.xml b/pigx-visual/pom.xml
index cf3484c1b..14a499813 100644
--- a/pigx-visual/pom.xml
+++ b/pigx-visual/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pigx</artifactId>
-		<version>2.2.0</version>
+		<version>2.2.1</version>
 	</parent>
 
 	<artifactId>pigx-visual</artifactId>
diff --git a/pom.xml b/pom.xml
index da4b9bb38..78add5f7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
 	<groupId>com.pig4cloud</groupId>
 	<artifactId>pigx</artifactId>
-	<version>2.2.0</version>
+	<version>2.2.1</version>
 	<name>${project.artifactId}</name>
 	<packaging>pom</packaging>
 	<organization>
@@ -60,8 +60,10 @@
 		<minio.version>3.0.12</minio.version>
 		<elastic-job-lite.version>2.1.5</elastic-job-lite.version>
 		<security.oauth.version>2.3.4.RELEASE</security.oauth.version>
+		<security.oauth.auto.version>2.1.2.RELEASE</security.oauth.auto.version>
 		<activiti.version>5.22.0</activiti.version>
 		<docker.url>http://192.168.0.13:4243</docker.url>
+		<docker.plugin.version>0.4.12</docker.plugin.version>
 		<registry.url>192.168.0.13:5000</registry.url>
 	</properties>
 
@@ -153,12 +155,17 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<!--稳定版本，替代spring security 内置-->
+			<!--稳定版本，替代spring security bom内置-->
 			<dependency>
 				<groupId>org.springframework.security.oauth</groupId>
 				<artifactId>spring-security-oauth2</artifactId>
 				<version>${security.oauth.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.security.oauth.boot</groupId>
+				<artifactId>spring-security-oauth2-autoconfigure</artifactId>
+				<version>${security.oauth.auto.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -176,14 +183,18 @@
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-maven-plugin</artifactId>
 					<version>${spring-boot.version}</version>
-					<configuration>
-						<finalName>${project.build.finalName}</finalName>
-					</configuration>
+					<executions>
+						<execution>
+							<goals>
+								<goal>repackage</goal>
+							</goals>
+						</execution>
+					</executions>
 				</plugin>
 				<plugin>
 					<groupId>com.spotify</groupId>
 					<artifactId>docker-maven-plugin</artifactId>
-					<version>0.4.12</version>
+					<version>${docker.plugin.version}</version>
 					<configuration>
 						<imageName>${registry.url}/${project.name}:0.0.1</imageName>
 						<dockerHost>${docker.url}</dockerHost>
@@ -221,32 +232,15 @@
 
 	<repositories>
 		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
+			<id>aliyun</id>
+			<name>aliyun</name>
+			<url>https://maven.aliyun.com/repository/public</url>
+			<releases>
 				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
 			</snapshots>
 		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-		</repository>
 	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-		</pluginRepository>
-	</pluginRepositories>
 </project>