From 3597bbf9093c5c893c221b98d200ff28ce1309de Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Tue, 29 Oct 2019 17:12:27 +0800
Subject: [PATCH] :tada: 2.2.0.RELEASE

---
 blade-common/pom.xml                          |  4 +--
 .../blade-dubbo-provider-api/pom.xml          |  2 +-
 blade-example-api/pom.xml                     |  4 +--
 blade-example/blade-dubbo-consumer/pom.xml    |  4 +--
 blade-example/blade-dubbo-provider/pom.xml    |  4 +--
 blade-example/blade-seata-order/pom.xml       |  4 +--
 blade-example/blade-seata-storage/pom.xml     |  4 +--
 blade-example/pom.xml                         |  5 ++--
 blade-gateway/pom.xml                         | 11 +-------
 blade-service-api/blade-demo-api/pom.xml      |  2 +-
 blade-service-api/pom.xml                     |  9 ++----
 blade-service/blade-demo/pom.xml              |  8 +-----
 blade-service/pom.xml                         |  6 ++--
 pom.xml                                       | 28 ++++++++++---------
 script/docker/.env                            |  2 +-
 15 files changed, 33 insertions(+), 64 deletions(-)

diff --git a/blade-common/pom.xml b/blade-common/pom.xml
index dea99a54b..65bf26949 100644
--- a/blade-common/pom.xml
+++ b/blade-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.1.0.RELEASE</version>
+        <version>2.2.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,12 +18,10 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-launch</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-auto</artifactId>
-            <version>${bladex.tool.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/blade-example-api/blade-dubbo-provider-api/pom.xml b/blade-example-api/blade-dubbo-provider-api/pom.xml
index 16c1c77b0..d3507fef9 100644
--- a/blade-example-api/blade-dubbo-provider-api/pom.xml
+++ b/blade-example-api/blade-dubbo-provider-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.1.0.RELEASE</version>
+        <version>2.2.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/blade-example-api/pom.xml b/blade-example-api/pom.xml
index 34e79aa10..f466e7afd 100644
--- a/blade-example-api/pom.xml
+++ b/blade-example-api/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.1.0.RELEASE</version>
+        <version>2.2.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-example-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.1.0.RELEASE</version>
+    <version>2.2.0.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务范例API集合</description>
 
diff --git a/blade-example/blade-dubbo-consumer/pom.xml b/blade-example/blade-dubbo-consumer/pom.xml
index d82b291f6..0fd54cbc7 100644
--- a/blade-example/blade-dubbo-consumer/pom.xml
+++ b/blade-example/blade-dubbo-consumer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.1.0.RELEASE</version>
+        <version>2.2.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,12 +18,10 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-boot</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-swagger</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
diff --git a/blade-example/blade-dubbo-provider/pom.xml b/blade-example/blade-dubbo-provider/pom.xml
index e599da95e..2d6e954b8 100644
--- a/blade-example/blade-dubbo-provider/pom.xml
+++ b/blade-example/blade-dubbo-provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.1.0.RELEASE</version>
+        <version>2.2.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,12 +18,10 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-boot</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-swagger</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
diff --git a/blade-example/blade-seata-order/pom.xml b/blade-example/blade-seata-order/pom.xml
index 97ad9e822..94d5e4c73 100644
--- a/blade-example/blade-seata-order/pom.xml
+++ b/blade-example/blade-seata-order/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.1.0.RELEASE</version>
+        <version>2.2.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,12 +18,10 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-boot</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-transaction</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/blade-example/blade-seata-storage/pom.xml b/blade-example/blade-seata-storage/pom.xml
index 1a9cee45a..503fe822d 100644
--- a/blade-example/blade-seata-storage/pom.xml
+++ b/blade-example/blade-seata-storage/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.1.0.RELEASE</version>
+        <version>2.2.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,12 +18,10 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-boot</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-transaction</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/blade-example/pom.xml b/blade-example/pom.xml
index dc81b3ff3..64c5278a7 100644
--- a/blade-example/pom.xml
+++ b/blade-example/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.1.0.RELEASE</version>
+        <version>2.2.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-example</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.1.0.RELEASE</version>
+    <version>2.2.0.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务范例集合</description>
 
@@ -26,7 +26,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-common</artifactId>
-            <version>${bladex.project.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml
index db47224dd..fe26c03f9 100644
--- a/blade-gateway/pom.xml
+++ b/blade-gateway/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.1.0.RELEASE</version>
+        <version>2.2.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,7 +19,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-launch</artifactId>
-            <version>${bladex.tool.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
@@ -34,7 +33,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-common</artifactId>
-            <version>${bladex.project.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springblade</groupId>
@@ -45,7 +43,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-jwt</artifactId>
-            <version>${bladex.project.version}</version>
         </dependency>
         <!--Spring-->
         <dependency>
@@ -59,7 +56,6 @@
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>
-            <version>${spring.boot.admin.version}</version>
         </dependency>
         <!--Hystrix-->
         <dependency>
@@ -76,18 +72,15 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-            <version>${alibaba.cloud.version}</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-            <version>${alibaba.cloud.version}</version>
         </dependency>
         <!--Swagger-->
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
-            <version>${swagger.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>io.swagger</groupId>
@@ -98,7 +91,6 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-models</artifactId>
-            <version>${swagger.models.version}</version>
         </dependency>
         <!--<dependency>
             <groupId>io.springfox</groupId>
@@ -108,7 +100,6 @@
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>swagger-bootstrap-ui</artifactId>
-            <version>${swagger.bootstrapui.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/blade-service-api/blade-demo-api/pom.xml b/blade-service-api/blade-demo-api/pom.xml
index cdc20aa77..18788bc4e 100644
--- a/blade-service-api/blade-demo-api/pom.xml
+++ b/blade-service-api/blade-demo-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.1.0.RELEASE</version>
+        <version>2.2.0.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml
index 1a2d4464f..7906c1a19 100644
--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.1.0.RELEASE</version>
+        <version>2.2.0.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-service-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.1.0.RELEASE</version>
+    <version>2.2.0.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务API集合</description>
 
@@ -24,12 +24,10 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-mybatis</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-tenant</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -38,7 +36,6 @@
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
-            <version>${swagger.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>io.swagger</groupId>
@@ -49,12 +46,10 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-models</artifactId>
-            <version>${swagger.models.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-auto</artifactId>
-            <version>${bladex.tool.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/blade-service/blade-demo/pom.xml b/blade-service/blade-demo/pom.xml
index e968fabe3..2d2acb446 100644
--- a/blade-service/blade-demo/pom.xml
+++ b/blade-service/blade-demo/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>blade-service</artifactId>
-        <version>2.1.0.RELEASE</version>
+        <version>2.2.0.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -20,22 +20,18 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-boot</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-swagger</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-minio</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-qiniu</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
@@ -50,13 +46,11 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-test</artifactId>
-            <version>${bladex.tool.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-auto</artifactId>
-            <version>${bladex.tool.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/blade-service/pom.xml b/blade-service/pom.xml
index 695efd88c..a22080c43 100644
--- a/blade-service/pom.xml
+++ b/blade-service/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>BladeX-Biz</artifactId>
-        <version>2.1.0.RELEASE</version>
+        <version>2.2.0.RELEASE</version>
     </parent>
 
     <artifactId>blade-service</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.1.0.RELEASE</version>
+    <version>2.2.0.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务集合</description>
 
@@ -24,12 +24,10 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-common</artifactId>
-            <version>${bladex.project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-tenant</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 37473eafe..00299759d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,25 +5,15 @@
 
     <groupId>org.springblade</groupId>
     <artifactId>BladeX-Biz</artifactId>
-    <version>2.1.0.RELEASE</version>
+    <version>2.2.0.RELEASE</version>
     <packaging>pom</packaging>
 
     <properties>
-        <bladex.tool.version>2.1.0.RELEASE</bladex.tool.version>
-        <bladex.project.version>2.1.0.RELEASE</bladex.project.version>
+        <bladex.project.version>2.2.0.RELEASE</bladex.project.version>
 
         <java.version>1.8</java.version>
-        <swagger.version>2.9.2</swagger.version>
-        <swagger.models.version>1.5.21</swagger.models.version>
-        <swagger.bootstrapui.version>1.9.6</swagger.bootstrapui.version>
-        <mybatis.plus.version>3.1.0</mybatis.plus.version>
-        <curator.framework.version>4.0.1</curator.framework.version>
-        <protostuff.version>1.6.0</protostuff.version>
-        <flowable.version>6.4.1</flowable.version>
-        <mysql.connector.version>8.0.16</mysql.connector.version>
-        <spring.boot.admin.version>2.1.4</spring.boot.admin.version>
 
-        <alibaba.cloud.version>2.1.0.RELEASE</alibaba.cloud.version>
+        <flowable.version>6.4.2</flowable.version>
         <dubbo.version>2.7.3</dubbo.version>
 
         <spring.boot.version>2.1.8.RELEASE</spring.boot.version>
@@ -68,6 +58,18 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.springblade.platform</groupId>
+                <artifactId>blade-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/script/docker/.env b/script/docker/.env
index 8488464fc..24c363458 100644
--- a/script/docker/.env
+++ b/script/docker/.env
@@ -1,2 +1,2 @@
 REGISTER=192.168.0.157/blade
-TAG=2.1.0.RELEASE
+TAG=2.2.0.RELEASE