Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson 2015-12-11 11:26:45 +00:00
commit ffbdfc586b

View File

@ -131,7 +131,7 @@
<spring.version>4.2.4.BUILD-SNAPSHOT</spring.version>
<spring-amqp.version>1.5.2.RELEASE</spring-amqp.version>
<spring-cloud-connectors.version>1.2.1.RELEASE</spring-cloud-connectors.version>
<spring-batch.version>3.0.5.RELEASE</spring-batch.version>
<spring-batch.version>3.0.6.RELEASE</spring-batch.version>
<spring-data-releasetrain.version>Gosling-SR1</spring-data-releasetrain.version>
<spring-hateoas.version>0.19.0.RELEASE</spring-hateoas.version>
<spring-integration.version>4.2.3.RELEASE</spring-integration.version>