Merge pull request #578 from nobodyiam/ff-152

pom.xml

@@ -78,10 +78,10 @@
 	</developers>
 
 	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<spring-boot.version>1.3.8.RELEASE</spring-boot.version>
 		<spring-cloud.version>1.2.3.RELEASE</spring-cloud.version>
+		<!-- for travis usage -->
 		<github.global.server>github</github.global.server>
 		<github.global.oauth2Token>${env.GITHUB_OAUTH_TOKEN}</github.global.oauth2Token>
 	</properties>
@@ -139,7 +139,7 @@
 			<dependency>
 				<groupId>com.ctrip.framework</groupId>
 				<artifactId>framework-foundation</artifactId>
-				<version>1.5.0</version>
+				<version>1.5.2</version>
 			</dependency>
 			<dependency>
 				<groupId>com.dianping.cat</groupId>
@@ -513,7 +513,7 @@
 			</repositories>
 		</profile>
 		<profile>
-            <!-- for ctrip development -->
+      <!-- for ctrip development -->
 			<id>ctrip-dev</id>
 			<properties>
 				<package.environment>dev</package.environment>