diff --git a/.travis.yml b/.travis.yml index 60b5c9e..6f170de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,9 @@ install: false cache: directories: - $HOME/.m2/repository +addons: + apt: + update: true after_success: - cd druid-spring-boot-example/druid-spring-boot-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 5d62498..0d9a461 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,10 @@ # Changelog +## 1.1.10 +### Enhancements +1. 升级 parent 版本到 1.2.2 +2. 升级 druid 到 1.1.10 + ## 1.1.9 ### Enhancements 1. 升级 druid 到 1.1.9 diff --git a/README.md b/README.md index 819cb30..40e165f 100644 --- a/README.md +++ b/README.md @@ -15,24 +15,24 @@ Druid Spring Boot Starter 将帮助你在 Spring Boot 中使用 Druid。 com.github.drtrang druid-spring-boot-starter - 1.1.9.1 + 1.1.10 com.github.drtrang druid-spring-boot-actuator-starter - 1.1.9.1 + 1.1.10 com.github.drtrang druid-spring-boot2-starter - 1.1.9 + 1.1.10 com.github.drtrang druid-spring-boot2-actuator-starter - 1.1.9 + 1.1.10 ``` 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 ca73ece..a9e26c1 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 @@ -6,7 +6,7 @@ com.github.drtrang druid-spring-boot-actuator - 1.1.10-SNAPSHOT + 1.1.10 druid-spring-boot-actuator-autoconfigure diff --git a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories index f135d76..8a11740 100644 --- a/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/druid-spring-boot-actuator/druid-spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.github.trang.druid.actuate.autoconfigure.DruidDataSourceActuatorAutoConfiguration \ No newline at end of file + com.github.trang.druid.actuate.autoconfigure.DruidDataSourceActuatorAutoConfiguration \ No newline at end of file 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 69b8bc0..a0055f7 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 @@ -6,7 +6,7 @@ com.github.drtrang druid-spring-boot-actuator - 1.1.10-SNAPSHOT + 1.1.10 druid-spring-boot-actuator-starter diff --git a/druid-spring-boot-actuator/pom.xml b/druid-spring-boot-actuator/pom.xml index e183998..5f9b43d 100644 --- a/druid-spring-boot-actuator/pom.xml +++ b/druid-spring-boot-actuator/pom.xml @@ -6,7 +6,7 @@ com.github.drtrang druid-spring-boot-parent - 1.1.10-SNAPSHOT + 1.1.10 druid-spring-boot-actuator diff --git a/druid-spring-boot-example/druid-spring-boot-jpa-example/pom.xml b/druid-spring-boot-example/druid-spring-boot-jpa-example/pom.xml index 2866788..711d29b 100644 --- a/druid-spring-boot-example/druid-spring-boot-jpa-example/pom.xml +++ b/druid-spring-boot-example/druid-spring-boot-jpa-example/pom.xml @@ -6,7 +6,7 @@ com.github.drtrang druid-spring-boot-example - 1.1.10-SNAPSHOT + 1.1.10 druid-spring-boot-jpa-example 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 bfb6542..a273aa6 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 @@ -6,7 +6,7 @@ com.github.drtrang druid-spring-boot-example - 1.1.10-SNAPSHOT + 1.1.10 druid-spring-boot-mybatis-example diff --git a/druid-spring-boot-example/pom.xml b/druid-spring-boot-example/pom.xml index f951379..b3d1baf 100644 --- a/druid-spring-boot-example/pom.xml +++ b/druid-spring-boot-example/pom.xml @@ -6,7 +6,7 @@ com.github.drtrang druid-spring-boot-parent - 1.1.10-SNAPSHOT + 1.1.10 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 f935489..ce5945f 100644 --- a/druid-spring-boot/druid-spring-boot-autoconfigure/pom.xml +++ b/druid-spring-boot/druid-spring-boot-autoconfigure/pom.xml @@ -6,7 +6,7 @@ com.github.drtrang druid-spring-boot - 1.1.10-SNAPSHOT + 1.1.10 druid-spring-boot-autoconfigure diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceInitializerAutoConfiguration.java b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceInitializerAutoConfiguration.java index 2c2c5fc..1e81baa 100644 --- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceInitializerAutoConfiguration.java +++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceInitializerAutoConfiguration.java @@ -10,6 +10,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; import com.github.trang.druid.autoconfigure.datasource.init.DruidDataSourceInitializer; @@ -30,6 +31,7 @@ import com.github.trang.druid.autoconfigure.datasource.init.DruidDataSourceIniti public class DruidDataSourceInitializerAutoConfiguration { @Bean + @Primary @ConditionalOnMissingBean(value = DruidDataSourceInitializer.class, name = "dataSourceInitializer") public DruidDataSourceInitializer dataSourceInitializer(DataSourceProperties properties, ApplicationContext applicationContext) { diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidServletConfiguration.java b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidServletConfiguration.java index 8e4df93..9be47d3 100644 --- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidServletConfiguration.java +++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidServletConfiguration.java @@ -37,7 +37,7 @@ public class DruidServletConfiguration { * 2. 提供监控信息的 JSON API */ @Bean - public ServletRegistrationBean servletRegistrationBean(DruidDataSourceProperties druidProperties) { + public ServletRegistrationBean druidStatViewServlet(DruidDataSourceProperties druidProperties) { log.debug("druid stat-view-servlet init..."); DruidStatViewServletProperties properties = druidProperties.getStatViewServlet(); ServletRegistrationBean registration = new ServletRegistrationBean(new StatViewServlet()); diff --git a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidStatConfiguration.java b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidStatConfiguration.java index 02ac1ca..33d1d5c 100644 --- a/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidStatConfiguration.java +++ b/druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidStatConfiguration.java @@ -58,7 +58,7 @@ public class DruidStatConfiguration { } @Bean - public DefaultAdvisorAutoProxyCreator druidStatProxyCreator() { + public DefaultAdvisorAutoProxyCreator druidStatProxy() { log.debug("druid aop-stat init..."); DefaultAdvisorAutoProxyCreator druidStatProxyCreator = new DefaultAdvisorAutoProxyCreator(); druidStatProxyCreator.setProxyTargetClass(proxyTargetClass); @@ -77,7 +77,7 @@ public class DruidStatConfiguration { public static class DruidWebStatConfiguration { @Bean - public FilterRegistrationBean filterRegistrationBean(DruidDataSourceProperties druidProperties) { + public FilterRegistrationBean druidWebStatFilter(DruidDataSourceProperties druidProperties) { log.debug("druid web-stat-filter init..."); DruidWebStatProperties properties = druidProperties.getWebStat(); FilterRegistrationBean registration = new FilterRegistrationBean(new WebStatFilter()); diff --git a/druid-spring-boot/druid-spring-boot-starter/pom.xml b/druid-spring-boot/druid-spring-boot-starter/pom.xml index ce7114e..9b989bd 100644 --- a/druid-spring-boot/druid-spring-boot-starter/pom.xml +++ b/druid-spring-boot/druid-spring-boot-starter/pom.xml @@ -6,7 +6,7 @@ com.github.drtrang druid-spring-boot - 1.1.10-SNAPSHOT + 1.1.10 druid-spring-boot-starter diff --git a/druid-spring-boot/pom.xml b/druid-spring-boot/pom.xml index ff4ea21..1a2586c 100644 --- a/druid-spring-boot/pom.xml +++ b/druid-spring-boot/pom.xml @@ -6,7 +6,7 @@ com.github.drtrang druid-spring-boot-parent - 1.1.10-SNAPSHOT + 1.1.10 druid-spring-boot diff --git a/pom.xml b/pom.xml index d523c92..8d537bd 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.github.drtrang druid-spring-boot-parent - 1.1.10-SNAPSHOT + 1.1.10 pom druid-spring-boot-parent