Merge branch '1.5.x'

spring-boot-dependencies/pom.xml

@@ -145,7 +145,7 @@
 		<solr.version>5.5.3</solr.version>
 		<spock.version>1.0-groovy-2.4</spock.version>
 		<spring.version>5.0.0.BUILD-SNAPSHOT</spring.version>
-		<spring-amqp.version>1.6.3.RELEASE</spring-amqp.version>
+		<spring-amqp.version>1.6.4.BUILD-SNAPSHOT</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>
@@ -156,7 +156,7 @@
 		<spring-mobile.version>1.1.5.RELEASE</spring-mobile.version>
 		<spring-plugin.version>1.2.0.RELEASE</spring-plugin.version>
 		<spring-restdocs.version>1.2.0.BUILD-SNAPSHOT</spring-restdocs.version>
-		<spring-retry.version>1.1.4.RELEASE</spring-retry.version>
+		<spring-retry.version>1.2.0.BUILD-SNAPSHOT</spring-retry.version>
 		<spring-security.version>4.1.3.RELEASE</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>