From 09ceaf6304827e089aa30deb3f17cbea72b2673d Mon Sep 17 00:00:00 2001
From: trang <donghao.l@hotmail.com>
Date: Tue, 18 Jul 2017 15:37:37 +0800
Subject: [PATCH] 1.0.2

---
 druid-spring-boot-autoconfigure/pom.xml                     | 2 +-
 .../trang/druid/DataSourceInitializerConfiguration.java     | 2 +-
 .../java/com/github/trang/druid/DruidAutoConfiguration.java | 6 +++---
 druid-spring-boot-samples/pom.xml                           | 2 +-
 druid-spring-boot-starter/pom.xml                           | 2 +-
 pom.xml                                                     | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/druid-spring-boot-autoconfigure/pom.xml b/druid-spring-boot-autoconfigure/pom.xml
index 85624dd..8fe994c 100644
--- a/druid-spring-boot-autoconfigure/pom.xml
+++ b/druid-spring-boot-autoconfigure/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.drtrang</groupId>
         <artifactId>druid-spring-boot</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
 
     <artifactId>druid-spring-boot-autoconfigure</artifactId>
diff --git a/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/DataSourceInitializerConfiguration.java b/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/DataSourceInitializerConfiguration.java
index 7de6e69..4745610 100644
--- a/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/DataSourceInitializerConfiguration.java
+++ b/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/DataSourceInitializerConfiguration.java
@@ -22,7 +22,7 @@ public class DataSourceInitializerConfiguration {
 
     @Bean
     @ConditionalOnMissingBean(DataSourceInitializer.class)
-    public com.github.trang.druid.datasource.init.DataSourceInitializer dataSourceInitializer
+    public com.github.trang.druid.datasource.init.DataSourceInitializer customDataSourceInitializer
             (DataSourceProperties properties, ApplicationContext applicationContext) {
         return new DataSourceInitializer(properties, applicationContext);
     }
diff --git a/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/DruidAutoConfiguration.java b/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/DruidAutoConfiguration.java
index 1870b0c..d7b47b5 100644
--- a/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/DruidAutoConfiguration.java
+++ b/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/DruidAutoConfiguration.java
@@ -10,7 +10,6 @@ import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.wall.WallConfig;
 import com.alibaba.druid.wall.WallFilter;
 import com.github.trang.druid.datasource.DruidParentDataSource;
-import com.github.trang.druid.properties.DruidProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -18,6 +17,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -36,8 +36,8 @@ import static com.github.trang.druid.properties.DruidProperties.*;
 @Configuration
 @ConditionalOnClass(DruidDataSource.class)
 @AutoConfigureBefore(DataSourceAutoConfiguration.class)
-@EnableConfigurationProperties(DruidProperties.class)
-@Import({DruidStatConfiguration.class, DruidServletConfiguration.class})
+@EnableConfigurationProperties(DataSourceProperties.class)
+@Import({DruidStatConfiguration.class, DruidServletConfiguration.class, DataSourceInitializerConfiguration.class})
 public class DruidAutoConfiguration {
 
     private static final Logger log = LoggerFactory.getLogger(DruidAutoConfiguration.class);
diff --git a/druid-spring-boot-samples/pom.xml b/druid-spring-boot-samples/pom.xml
index cf851a3..00ad225 100644
--- a/druid-spring-boot-samples/pom.xml
+++ b/druid-spring-boot-samples/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.drtrang</groupId>
         <artifactId>druid-spring-boot</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
 
     <artifactId>druid-spring-boot-samples</artifactId>
diff --git a/druid-spring-boot-starter/pom.xml b/druid-spring-boot-starter/pom.xml
index 13deecc..bbe49af 100644
--- a/druid-spring-boot-starter/pom.xml
+++ b/druid-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.drtrang</groupId>
         <artifactId>druid-spring-boot</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
 
     <artifactId>druid-spring-boot-starter</artifactId>
diff --git a/pom.xml b/pom.xml
index dafa099..7694f96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.github.drtrang</groupId>
     <artifactId>druid-spring-boot</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>