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。 com.github.drtrang druid-spring-boot-starter - 1.1.5 + 1.1.6-SNAPSHOT ``` 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 @@ com.github.drtrang druid-spring-boot-actuator - 1.1.5 + 1.1.6-SNAPSHOT druid-spring-boot-actuator-autoconfigure 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 @@ com.github.drtrang druid-spring-boot-actuator - 1.1.5 + 1.1.6-SNAPSHOT druid-spring-boot-actuator-starter @@ -21,11 +21,6 @@ com.alibaba druid - - org.projectlombok - lombok - provided - \ 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 @@ com.github.drtrang druid-spring-boot-parent - 1.1.5 + 1.1.6-SNAPSHOT druid-spring-boot-actuator 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 @@ com.github.drtrang druid-spring-boot-example - 1.1.5 + 1.1.6-SNAPSHOT druid-spring-boot-mybatis-example @@ -65,15 +65,6 @@ org.springframework.boot spring-boot-maven-plugin - - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - com/github/trang/druid/test/* - - - 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 @@ com.github.drtrang druid-spring-boot-parent - 1.1.5 + 1.1.6-SNAPSHOT druid-spring-boot-example 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 @@ com.github.drtrang druid-spring-boot - 1.1.5 + 1.1.6-SNAPSHOT druid-spring-boot-autoconfigure 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 @@ com.github.drtrang druid-spring-boot - 1.1.5 + 1.1.6-SNAPSHOT druid-spring-boot-starter @@ -29,11 +29,6 @@ com.alibaba druid - - org.projectlombok - lombok - provided - \ 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 @@ com.github.drtrang druid-spring-boot-parent - 1.1.5 + 1.1.6-SNAPSHOT druid-spring-boot diff --git a/pom.xml b/pom.xml index 9d3dd6a..2421e4d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ com.github.drtrang parent - 1.0.3 + 1.0.5 druid-spring-boot-parent - 1.1.5 + 1.1.6-SNAPSHOT pom Druid Spring Boot Starter