From a3fc1e1578ad6ec7a52be85c5d0c24acb9f20a5e Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Sun, 15 Apr 2018 14:29:15 +0800
Subject: [PATCH] merge

---
 boot-service/pom.xml | 8 ++++----
 pom.xml              | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/boot-service/pom.xml b/boot-service/pom.xml
index f2bccd7..f5072d8 100644
--- a/boot-service/pom.xml
+++ b/boot-service/pom.xml
@@ -43,7 +43,7 @@
         <dependency> <!-- druid连接池 -->
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
-            <version>1.1.5</version>
+            <version>${druid-version}</version>
         </dependency>
         <dependency> <!-- mysql driver -->
             <groupId>mysql</groupId>
@@ -86,18 +86,18 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>3.14</version>
+            <version>${poi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>3.14</version>
+            <version>${poi.version}</version>
         </dependency>
         <!-- httpclient -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.1</version>
+            <version>${httpclient-version}</version>
         </dependency>
         <!-- servlet 有些类需要HttpServletResponse和HttpServletRequest的支持 -->
         <dependency>
diff --git a/pom.xml b/pom.xml
index b0df825..fba7e2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,9 @@
         <fastjson.version>1.2.20</fastjson.version>
         <rsa.version>1.45</rsa.version>
         <commons-io.version>2.2</commons-io.version>
+        <httpclient-version>4.5.1</httpclient-version>
+        <poi.version>3.14</poi.version>
+        <druid-version>1.1.5</druid-version>
         <!-- 打包跳过单元测试 -->
         <skipTests>true</skipTests>
         <swagger2.version>2.4.0</swagger2.version>