Commit 741d1f72 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.1.x'

Conflicts:
	spring-boot-dependencies/pom.xml
parents b1e7cd0b 812acec4
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<spring.version>4.1.1.RELEASE</spring.version> <spring.version>4.1.1.RELEASE</spring.version>
<spring-amqp.version>1.4.0.RC1</spring-amqp.version> <spring-amqp.version>1.4.0.RC1</spring-amqp.version>
<spring-cloud.version>1.1.0.RELEASE</spring-cloud.version> <spring-cloud.version>1.1.0.RELEASE</spring-cloud.version>
<spring-batch.version>3.0.1.RELEASE</spring-batch.version> <spring-batch.version>3.0.2.RELEASE</spring-batch.version>
<spring-data-releasetrain.version>Evans-RELEASE</spring-data-releasetrain.version> <spring-data-releasetrain.version>Evans-RELEASE</spring-data-releasetrain.version>
<spring-hateoas.version>0.16.0.RELEASE</spring-hateoas.version> <spring-hateoas.version>0.16.0.RELEASE</spring-hateoas.version>
<spring-integration.version>4.1.0.RC1</spring-integration.version> <spring-integration.version>4.1.0.RC1</spring-integration.version>
......
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