root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '1.1.x' into 1.2.x 

Conflicts:
	spring-boot-dependencies/pom.xml
This commit is contained in:
Andy Wilkinson 2015-03-26 16:32:05 +00:00
parent 644237d170 936e1c2152
commit d428afb45f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-dependencies/pom.xml
View File

@ -120,7 +120,7 @@
<spring-loaded.version>1.2.1.RELEASE</spring-loaded.version>
<spring-mobile.version>1.1.3.RELEASE</spring-mobile.version>
<spring-plugin.version>1.1.0.RELEASE</spring-plugin.version>
<spring-security.version>3.2.6.RELEASE</spring-security.version>
<spring-security.version>3.2.7.RELEASE</spring-security.version>
<spring-security-jwt.version>1.0.3.RELEASE</spring-security-jwt.version>
<spring-social.version>1.1.0.RELEASE</spring-social.version>
<spring-social-facebook.version>1.1.1.RELEASE</spring-social-facebook.version>