diff --git a/.travis.yml b/.travis.yml
index 60b5c9e..3486a55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,5 +7,5 @@ cache:
directories:
- $HOME/.m2/repository
after_success:
- - cd druid-spring-boot-example/druid-spring-boot-mybatis-example
+ - cd druid-spring-boot2-example/druid-spring-boot2-mybatis-example
- mvn clean test -Pcoveralls jacoco:report coveralls:report
\ No newline at end of file
diff --git a/Changelog.md b/Changelog.md
index 8e69b31..dcd7058 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,7 +8,7 @@
### Enhancements
1. 新增基于 JPA 的代码示例
2. 改进 DruidDataSourceInitializer,支持多数据源的 SQL 初始化
-3. 改进自动提示,新增大量精准提示,详情见 [additional-spring-configuration-metadata.json](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json)
+3. 改进自动提示,新增大量精准提示,详情见 [additional-spring-configuration-metadata.json](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json)
### Bug Fixes
1. 修复代码覆盖率显示异常的 bug
diff --git a/README.md b/README.md
index 04ab0eb..4fe36d1 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,18 @@ Druid Spring Boot Starter 将帮助你在 Spring Boot 中使用 Druid。
## 依赖
```xml
+
com.github.drtrang
druid-spring-boot-starter
- 1.1.7
+ 1.1.8
+
+
+
+
+ com.github.drtrang
+ druid-spring-boot2-starter
+ 1.1.8
```
@@ -25,7 +33,7 @@ Druid Spring Boot Starter 将帮助你在 Spring Boot 中使用 Druid。
## NEW !
1. 改进多数据源的声明方式,由 Starter 自动发现配置并注册到 ApplicationContext,详情请查看 [Druid 多数据源支持.md](https://github.com/drtrang/druid-spring-boot/tree/master/docs/Druid%20%E5%A4%9A%E6%95%B0%E6%8D%AE%E6%BA%90%E6%94%AF%E6%8C%81.md)
-1. 新增全配置说明 [druid.yml](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/druid.yml)
+1. 新增全配置说明 [druid.yml](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/resources/druid.yml)
2. 新增 `druid-spring-boot-actuator-starter`
@@ -112,10 +120,10 @@ spring:
```
### 配置示例
-[application.yml](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/application.yml)
+[application.yml](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/resources/application.yml)
### 全配置说明
-[druid.yml](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/druid.yml)
+[druid.yml](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/resources/druid.yml)
## 自动提示
@@ -132,7 +140,7 @@ Druid Spring Boot Starter 基于 `spring-boot-configuration-processor` 模块,
## 演示
-[druid-spring-boot-example](https://github.com/drtrang/druid-spring-boot/tree/master/druid-spring-boot-example) 中演示了 Druid Spring Boot Starter 的使用方式,可以作为参考。
+[druid-spring-boot2-example](https://github.com/drtrang/druid-spring-boot/tree/master/druid-spring-boot2-example) 中演示了 Druid Spring Boot Starter 的使用方式,可以作为参考。
## Change Log
diff --git a/docs/Druid 多数据源支持.md b/docs/Druid 多数据源支持.md
index cab7675..de2ca41 100644
--- a/docs/Druid 多数据源支持.md
+++ b/docs/Druid 多数据源支持.md
@@ -98,4 +98,4 @@ Starter 判断是否多数据源的条件是 application 文件中是否存在 `
## 演示
-将 [druid-spring-boot-mybatis-example](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/application.yml) 的 `spring.profiles.active` 配置改为 `dynamic` 即可。
+将 [druid-spring-boot2-mybatis-example](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/resources/application.yml) 的 `spring.profiles.active` 配置改为 `dynamic` 即可。
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
deleted file mode 100644
index b011b1b..0000000
--- a/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/src/main/resources/META-INF/spring.provides
+++ /dev/null
@@ -1 +0,0 @@
-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/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
deleted file mode 100644
index 1dd5dbf..0000000
--- a/druid-spring-boot/druid-spring-boot-starter/src/main/resources/META-INF/spring.provides
+++ /dev/null
@@ -1 +0,0 @@
-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-actuator/druid-spring-boot-actuator-autoconfigure/pom.xml b/druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/pom.xml
similarity index 90%
rename from druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/pom.xml
rename to druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/pom.xml
index 97f14c2..d59ec8b 100644
--- a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/pom.xml
+++ b/druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/pom.xml
@@ -6,11 +6,11 @@
com.github.drtrang
- druid-spring-boot-actuator
- 1.1.8-SNAPSHOT
+ druid-spring-boot2-actuator
+ 1.1.8
- druid-spring-boot-actuator-autoconfigure
+ druid-spring-boot2-actuator-autoconfigure
diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourceEndpoint.java b/druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourceEndpoint.java
similarity index 100%
rename from druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourceEndpoint.java
rename to druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourceEndpoint.java
diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourceMvcEndpoint.java b/druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourceMvcEndpoint.java
similarity index 100%
rename from druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourceMvcEndpoint.java
rename to druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourceMvcEndpoint.java
diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourcePoolMetadata.java b/druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourcePoolMetadata.java
similarity index 100%
rename from druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourcePoolMetadata.java
rename to druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/DruidDataSourcePoolMetadata.java
diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceActuatorAutoConfiguration.java b/druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceActuatorAutoConfiguration.java
similarity index 100%
rename from druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceActuatorAutoConfiguration.java
rename to druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceActuatorAutoConfiguration.java
diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceEndpointConfiguration.java b/druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceEndpointConfiguration.java
similarity index 100%
rename from druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceEndpointConfiguration.java
rename to druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceEndpointConfiguration.java
diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceMetadataProviderConfiguration.java b/druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceMetadataProviderConfiguration.java
similarity index 100%
rename from druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceMetadataProviderConfiguration.java
rename to druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/src/main/java/com/github/trang/druid/actuate/autoconfigure/DruidDataSourceMetadataProviderConfiguration.java
diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
similarity index 100%
rename from druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
rename to druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories b/druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
rename to druid-spring-boot2-actuator/druid-spring-boot2-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/pom.xml b/druid-spring-boot2-actuator/druid-spring-boot2-actuator-starter/pom.xml
similarity index 72%
rename from druid-spring-boot-actuator/druid-spring-boot-actuator-starter/pom.xml
rename to druid-spring-boot2-actuator/druid-spring-boot2-actuator-starter/pom.xml
index 66c7b73..2687d43 100644
--- a/druid-spring-boot-actuator/druid-spring-boot-actuator-starter/pom.xml
+++ b/druid-spring-boot2-actuator/druid-spring-boot2-actuator-starter/pom.xml
@@ -6,16 +6,16 @@
com.github.drtrang
- druid-spring-boot-actuator
- 1.1.8-SNAPSHOT
+ druid-spring-boot2-actuator
+ 1.1.8
- druid-spring-boot-actuator-starter
+ druid-spring-boot2-actuator-starter
com.github.drtrang
- druid-spring-boot-actuator-autoconfigure
+ druid-spring-boot2-actuator-autoconfigure
com.alibaba
diff --git a/druid-spring-boot2-actuator/druid-spring-boot2-actuator-starter/src/main/resources/META-INF/spring.provides b/druid-spring-boot2-actuator/druid-spring-boot2-actuator-starter/src/main/resources/META-INF/spring.provides
new file mode 100644
index 0000000..b3e4e68
--- /dev/null
+++ b/druid-spring-boot2-actuator/druid-spring-boot2-actuator-starter/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: druid,druid-spring-boot2-actuator,druid-spring-boot2-actuator-autoconfigure,slf4j-api
\ No newline at end of file
diff --git a/druid-spring-boot-actuator/pom.xml b/druid-spring-boot2-actuator/pom.xml
similarity index 61%
rename from druid-spring-boot-actuator/pom.xml
rename to druid-spring-boot2-actuator/pom.xml
index 7ec9dbe..21d2f6d 100644
--- a/druid-spring-boot-actuator/pom.xml
+++ b/druid-spring-boot2-actuator/pom.xml
@@ -6,16 +6,16 @@
com.github.drtrang
- druid-spring-boot-parent
- 1.1.8-SNAPSHOT
+ druid-spring-boot2-parent
+ 1.1.8
- druid-spring-boot-actuator
+ druid-spring-boot2-actuator
pom
- druid-spring-boot-actuator-autoconfigure
- druid-spring-boot-actuator-starter
+ druid-spring-boot2-actuator-autoconfigure
+ druid-spring-boot2-actuator-starter
\ No newline at end of file
diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/pom.xml b/druid-spring-boot2-example/druid-spring-boot2-jpa-example/pom.xml
similarity index 89%
rename from druid-spring-boot-example/druid-spring-boot-jpa-example/pom.xml
rename to druid-spring-boot2-example/druid-spring-boot2-jpa-example/pom.xml
index 432d156..526a1bc 100644
--- a/druid-spring-boot-example/druid-spring-boot-jpa-example/pom.xml
+++ b/druid-spring-boot2-example/druid-spring-boot2-jpa-example/pom.xml
@@ -6,11 +6,11 @@
com.github.drtrang
- druid-spring-boot-example
- 1.1.8-SNAPSHOT
+ druid-spring-boot2-example
+ 1.1.8
- druid-spring-boot-jpa-example
+ druid-spring-boot2-jpa-example
@@ -29,7 +29,7 @@
com.github.drtrang
- druid-spring-boot-starter
+ druid-spring-boot2-starter
com.h2database
diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/DruidJpaApplication.java b/druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/main/java/com/github/trang/druid/example/jpa/DruidJpaApplication.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/DruidJpaApplication.java
rename to druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/main/java/com/github/trang/druid/example/jpa/DruidJpaApplication.java
diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/DynamicDataSource.java b/druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/DynamicDataSource.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/DynamicDataSource.java
rename to druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/DynamicDataSource.java
diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/SpringDataSourceConfig.java b/druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/SpringDataSourceConfig.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/SpringDataSourceConfig.java
rename to druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/main/java/com/github/trang/druid/example/jpa/config/SpringDataSourceConfig.java
diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/controller/CityController.java b/druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/main/java/com/github/trang/druid/example/jpa/controller/CityController.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/controller/CityController.java
rename to druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/main/java/com/github/trang/druid/example/jpa/controller/CityController.java
diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/model/City.java b/druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/main/java/com/github/trang/druid/example/jpa/model/City.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/model/City.java
rename to druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/main/java/com/github/trang/druid/example/jpa/model/City.java
diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/repository/CityRepository.java b/druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/main/java/com/github/trang/druid/example/jpa/repository/CityRepository.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/java/com/github/trang/druid/example/jpa/repository/CityRepository.java
rename to druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/main/java/com/github/trang/druid/example/jpa/repository/CityRepository.java
diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/resources/application.yml b/druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/main/resources/application.yml
similarity index 98%
rename from druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/resources/application.yml
rename to druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/main/resources/application.yml
index f3dfcaf..25b9946 100644
--- a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/resources/application.yml
+++ b/druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/main/resources/application.yml
@@ -10,7 +10,7 @@ logging:
spring:
application:
- name: druid-spring-boot-jpa-example
+ name: druid-spring-boot2-jpa-example
profiles:
# 默认环境为 default,多数据源演示请改为 dynamic
# active: dynamic
diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/resources/import.sql b/druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/main/resources/import.sql
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-jpa-example/src/main/resources/import.sql
rename to druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/main/resources/import.sql
diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/BaseTest.java b/druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/BaseTest.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/BaseTest.java
rename to druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/BaseTest.java
diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/DynamicDataSourceTests.java b/druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/DynamicDataSourceTests.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/DynamicDataSourceTests.java
rename to druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/DynamicDataSourceTests.java
diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/JpaTests.java b/druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/JpaTests.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/JpaTests.java
rename to druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/JpaTests.java
diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/SingleDataSourceTests.java b/druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/SingleDataSourceTests.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/SingleDataSourceTests.java
rename to druid-spring-boot2-example/druid-spring-boot2-jpa-example/src/test/java/com/github/trang/druid/example/jpa/test/coveralls/SingleDataSourceTests.java
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/README.md b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/README.md
similarity index 69%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/README.md
rename to druid-spring-boot2-example/druid-spring-boot2-mybatis-example/README.md
index 952edbc..3b4148d 100644
--- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/README.md
+++ b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/README.md
@@ -2,4 +2,4 @@
Druid Spring Boot Example 项目演示了 Druid Spring Boot Starter 的使用方式。将项目导入 IDE 后,直接运行 `com.github.trang.druid.DruidSpringBootStarterApplication#main()` 即可,无需依赖其它环境。
-项目默认使用单数据源,将 [application.yml](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/application.yml) 的 `spring.profiles.active` 配置改为 `dynamic` 即可切换为多数据源演示。
\ No newline at end of file
+项目默认使用单数据源,将 [application.yml](https://github.com/drtrang/druid-spring-boot/blob/master/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/resources/application.yml) 的 `spring.profiles.active` 配置改为 `dynamic` 即可切换为多数据源演示。
\ No newline at end of file
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/pom.xml b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/pom.xml
similarity index 90%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/pom.xml
rename to druid-spring-boot2-example/druid-spring-boot2-mybatis-example/pom.xml
index 9c33ce1..09d8cc4 100644
--- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/pom.xml
+++ b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/pom.xml
@@ -6,11 +6,11 @@
com.github.drtrang
- druid-spring-boot-example
- 1.1.8-SNAPSHOT
+ druid-spring-boot2-example
+ 1.1.8
- druid-spring-boot-mybatis-example
+ druid-spring-boot2-mybatis-example
@@ -33,7 +33,7 @@
com.github.drtrang
- druid-spring-boot-starter
+ druid-spring-boot2-starter
com.h2database
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/DruidMybatisApplication.java b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/DruidMybatisApplication.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/DruidMybatisApplication.java
rename to druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/DruidMybatisApplication.java
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/DynamicDataSource.java b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/DynamicDataSource.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/DynamicDataSource.java
rename to druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/DynamicDataSource.java
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/SpringDataSourceConfig.java b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/SpringDataSourceConfig.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/SpringDataSourceConfig.java
rename to druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/config/SpringDataSourceConfig.java
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/controller/CityController.java b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/controller/CityController.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/controller/CityController.java
rename to druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/controller/CityController.java
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/mapper/CityMapper.java b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/mapper/CityMapper.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/mapper/CityMapper.java
rename to druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/mapper/CityMapper.java
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/model/City.java b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/model/City.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/model/City.java
rename to druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/java/com/github/trang/druid/example/mybatis/model/City.java
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/application.yml b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/resources/application.yml
similarity index 99%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/application.yml
rename to druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/resources/application.yml
index 7c34437..af0702e 100644
--- a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/application.yml
+++ b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/resources/application.yml
@@ -11,7 +11,7 @@ logging:
spring:
application:
- name: druid-spring-boot-mybatis-example
+ name: druid-spring-boot2-mybatis-example
profiles:
# 默认环境为 default,多数据源演示请改为 dynamic
# active: dynamic
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/druid.yml b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/resources/druid.yml
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/druid.yml
rename to druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/resources/druid.yml
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/import.sql b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/resources/import.sql
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/main/resources/import.sql
rename to druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/main/resources/import.sql
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/BaseTest.java b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/BaseTest.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/BaseTest.java
rename to druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/BaseTest.java
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/DruidTest.java b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/DruidTest.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/DruidTest.java
rename to druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/DruidTest.java
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/DynamicDataSourceTests.java b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/DynamicDataSourceTests.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/DynamicDataSourceTests.java
rename to druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/DynamicDataSourceTests.java
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/MyBatisTests.java b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/MyBatisTests.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/MyBatisTests.java
rename to druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/MyBatisTests.java
diff --git a/druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/SingleDataSourceTests.java b/druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/SingleDataSourceTests.java
similarity index 100%
rename from druid-spring-boot-example/druid-spring-boot-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/SingleDataSourceTests.java
rename to druid-spring-boot2-example/druid-spring-boot2-mybatis-example/src/test/java/com/github/trang/druid/example/mybatis/test/coveralls/SingleDataSourceTests.java
diff --git a/druid-spring-boot-example/pom.xml b/druid-spring-boot2-example/pom.xml
similarity index 62%
rename from druid-spring-boot-example/pom.xml
rename to druid-spring-boot2-example/pom.xml
index 6e55816..1bf3b73 100644
--- a/druid-spring-boot-example/pom.xml
+++ b/druid-spring-boot2-example/pom.xml
@@ -6,16 +6,16 @@
com.github.drtrang
- druid-spring-boot-parent
- 1.1.8-SNAPSHOT
+ druid-spring-boot2-parent
+ 1.1.8
- druid-spring-boot-example
+ druid-spring-boot2-example
pom
- druid-spring-boot-mybatis-example
- druid-spring-boot-jpa-example
+ druid-spring-boot2-mybatis-example
+ druid-spring-boot2-jpa-example
\ No newline at end of file
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/pom.xml b/druid-spring-boot2/druid-spring-boot2-autoconfigure/pom.xml
similarity index 91%
rename from druid-spring-boot/druid-spring-boot-autoconfigure/pom.xml
rename to druid-spring-boot2/druid-spring-boot2-autoconfigure/pom.xml
index 333b02a..9f92286 100644
--- a/druid-spring-boot/druid-spring-boot-autoconfigure/pom.xml
+++ b/druid-spring-boot2/druid-spring-boot2-autoconfigure/pom.xml
@@ -6,11 +6,11 @@
com.github.drtrang
- druid-spring-boot
- 1.1.8-SNAPSHOT
+ druid-spring-boot2
+ 1.1.8
- druid-spring-boot-autoconfigure
+ druid-spring-boot2-autoconfigure
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidAutoConfiguration.java b/druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidAutoConfiguration.java
similarity index 100%
rename from druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidAutoConfiguration.java
rename to druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidAutoConfiguration.java
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceConfiguration.java b/druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceConfiguration.java
similarity index 100%
rename from druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceConfiguration.java
rename to druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceConfiguration.java
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceCustomizer.java b/druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceCustomizer.java
similarity index 100%
rename from druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceCustomizer.java
rename to druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceCustomizer.java
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceInitializerAutoConfiguration.java b/druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceInitializerAutoConfiguration.java
similarity index 100%
rename from druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceInitializerAutoConfiguration.java
rename to druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceInitializerAutoConfiguration.java
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidServletConfiguration.java b/druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidServletConfiguration.java
similarity index 100%
rename from druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidServletConfiguration.java
rename to druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidServletConfiguration.java
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidStatConfiguration.java b/druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidStatConfiguration.java
similarity index 100%
rename from druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidStatConfiguration.java
rename to druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidStatConfiguration.java
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/AbstractDruidDataSource2.java b/druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/AbstractDruidDataSource2.java
similarity index 100%
rename from druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/AbstractDruidDataSource2.java
rename to druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/AbstractDruidDataSource2.java
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/DruidDataSource2.java b/druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/DruidDataSource2.java
similarity index 100%
rename from druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/DruidDataSource2.java
rename to druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/DruidDataSource2.java
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/init/DataSourceInitializer.java b/druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/init/DataSourceInitializer.java
similarity index 100%
rename from druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/init/DataSourceInitializer.java
rename to druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/init/DataSourceInitializer.java
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/init/DataSourceInitializerInvoker.java b/druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/init/DataSourceInitializerInvoker.java
similarity index 100%
rename from druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/init/DataSourceInitializerInvoker.java
rename to druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/datasource/init/DataSourceInitializerInvoker.java
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/properties/DruidDataSourceProperties.java b/druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/properties/DruidDataSourceProperties.java
similarity index 100%
rename from druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/properties/DruidDataSourceProperties.java
rename to druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/properties/DruidDataSourceProperties.java
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/util/CharMatcher.java b/druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/util/CharMatcher.java
similarity index 100%
rename from druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/util/CharMatcher.java
rename to druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/util/CharMatcher.java
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
similarity index 100%
rename from druid-spring-boot/druid-spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
rename to druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from druid-spring-boot/druid-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
rename to druid-spring-boot2/druid-spring-boot2-autoconfigure/src/main/resources/META-INF/spring.factories
diff --git a/druid-spring-boot/druid-spring-boot-starter/pom.xml b/druid-spring-boot2/druid-spring-boot2-starter/pom.xml
similarity index 80%
rename from druid-spring-boot/druid-spring-boot-starter/pom.xml
rename to druid-spring-boot2/druid-spring-boot2-starter/pom.xml
index 30fe5a6..b31b644 100644
--- a/druid-spring-boot/druid-spring-boot-starter/pom.xml
+++ b/druid-spring-boot2/druid-spring-boot2-starter/pom.xml
@@ -6,16 +6,16 @@
com.github.drtrang
- druid-spring-boot
- 1.1.8-SNAPSHOT
+ druid-spring-boot2
+ 1.1.8
- druid-spring-boot-starter
+ druid-spring-boot2-starter
com.github.drtrang
- druid-spring-boot-autoconfigure
+ druid-spring-boot2-autoconfigure
org.slf4j
diff --git a/druid-spring-boot2/druid-spring-boot2-starter/src/main/resources/META-INF/spring.provides b/druid-spring-boot2/druid-spring-boot2-starter/src/main/resources/META-INF/spring.provides
new file mode 100644
index 0000000..ebcb45d
--- /dev/null
+++ b/druid-spring-boot2/druid-spring-boot2-starter/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: druid,druid-spring-boot2-autoconfigure,spring-boot2-autoconfigure,spring-jdbc,slf4j-api
\ No newline at end of file
diff --git a/druid-spring-boot/pom.xml b/druid-spring-boot2/pom.xml
similarity index 63%
rename from druid-spring-boot/pom.xml
rename to druid-spring-boot2/pom.xml
index eee2f36..9dfd294 100644
--- a/druid-spring-boot/pom.xml
+++ b/druid-spring-boot2/pom.xml
@@ -6,16 +6,16 @@
com.github.drtrang
- druid-spring-boot-parent
- 1.1.8-SNAPSHOT
+ druid-spring-boot2-parent
+ 1.1.8
- druid-spring-boot
+ druid-spring-boot2
pom
- druid-spring-boot-autoconfigure
- druid-spring-boot-starter
+ druid-spring-boot2-autoconfigure
+ druid-spring-boot2-starter
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3f7bbd1..3e8982f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
com.github.drtrang
- parent
- 1.1.1-SNAPSHOT
+ parent2
+ 1.1.1
com.github.drtrang
- druid-spring-boot-parent
- 1.1.8-SNAPSHOT
+ druid-spring-boot2-parent
+ 1.1.8
pom
Druid Spring Boot Starter
@@ -50,9 +50,9 @@
- druid-spring-boot
- druid-spring-boot-actuator
- druid-spring-boot-example
+ druid-spring-boot2
+ druid-spring-boot2-actuator
+ druid-spring-boot2-example
@@ -63,22 +63,22 @@
com.github.drtrang
- druid-spring-boot-autoconfigure
+ druid-spring-boot2-autoconfigure
${project.version}
com.github.drtrang
- druid-spring-boot-starter
+ druid-spring-boot2-starter
${project.version}
com.github.drtrang
- druid-spring-boot-actuator-autoconfigure
+ druid-spring-boot2-actuator-autoconfigure
${project.version}
com.github.drtrang
- druid-spring-boot-actuator-starter
+ druid-spring-boot2-actuator-starter
${project.version}