Merge branch '1.4.x' into 1.5.x

pull/7387/head
Andy Wilkinson 8 years ago
commit bb6330e9df

@ -147,12 +147,12 @@
<solr.version>5.5.3</solr.version>
<spock.version>1.0-groovy-2.4</spock.version>
<spring.version>4.3.4.BUILD-SNAPSHOT</spring.version>
<spring-amqp.version>1.6.4.BUILD-SNAPSHOT</spring-amqp.version>
<spring-amqp.version>1.6.4.RELEASE</spring-amqp.version>
<spring-cloud-connectors.version>1.2.3.RELEASE</spring-cloud-connectors.version>
<spring-batch.version>3.0.7.RELEASE</spring-batch.version>
<spring-data-releasetrain.version>Ingalls-M1</spring-data-releasetrain.version>
<spring-hateoas.version>0.21.0.RELEASE</spring-hateoas.version>
<spring-integration.version>4.3.5.BUILD-SNAPSHOT</spring-integration.version>
<spring-integration.version>4.3.5.RELEASE</spring-integration.version>
<spring-integration-java-dsl.version>1.2.0.RELEASE</spring-integration-java-dsl.version>
<spring-loaded.version>1.2.6.RELEASE</spring-loaded.version>
<spring-mobile.version>1.1.5.RELEASE</spring-mobile.version>
@ -161,7 +161,7 @@
<spring-retry.version>1.2.0.RC1</spring-retry.version>
<spring-security.version>4.2.0.RC1</spring-security.version>
<spring-security-jwt.version>1.0.5.RELEASE</spring-security-jwt.version>
<spring-security-oauth.version>2.0.11.RELEASE</spring-security-oauth.version>
<spring-security-oauth.version>2.0.12.RELEASE</spring-security-oauth.version>
<spring-session.version>1.3.0.M2</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>

Loading…
Cancel
Save