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

Merge branch '1.3.x' 

Conflicts:
	spring-boot-dependencies/pom.xml
This commit is contained in:
Dave Syer 2016-02-20 16:40:21 +00:00
parent f2c34612f6 14a5feacea
commit e021a30745
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,7 +142,7 @@
<spring-retry.version>1.1.2.RELEASE</spring-retry.version>
<spring-security.version>4.0.3.RELEASE</spring-security.version>
<spring-security-jwt.version>1.0.3.RELEASE</spring-security-jwt.version>
<spring-security-oauth.version>2.0.8.RELEASE</spring-security-oauth.version>
<spring-security-oauth.version>2.0.9.RELEASE</spring-security-oauth.version>
<spring-session.version>1.1.0.RC1</spring-session.version>
<spring-social.version>1.1.4.RELEASE</spring-social.version>
<spring-social-facebook.version>2.0.3.RELEASE</spring-social-facebook.version>
@ -2283,4 +2283,4 @@
<id>integration-test</id>
</profile>
</profiles>
</project>
</project>