Merge branch '1.3.x'

spring-boot-dependencies/pom.xml

@@ -68,16 +68,16 @@
 		<derby.version>10.12.1.1</derby.version>
 		<dom4j.version>1.6.1</dom4j.version>
 		<dropwizard-metrics.version>3.1.2</dropwizard-metrics.version>
-		<ehcache.version>2.10.2</ehcache.version>
+		<ehcache.version>2.10.2.2.21</ehcache.version>
 		<ehcache3.version>3.1.0</ehcache3.version>
 		<embedded-mongo.version>1.50.5</embedded-mongo.version>
 		<flyway.version>3.2.1</flyway.version>
-		<freemarker.version>2.3.23</freemarker.version>
+		<freemarker.version>2.3.24-incubating</freemarker.version>
 		<elasticsearch.version>2.3.3</elasticsearch.version>
 		<gemfire.version>8.2.0</gemfire.version>
 		<glassfish-el.version>3.0.0</glassfish-el.version>
 		<gradle.version>1.12</gradle.version>
-		<groovy.version>2.4.6</groovy.version>
+		<groovy.version>2.4.7</groovy.version>
 		<gson.version>2.6.2</gson.version>
 		<h2.version>1.4.192</h2.version>
 		<hamcrest.version>1.3</hamcrest.version>
@@ -89,7 +89,7 @@
 		<hornetq.version>2.4.7.Final</hornetq.version>
 		<hsqldb.version>2.3.4</hsqldb.version>
 		<htmlunit.version>2.21</htmlunit.version>
-		<httpasyncclient.version>4.1.1</httpasyncclient.version>
+		<httpasyncclient.version>4.1.2</httpasyncclient.version>
 		<httpclient.version>4.5.2</httpclient.version>
 		<httpcore.version>4.4.5</httpcore.version>
 		<infinispan.version>8.2.2.Final</infinispan.version>
@@ -2464,7 +2464,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.10.1</version>
+					<version>2.10.4</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -2514,7 +2514,7 @@
 				<plugin>
 					<groupId>pl.project13.maven</groupId>
 					<artifactId>git-commit-id-plugin</artifactId>
-					<version>2.1.11</version>
+					<version>2.1.15</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>