Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2017-09-25 10:08:21 +02:00
parent ae979465b6 0a8b355c60
commit 3bd5d909c2
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}

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

@@ -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";