Skip to content

Commit

Permalink
Merge pull request apolloconfig#578 from nobodyiam/ff-152
Browse files Browse the repository at this point in the history
update framework foundation to 1.5.2
  • Loading branch information
lepdou authored Mar 31, 2017
2 parents 5a6e6fb + 20b8463 commit ebbea25
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -513,7 +513,7 @@
</repositories>
</profile>
<profile>
<!-- for ctrip development -->
<!-- for ctrip development -->
<id>ctrip-dev</id>
<properties>
<package.environment>dev</package.environment>
Expand Down

0 comments on commit ebbea25

Please sign in to comment.