Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson 2015-09-02 16:29:49 +01:00
commit 108c5657d3

View File

@ -75,7 +75,7 @@
<h2.version>1.4.188</h2.version>
<hamcrest.version>1.3</hamcrest.version>
<hazelcast.version>3.5.1</hazelcast.version>
<hibernate.version>4.3.10.Final</hibernate.version>
<hibernate.version>4.3.11.Final</hibernate.version>
<hibernate-validator.version>5.2.1.Final</hibernate-validator.version>
<hikaricp.version>2.3.9</hikaricp.version>
<hornetq.version>2.4.7.Final</hornetq.version>
@ -141,8 +141,8 @@
<spring-security-oauth.version>2.0.7.RELEASE</spring-security-oauth.version>
<spring-session.version>1.0.2.RELEASE</spring-session.version>
<spring-social.version>1.1.2.RELEASE</spring-social.version>
<spring-social-facebook.version>2.0.1.RELEASE</spring-social-facebook.version>
<spring-social-linkedin.version>1.0.1.RELEASE</spring-social-linkedin.version>
<spring-social-facebook.version>2.0.2.RELEASE</spring-social-facebook.version>
<spring-social-linkedin.version>1.0.2.RELEASE</spring-social-linkedin.version>
<spring-social-twitter.version>1.1.0.RELEASE</spring-social-twitter.version>
<spring-ws.version>2.2.2.RELEASE</spring-ws.version>
<statsd-client.version>3.1.0</statsd-client.version>