Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson 2014-08-27 13:34:28 +01:00
commit d16ae2afd4

View File

@ -106,7 +106,7 @@
<spring-amqp.version>1.3.5.RELEASE</spring-amqp.version>
<spring-cloud.version>1.1.0.BUILD-SNAPSHOT</spring-cloud.version>
<spring-batch.version>3.0.1.RELEASE</spring-batch.version>
<spring-data-releasetrain.version>Dijkstra-SR3</spring-data-releasetrain.version>
<spring-data-releasetrain.version>Dijkstra-SR4</spring-data-releasetrain.version>
<spring-hateoas.version>0.16.0.RELEASE</spring-hateoas.version>
<spring-integration.version>4.0.3.RELEASE</spring-integration.version>
<spring-loaded.version>1.2.0.RELEASE</spring-loaded.version>