From 65d706d54d9fd0aea5254d2b2f76efa433b1cb75 Mon Sep 17 00:00:00 2001
From: lihengming <89921218@qq.com>
Date: Mon, 19 Mar 2018 16:25:58 +0800
Subject: [PATCH 1/3] fix > for #2409

---
 druid-spring-boot-starter/pom.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/druid-spring-boot-starter/pom.xml b/druid-spring-boot-starter/pom.xml
index 50b45d61fe..e43159da6b 100644
--- a/druid-spring-boot-starter/pom.xml
+++ b/druid-spring-boot-starter/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba</groupId>
     <artifactId>druid-spring-boot-starter</artifactId>
-    <version>1.1.9-SNAPSHOT</version>
+    <version>1.1.10-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>druid-spring-boot-starter</name>
     <description>Spring Boot with Druid support,help you simplify Druid config in Spring Boot.</description>
@@ -12,7 +12,7 @@
 
     <properties>
         <druid.version>1.1.8</druid.version>
-        <spring-boot.version>2.0.0.RELEASE</spring-boot.version>
+        <spring-boot.version>1.5.10.RELEASE</spring-boot.version>
     </properties>
 
     <developers>
@@ -114,10 +114,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                 </configuration>
             </plugin>
             <plugin>

From bd32b349bf06f96e444b572b826e900dadb89925 Mon Sep 17 00:00:00 2001
From: lihengming <89921218@qq.com>
Date: Mon, 16 Apr 2018 09:37:43 +0800
Subject: [PATCH 2/3] update > compatibility jdk1.7 & spring boot 1.x

---
 druid-spring-boot-starter/pom.xml                               | 2 +-
 .../alibaba/druid/spring/boot/demo/service/UserServiceImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/druid-spring-boot-starter/pom.xml b/druid-spring-boot-starter/pom.xml
index e43159da6b..2025a66d58 100644
--- a/druid-spring-boot-starter/pom.xml
+++ b/druid-spring-boot-starter/pom.xml
@@ -12,7 +12,7 @@
 
     <properties>
         <druid.version>1.1.8</druid.version>
-        <spring-boot.version>1.5.10.RELEASE</spring-boot.version>
+        <spring-boot.version>1.5.12.RELEASE</spring-boot.version>
     </properties>
 
     <developers>
diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/service/UserServiceImpl.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/service/UserServiceImpl.java
index 07d24d4774..3d0b5843a5 100644
--- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/service/UserServiceImpl.java
+++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/service/UserServiceImpl.java
@@ -13,7 +13,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public User findById(Long id) {
-        return userDao.findById(id).get();
+        return userDao.findOne(id);
     }
 
 }

From 17e692eee95ffd7fba41b59d6f40f3d94ed1aed0 Mon Sep 17 00:00:00 2001
From: lihengming <89921218@qq.com>
Date: Mon, 16 Apr 2018 09:42:24 +0800
Subject: [PATCH 3/3] update > compatibility jdk1.7 & spring boot 1.x

---
 druid-spring-boot-starter/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/druid-spring-boot-starter/pom.xml b/druid-spring-boot-starter/pom.xml
index 2025a66d58..e47427e730 100644
--- a/druid-spring-boot-starter/pom.xml
+++ b/druid-spring-boot-starter/pom.xml
@@ -11,7 +11,7 @@
     <url>https://github.com/alibaba/druid</url>
 
     <properties>
-        <druid.version>1.1.8</druid.version>
+        <druid.version>1.1.9</druid.version>
         <spring-boot.version>1.5.12.RELEASE</spring-boot.version>
     </properties>