Skip to content

A
apollo
Commit ebbea25a by 张乐 Committed by GitHub
Options

Merge pull request #578 from nobodyiam/ff-152

update framework foundation to 1.5.2
parents 5a6e6fb4 20b84639
Showing with 3 additions and 3 deletions
pom.xml
...@@ -78,10 +78,10 @@ ...@@ -78,10 +78,10 @@
</developers> </developers>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<spring-boot.version>1.3.8.RELEASE</spring-boot.version> <spring-boot.version>1.3.8.RELEASE</spring-boot.version>
<spring-cloud.version>1.2.3.RELEASE</spring-cloud.version> <spring-cloud.version>1.2.3.RELEASE</spring-cloud.version>
<!-- for travis usage -->
<github.global.server>github</github.global.server> <github.global.server>github</github.global.server>
<github.global.oauth2Token>${env.GITHUB_OAUTH_TOKEN}</github.global.oauth2Token> <github.global.oauth2Token>${env.GITHUB_OAUTH_TOKEN}</github.global.oauth2Token>
</properties> </properties>
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<dependency> <dependency>
<groupId>com.ctrip.framework</groupId> <groupId>com.ctrip.framework</groupId>
<artifactId>framework-foundation</artifactId> <artifactId>framework-foundation</artifactId>
<version>1.5.0</version> <version>1.5.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.dianping.cat</groupId> <groupId>com.dianping.cat</groupId>
...@@ -513,7 +513,7 @@ ...@@ -513,7 +513,7 @@
</repositories> </repositories>
</profile> </profile>
<profile> <profile>
<!-- for ctrip development --> <!-- for ctrip development -->
<id>ctrip-dev</id> <id>ctrip-dev</id>
<properties> <properties>
<package.environment>dev</package.environment> <package.environment>dev</package.environment>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment