spring-boot 1.5.6

leelance · Sep 11, 2017 · fe99c17 · fe99c17
1 parent 7eee364
commit fe99c17
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/spring-boot-cache-redis/pom.xml b/spring-boot-cache-redis/pom.xml
@@ -18,7 +18,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-redis</artifactId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>redis.clients</groupId>

diff --git a/spring-boot-freemarker/src/main/java/com/lance/freemaker/config/DruidConfig.java b/spring-boot-freemarker/src/main/java/com/lance/freemaker/config/DruidConfig.java
@@ -4,8 +4,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.boot.context.embedded.FilterRegistrationBean;
-import org.springframework.boot.context.embedded.ServletRegistrationBean;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
@@ -5,7 +5,8 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.4.1.RELEASE</version>
+		<version>1.5.6.RELEASE</version>
+		<relativePath/>
 	</parent>
 	<groupId>com.lance</groupId>
 	<artifactId>spring-boot-parent</artifactId>
@@ -115,7 +116,7 @@
     	<module>../spring-boot-shiro</module>
     	<module>../spring-boot-shiro-redis</module>
     	<module>../spring-boot-cache-ehcache</module>
-    	<module>../spring-boot-cache-redis</module>
+        <module>../spring-boot-cache-redis</module>
     	<module>../spring-boot-activemq-producer</module>
     	<module>../spring-boot-activemq-consumer</module>
     	<module>../spring-boot-email</module>

diff --git a/spring-boot-shiro-redis/src/main/java/com/lance/shiro/config/DruidConfig.java b/spring-boot-shiro-redis/src/main/java/com/lance/shiro/config/DruidConfig.java
@@ -4,8 +4,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.boot.context.embedded.FilterRegistrationBean;
-import org.springframework.boot.context.embedded.ServletRegistrationBean;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;