Skip to content

Commit 3bd5d90

Browse files
committed
Merge branch '1.5.x'
2 parents ae97946 + 0a8b355 commit 3bd5d90

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,7 @@ static class JacksonObjectMapperBuilderConfiguration {
163163

164164
private final ApplicationContext applicationContext;
165165

166-
JacksonObjectMapperBuilderConfiguration(ApplicationContext applicationContext,
167-
JacksonProperties jacksonProperties,
168-
List<Jackson2ObjectMapperBuilderCustomizer> customizers) {
166+
JacksonObjectMapperBuilderConfiguration(ApplicationContext applicationContext) {
169167
this.applicationContext = applicationContext;
170168
}
171169

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ public class DataSourceProperties
104104
private boolean initialize = true;
105105

106106
/**
107-
* Platform to use in the schema resource (schema-${platform}.sql).
107+
* Platform to use in the DDL or DML scripts (e.g. schema-${platform}.sql or
108+
* data-${platform}.sql).
108109
*/
109110
private String platform = "all";
110111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ content into your application; rather pick only the properties that you need.
657657
spring.datasource.jndi-name= # JNDI location of the datasource. Class, url, username & password are ignored when set.
658658
spring.datasource.name=testdb # Name of the datasource.
659659
spring.datasource.password= # Login password of the database.
660-
spring.datasource.platform=all # Platform to use in the schema resource (schema-${platform}.sql).
660+
spring.datasource.platform=all # Platform to use in the DDL or DML scripts (e.g. schema-${platform}.sql or data-${platform}.sql).
661661
spring.datasource.schema= # Schema (DDL) script resource references.
662662
spring.datasource.schema-username= # User of the database to execute DDL scripts (if different).
663663
spring.datasource.schema-password= # Password of the database to execute DDL scripts (if different).

spring-boot-starters/README.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ do as they were designed before this was clarified.
4949
| Charon reverse proxy
5050
| https://github.com/mkopylec/charon-spring-boot-starter
5151

52+
| https://citrusframework.org/[Citrus] simulator
53+
| https://github.com/christophd/citrus-simulator
54+
5255
| https://cloudant.com/[Cloudant]
5356
| https://github.com/icha024/cloudant-spring-boot-starter
5457

0 commit comments

Comments
 (0)