From b1a30de58585feeaa4e970581b06f5a34ba86746 Mon Sep 17 00:00:00 2001
From: trang <donghao.l@hotmail.com>
Date: Wed, 3 Jan 2018 12:26:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96=E7=8E=87=E7=9A=84=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                             |  2 +-
 .../druid-spring-boot-actuator-autoconfigure/pom.xml  |  2 +-
 .../druid-spring-boot-actuator-starter/pom.xml        |  7 +------
 .../src/main/resources/META-INF/spring.provides       |  2 +-
 druid-spring-boot-actuator/pom.xml                    |  2 +-
 .../druid-spring-boot-mybatis-example/pom.xml         | 11 +----------
 .../druid/example/test/{ => coveralls}/BaseTest.java  |  2 +-
 .../test/{ => coveralls}/DynamicDataSourceTests.java  |  2 +-
 .../example/test/{ => coveralls}/MyBatisTests.java    |  2 +-
 .../test/{ => coveralls}/SingleDataSourceTests.java   |  2 +-
 druid-spring-boot-example/pom.xml                     |  2 +-
 .../druid-spring-boot-autoconfigure/pom.xml           |  2 +-
 druid-spring-boot/druid-spring-boot-starter/pom.xml   |  7 +------
 .../src/main/resources/META-INF/spring.provides       |  2 +-
 druid-spring-boot/pom.xml                             |  2 +-
 pom.xml                                               |  4 ++--
 16 files changed, 17 insertions(+), 36 deletions(-)
 rename druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/{ => coveralls}/BaseTest.java (91%)
 rename druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/{ => coveralls}/DynamicDataSourceTests.java (99%)
 rename druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/{ => coveralls}/MyBatisTests.java (90%)
 rename druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/{ => coveralls}/SingleDataSourceTests.java (95%)

diff --git a/README.md b/README.md
index 6bedadf..8bddc33 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Druid Spring Boot Starter 将帮助你在 Spring Boot 中使用 Druid。
 <dependency>
     <groupId>com.github.drtrang</groupId>
     <artifactId>druid-spring-boot-starter</artifactId>
-    <version>1.1.5</version>
+    <version>1.1.6-SNAPSHOT</version>
 </dependency>
 ```
 
diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/pom.xml b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/pom.xml
index 8749e7a..d6b17e0 100644
--- a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/pom.xml
+++ b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.drtrang</groupId>
         <artifactId>druid-spring-boot-actuator</artifactId>
-        <version>1.1.5</version>
+        <version>1.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>druid-spring-boot-actuator-autoconfigure</artifactId>
diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/pom.xml b/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/pom.xml
index 7d06410..9904b26 100644
--- a/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/pom.xml
+++ b/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.drtrang</groupId>
         <artifactId>druid-spring-boot-actuator</artifactId>
-        <version>1.1.5</version>
+        <version>1.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>druid-spring-boot-actuator-starter</artifactId>
@@ -21,11 +21,6 @@
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/src/main/resources/META-INF/spring.provides b/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/src/main/resources/META-INF/spring.provides
index 0dad8dc..b011b1b 100644
--- a/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/src/main/resources/META-INF/spring.provides
+++ b/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/src/main/resources/META-INF/spring.provides
@@ -1 +1 @@
-provides: druid,druid-spring-boot-actuator,druid-spring-boot-actuator-autoconfigure,slf4j-api,lombok
\ No newline at end of file
+provides: druid,druid-spring-boot-actuator,druid-spring-boot-actuator-autoconfigure,slf4j-api
\ No newline at end of file
diff --git a/druid-spring-boot-actuator/pom.xml b/druid-spring-boot-actuator/pom.xml
index c6df4e4..573b303 100644
--- a/druid-spring-boot-actuator/pom.xml
+++ b/druid-spring-boot-actuator/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.drtrang</groupId>
         <artifactId>druid-spring-boot-parent</artifactId>
-        <version>1.1.5</version>
+        <version>1.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>druid-spring-boot-actuator</artifactId>
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/pom.xml b/druid-spring-boot-example/druid-spring-boot-mybatis-example/pom.xml
index e7455c5..7531c3a 100644
--- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/pom.xml
+++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.drtrang</groupId>
         <artifactId>druid-spring-boot-example</artifactId>
-        <version>1.1.5</version>
+        <version>1.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>druid-spring-boot-mybatis-example</artifactId>
@@ -65,15 +65,6 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <includes>
-                        <include>com/github/trang/druid/test/*</include>
-                    </includes>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/BaseTest.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/coveralls/BaseTest.java
similarity index 91%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/BaseTest.java
rename to druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/coveralls/BaseTest.java
index fb03a46..2870743 100644
--- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/BaseTest.java
+++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/coveralls/BaseTest.java
@@ -1,4 +1,4 @@
-package com.github.trang.druid.example.test;
+package com.github.trang.druid.example.test.coveralls;
 
 import com.github.trang.druid.example.DruidSpringBootStarterApplication;
 import com.github.trang.druid.example.mapper.CityMapper;
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/DynamicDataSourceTests.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/coveralls/DynamicDataSourceTests.java
similarity index 99%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/DynamicDataSourceTests.java
rename to druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/coveralls/DynamicDataSourceTests.java
index 5313154..2b8c16b 100644
--- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/DynamicDataSourceTests.java
+++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/coveralls/DynamicDataSourceTests.java
@@ -1,4 +1,4 @@
-package com.github.trang.druid.example.test;
+package com.github.trang.druid.example.test.coveralls;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.github.trang.druid.autoconfigure.datasource.DruidDataSource2;
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/MyBatisTests.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/coveralls/MyBatisTests.java
similarity index 90%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/MyBatisTests.java
rename to druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/coveralls/MyBatisTests.java
index 88be630..3a571d1 100644
--- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/MyBatisTests.java
+++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/coveralls/MyBatisTests.java
@@ -1,4 +1,4 @@
-package com.github.trang.druid.example.test;
+package com.github.trang.druid.example.test.coveralls;
 
 import com.github.trang.druid.example.model.City;
 import org.junit.Assert;
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/SingleDataSourceTests.java b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/coveralls/SingleDataSourceTests.java
similarity index 95%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/SingleDataSourceTests.java
rename to druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/coveralls/SingleDataSourceTests.java
index f12792f..6a00c62 100644
--- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/SingleDataSourceTests.java
+++ b/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/test/coveralls/SingleDataSourceTests.java
@@ -1,4 +1,4 @@
-package com.github.trang.druid.example.test;
+package com.github.trang.druid.example.test.coveralls;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import org.junit.Test;
diff --git a/druid-spring-boot-example/pom.xml b/druid-spring-boot-example/pom.xml
index af9d931..98ab95d 100644
--- a/druid-spring-boot-example/pom.xml
+++ b/druid-spring-boot-example/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.drtrang</groupId>
         <artifactId>druid-spring-boot-parent</artifactId>
-        <version>1.1.5</version>
+        <version>1.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>druid-spring-boot-example</artifactId>
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/pom.xml b/druid-spring-boot/druid-spring-boot-autoconfigure/pom.xml
index 8ad693e..66a7210 100644
--- a/druid-spring-boot/druid-spring-boot-autoconfigure/pom.xml
+++ b/druid-spring-boot/druid-spring-boot-autoconfigure/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.drtrang</groupId>
         <artifactId>druid-spring-boot</artifactId>
-        <version>1.1.5</version>
+        <version>1.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>druid-spring-boot-autoconfigure</artifactId>
diff --git a/druid-spring-boot/druid-spring-boot-starter/pom.xml b/druid-spring-boot/druid-spring-boot-starter/pom.xml
index 55a9b05..67bbc40 100644
--- a/druid-spring-boot/druid-spring-boot-starter/pom.xml
+++ b/druid-spring-boot/druid-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.drtrang</groupId>
         <artifactId>druid-spring-boot</artifactId>
-        <version>1.1.5</version>
+        <version>1.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>druid-spring-boot-starter</artifactId>
@@ -29,11 +29,6 @@
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/druid-spring-boot/druid-spring-boot-starter/src/main/resources/META-INF/spring.provides b/druid-spring-boot/druid-spring-boot-starter/src/main/resources/META-INF/spring.provides
index 7a8b374..1dd5dbf 100644
--- a/druid-spring-boot/druid-spring-boot-starter/src/main/resources/META-INF/spring.provides
+++ b/druid-spring-boot/druid-spring-boot-starter/src/main/resources/META-INF/spring.provides
@@ -1 +1 @@
-provides: druid,druid-spring-boot-autoconfigure,spring-boot-autoconfigure,spring-jdbc,slf4j-api,lombok
\ No newline at end of file
+provides: druid,druid-spring-boot-autoconfigure,spring-boot-autoconfigure,spring-jdbc,slf4j-api
\ No newline at end of file
diff --git a/druid-spring-boot/pom.xml b/druid-spring-boot/pom.xml
index b4865ab..38c6e47 100644
--- a/druid-spring-boot/pom.xml
+++ b/druid-spring-boot/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.drtrang</groupId>
         <artifactId>druid-spring-boot-parent</artifactId>
-        <version>1.1.5</version>
+        <version>1.1.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>druid-spring-boot</artifactId>
diff --git a/pom.xml b/pom.xml
index 9d3dd6a..2421e4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.github.drtrang</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.3</version>
+        <version>1.0.5</version>
     </parent>
 
     <artifactId>druid-spring-boot-parent</artifactId>
-    <version>1.1.5</version>
+    <version>1.1.6-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Druid Spring Boot Starter</name>