Merge branch '1.5.x'

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -61,7 +61,7 @@
 		<freemarker.version>2.3.27-incubating</freemarker.version>
 		<elasticsearch.version>5.6.8</elasticsearch.version>
 		<glassfish-el.version>3.0.0</glassfish-el.version>
-		<groovy.version>2.4.14</groovy.version>
+		<groovy.version>2.4.15</groovy.version>
 		<gson.version>2.8.2</gson.version>
 		<h2.version>1.4.197</h2.version>
 		<hamcrest.version>1.3</hamcrest.version>