Merge branch 'master' of git.yoho.cn:OPENTECH/parent

@@ -5,22 +5,22 @@
     <groupId>com.yoho</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.7-SNAPSHOT</version>
+    <version>1.2.8-SNAPSHOT</version>
     <name>parent</name>
     <url>http://maven.apache.org</url>
     <properties>
         <java.version>1.8</java.version>
         <java.encoding>UTF-8</java.encoding>
         <!-- spring版本号 -->
-        <spring.version>4.2.2.RELEASE</spring.version>
+        <spring.version>4.3.8.RELEASE</spring.version>
         <!-- mybatis版本号 -->
         <mybatis.version>3.2.6</mybatis.version>
         <!-- log4j日志文件管理包版本 -->
         <slf4j.version>1.7.7</slf4j.version>
         <logback.version>1.1.7</logback.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <yoho.model.version>1.2.7-SNAPSHOT</yoho.model.version>
-        <yoho.core.version>1.2.7-SNAPSHOT</yoho.core.version>
+        <yoho.model.version>1.2.8-SNAPSHOT</yoho.model.version>
+        <yoho.core.version>1.2.8-SNAPSHOT</yoho.core.version>
 
     </properties>
     <dependencyManagement>
@@ -99,6 +99,18 @@
                 <version>${yoho.core.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.yoho.core</groupId>
+                <artifactId>yoho-core-redis-cluster</artifactId>
+                <version>${yoho.core.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.yoho.core</groupId>
+                <artifactId>yoho-core-cache-clean-cluster</artifactId>
+                <version>${yoho.core.version}</version>
+            </dependency>
+
             <!--  //////////////// start yoho model //////////////// -->
             <dependency>
                 <groupId>com.yoho.service.model</groupId>
@@ -220,7 +232,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.11</version>
+                <version>4.12</version>
                 <scope>test</scope>
             </dependency>
             <!-- swagger -->
@@ -650,13 +662,13 @@
             <dependency>
                 <groupId>org.springframework.data</groupId>
                 <artifactId>spring-data-redis</artifactId>
-                <version>1.6.1.RELEASE</version>
+                <version>1.8.3.RELEASE</version>
             </dependency>
 
             <dependency>
                 <groupId>redis.clients</groupId>
                 <artifactId>jedis</artifactId>
-                <version>2.7.3</version>
+                <version>2.9.0</version>
             </dependency>