From 22b0144eac76474778cb84446a77fb6552d65dec Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Tue, 29 Oct 2019 10:01:32 +0800
Subject: [PATCH] =?UTF-8?q?:tada:=20=E5=BC=95=E5=85=A5blade-bom=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E7=89=88=E6=9C=AC=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blade-auth/pom.xml                         |  3 ---
 blade-common/pom.xml                       |  2 --
 blade-gateway/pom.xml                      |  8 --------
 blade-ops-api/pom.xml                      |  2 --
 blade-ops/blade-admin/pom.xml              |  4 ----
 blade-ops/blade-develop/pom.xml            |  3 ---
 blade-ops/blade-flow-design/pom.xml        |  5 -----
 blade-ops/blade-flow/pom.xml               |  8 ++------
 blade-ops/blade-log/pom.xml                |  2 --
 blade-ops/blade-resource/pom.xml           |  7 +------
 blade-ops/blade-turbine/pom.xml            |  3 ---
 blade-service-api/blade-dict-api/pom.xml   |  1 -
 blade-service-api/blade-scope-api/pom.xml  |  3 ---
 blade-service-api/blade-system-api/pom.xml |  1 -
 blade-service-api/blade-user-api/pom.xml   |  1 -
 blade-service-api/pom.xml                  |  5 -----
 blade-service/blade-desk/pom.xml           |  5 -----
 blade-service/blade-system/pom.xml         |  2 --
 blade-service/blade-user/pom.xml           |  2 --
 blade-service/pom.xml                      |  3 +--
 pom.xml                                    | 20 +++++++-------------
 21 files changed, 11 insertions(+), 79 deletions(-)

diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml
index 793329b4..81d6958f 100644
--- a/blade-auth/pom.xml
+++ b/blade-auth/pom.xml
@@ -32,12 +32,10 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-db</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-cloud</artifactId>
-            <version>${bladex.tool.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springblade</groupId>
@@ -70,7 +68,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-swagger</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
diff --git a/blade-common/pom.xml b/blade-common/pom.xml
index 1a5ac418..f3ef1d30 100644
--- a/blade-common/pom.xml
+++ b/blade-common/pom.xml
@@ -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-gateway/pom.xml b/blade-gateway/pom.xml
index 1c05bed9..c7cca13d 100644
--- a/blade-gateway/pom.xml
+++ b/blade-gateway/pom.xml
@@ -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>
@@ -45,7 +44,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-jwt</artifactId>
-            <version>${bladex.project.version}</version>
         </dependency>
         <!--Spring-->
         <dependency>
@@ -59,7 +57,6 @@
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>
-            <version>${spring.boot.admin.version}</version>
         </dependency>
         <!--Hystrix-->
         <dependency>
@@ -76,18 +73,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 +92,6 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-models</artifactId>
-            <version>${swagger.models.version}</version>
         </dependency>
         <!--<dependency>
             <groupId>io.springfox</groupId>
@@ -108,7 +101,6 @@
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>swagger-bootstrap-ui</artifactId>
-            <version>${swagger.bootstrapui.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/blade-ops-api/pom.xml b/blade-ops-api/pom.xml
index ca0f44b7..63d06e2e 100644
--- a/blade-ops-api/pom.xml
+++ b/blade-ops-api/pom.xml
@@ -23,7 +23,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-mybatis</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -32,7 +31,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-auto</artifactId>
-            <version>${bladex.tool.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml
index 57b99b19..822ab93e 100644
--- a/blade-ops/blade-admin/pom.xml
+++ b/blade-ops/blade-admin/pom.xml
@@ -24,17 +24,14 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-launch</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-tool</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-cloud</artifactId>
-            <version>${bladex.tool.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springblade</groupId>
@@ -46,7 +43,6 @@
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-server</artifactId>
-            <version>${spring.boot.admin.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml
index 123a9212..ea309c95 100644
--- a/blade-ops/blade-develop/pom.xml
+++ b/blade-ops/blade-develop/pom.xml
@@ -21,17 +21,14 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-boot</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-develop</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-ops/blade-flow-design/pom.xml b/blade-ops/blade-flow-design/pom.xml
index 67a1fc7d..7fc16c65 100644
--- a/blade-ops/blade-flow-design/pom.xml
+++ b/blade-ops/blade-flow-design/pom.xml
@@ -18,7 +18,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-launch</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -75,24 +74,20 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql.connector.version}</version>
         </dependency>
         <!-- Oracle -->
         <dependency>
             <groupId>com.hynnet</groupId>
             <artifactId>oracle-driver-ojdbc6</artifactId>
-            <version>${oracle.connector.version}</version>
         </dependency>
         <!-- PostgreSql -->
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>${postgresql.connector.version}</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.1.18</version>
         </dependency>
     </dependencies>
 
diff --git a/blade-ops/blade-flow/pom.xml b/blade-ops/blade-flow/pom.xml
index 1fecc7bb..c78c2e59 100644
--- a/blade-ops/blade-flow/pom.xml
+++ b/blade-ops/blade-flow/pom.xml
@@ -24,17 +24,14 @@
         <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-transaction</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
@@ -49,18 +46,17 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-auto</artifactId>
-            <version>${bladex.tool.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-user-api</artifactId>
-            <version>${bladex.tool.version}</version>
+            <version>${bladex.project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-flow-api</artifactId>
-            <version>${bladex.tool.version}</version>
+            <version>${bladex.project.version}</version>
         </dependency>
         <!-- 工作流 -->
         <dependency>
diff --git a/blade-ops/blade-log/pom.xml b/blade-ops/blade-log/pom.xml
index 77518fd2..8ce20290 100644
--- a/blade-ops/blade-log/pom.xml
+++ b/blade-ops/blade-log/pom.xml
@@ -24,12 +24,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-tenant</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml
index 5bc5707d..6552c094 100644
--- a/blade-ops/blade-resource/pom.xml
+++ b/blade-ops/blade-resource/pom.xml
@@ -23,32 +23,27 @@
         <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>
             <artifactId>blade-starter-alioss</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-dict-api</artifactId>
-            <version>${bladex.tool.version}</version>
+            <version>${bladex.project.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/blade-ops/blade-turbine/pom.xml b/blade-ops/blade-turbine/pom.xml
index 3c0d8658..d4d4fd0e 100644
--- a/blade-ops/blade-turbine/pom.xml
+++ b/blade-ops/blade-turbine/pom.xml
@@ -21,17 +21,14 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-launch</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-tool</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-cloud</artifactId>
-            <version>${bladex.tool.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springblade</groupId>
diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml
index b7f0de69..e78a811e 100644
--- a/blade-service-api/blade-dict-api/pom.xml
+++ b/blade-service-api/blade-dict-api/pom.xml
@@ -18,7 +18,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-cache</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/blade-service-api/blade-scope-api/pom.xml b/blade-service-api/blade-scope-api/pom.xml
index e7463618..29813266 100644
--- a/blade-service-api/blade-scope-api/pom.xml
+++ b/blade-service-api/blade-scope-api/pom.xml
@@ -18,17 +18,14 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-secure</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-cache</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-datascope</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml
index 8391bcf1..59865cb8 100644
--- a/blade-service-api/blade-system-api/pom.xml
+++ b/blade-service-api/blade-system-api/pom.xml
@@ -18,7 +18,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-cache</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml
index 6d3378d5..f339f173 100644
--- a/blade-service-api/blade-user-api/pom.xml
+++ b/blade-service-api/blade-user-api/pom.xml
@@ -18,7 +18,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-cache</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml
index 5169d5e4..d40a3c32 100644
--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@@ -27,12 +27,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>
@@ -41,7 +39,6 @@
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
-            <version>${swagger.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>io.swagger</groupId>
@@ -52,12 +49,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-desk/pom.xml b/blade-service/blade-desk/pom.xml
index f1a593af..424303fa 100644
--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/pom.xml
@@ -20,12 +20,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>
@@ -45,17 +43,14 @@
         <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>
             <artifactId>blade-starter-transaction</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml
index fad1155a..bca6b606 100644
--- a/blade-service/blade-system/pom.xml
+++ b/blade-service/blade-system/pom.xml
@@ -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-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml
index a2a497b4..2bcfaaa4 100644
--- a/blade-service/blade-user/pom.xml
+++ b/blade-service/blade-user/pom.xml
@@ -19,12 +19,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-service/pom.xml b/blade-service/pom.xml
index fb795b1e..a3b16b50 100644
--- a/blade-service/pom.xml
+++ b/blade-service/pom.xml
@@ -32,12 +32,11 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-tenant</artifactId>
-            <version>${bladex.tool.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-dict-api</artifactId>
-            <version>${bladex.tool.version}</version>
+            <version>${bladex.project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
diff --git a/pom.xml b/pom.xml
index 9b2d3d50..1cd66ff8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,6 @@
     <packaging>pom</packaging>
 
     <properties>
-        <bladex.tool.version>2.1.0.RELEASE</bladex.tool.version>
         <bladex.project.version>2.1.0.RELEASE</bladex.project.version>
 
         <java.version>1.8</java.version>
@@ -17,19 +16,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <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.2.0</mybatis.plus.version>
-        <curator.framework.version>4.0.1</curator.framework.version>
-        <protostuff.version>1.6.0</protostuff.version>
         <flowable.version>6.4.2</flowable.version>
-        <mysql.connector.version>8.0.17</mysql.connector.version>
-        <oracle.connector.version>12.1.0.1</oracle.connector.version>
-        <postgresql.connector.version>42.2.6</postgresql.connector.version>
-        <spring.boot.admin.version>2.1.5</spring.boot.admin.version>
-
-        <alibaba.cloud.version>2.1.0.RELEASE</alibaba.cloud.version>
 
         <spring.boot.version>2.1.9.RELEASE</spring.boot.version>
         <spring.cloud.version>Greenwich.SR3</spring.cloud.version>
@@ -74,6 +61,13 @@
                 <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>
         </dependencies>
     </dependencyManagement>