Merge branch '1.5.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java

@@ -163,9 +163,7 @@ public class JacksonAutoConfiguration {
 
 		private final ApplicationContext applicationContext;
 
-		JacksonObjectMapperBuilderConfiguration(ApplicationContext applicationContext,
-				JacksonProperties jacksonProperties,
-				List<Jackson2ObjectMapperBuilderCustomizer> customizers) {
+		JacksonObjectMapperBuilderConfiguration(ApplicationContext applicationContext) {
 			this.applicationContext = applicationContext;
 		}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java

@@ -104,7 +104,8 @@ public class DataSourceProperties
 	private boolean initialize = true;
 
 	/**
-	 * Platform to use in the schema resource (schema-${platform}.sql).
+	 * Platform to use in the DDL or DML scripts (e.g. schema-${platform}.sql or
+	 * data-${platform}.sql).
 	 */
 	private String platform = "all";
 

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -657,7 +657,7 @@ content into your application; rather pick only the properties that you need.
 	spring.datasource.jndi-name= # JNDI location of the datasource. Class, url, username & password are ignored when set.
 	spring.datasource.name=testdb # Name of the datasource.
 	spring.datasource.password= # Login password of the database.
-	spring.datasource.platform=all # Platform to use in the schema resource (schema-${platform}.sql).
+	spring.datasource.platform=all # Platform to use in the DDL or DML scripts (e.g. schema-${platform}.sql or data-${platform}.sql).
 	spring.datasource.schema= # Schema (DDL) script resource references.
 	spring.datasource.schema-username= # User of the database to execute DDL scripts (if different).
 	spring.datasource.schema-password= # Password of the database to execute DDL scripts (if different).

spring-boot-starters/README.adoc

@@ -49,6 +49,9 @@ do as they were designed before this was clarified.
 | Charon reverse proxy
 | https://github.com/mkopylec/charon-spring-boot-starter
 
+| https://citrusframework.org/[Citrus] simulator
+| https://github.com/christophd/citrus-simulator
+
 | https://cloudant.com/[Cloudant]
 | https://github.com/icha024/cloudant-spring-boot-starter