Merge branch '1.5.x'

spring-boot-dependencies/pom.xml

@@ -78,7 +78,7 @@
 		<elasticsearch.version>2.4.4</elasticsearch.version>
 		<glassfish-el.version>3.0.0</glassfish-el.version>
 		<gradle.version>2.9</gradle.version>
-		<groovy.version>2.4.8</groovy.version>
+		<groovy.version>2.4.7</groovy.version>
 		<gson.version>2.8.0</gson.version>
 		<h2.version>1.4.193</h2.version>
 		<hamcrest.version>1.3</hamcrest.version>