Merge branch '1.5.x'

Author: snicoll

spring-boot-dependencies/pom.xml

@@ -165,7 +165,7 @@
 		<spring-mobile.version>2.0.0.M1</spring-mobile.version>
 		<spring-plugin.version>1.2.0.RELEASE</spring-plugin.version>
 		<spring-restdocs.version>1.2.1.RELEASE</spring-restdocs.version>
-		<spring-retry.version>1.2.0.RELEASE</spring-retry.version>
+		<spring-retry.version>1.2.1.RELEASE</spring-retry.version>
 		<spring-security.version>5.0.0.M2</spring-security.version>
 		<spring-security-jwt.version>1.0.8.RELEASE</spring-security-jwt.version>
 		<spring-security-oauth.version>2.1.1.RELEASE</spring-security-oauth.version>