Skip to content

S
spring-boot
Commit e021a307 authored by Dave Syer's avatar Dave Syer
Browse files
Options

Merge branch '1.3.x' 

Conflicts:
	spring-boot-dependencies/pom.xml
parents f2c34612 14a5feac
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
spring-boot-dependencies/pom.xml
View file @ e021a307
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
<spring-retry.version>1.1.2.RELEASE</spring-retry.version> <spring-retry.version>1.1.2.RELEASE</spring-retry.version>
<spring-security.version>4.0.3.RELEASE</spring-security.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-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-session.version>1.1.0.RC1</spring-session.version>
<spring-social.version>1.1.4.RELEASE</spring-social.version> <spring-social.version>1.1.4.RELEASE</spring-social.version>
<spring-social-facebook.version>2.0.3.RELEASE</spring-social-facebook.version> <spring-social-facebook.version>2.0.3.RELEASE</spring-social-facebook.version>
...@@ -2283,4 +2283,4 @@ ...@@ -2283,4 +2283,4 @@
<id>integration-test</id> <id>integration-test</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>
\ No newline at end of file
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