From d490b9947346fd673137dee40bed23ff4c640306 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 25 Sep 2017 10:04:37 +0200 Subject: [PATCH 1/3] Clarify scope of spring.datasource.platform Closes gh-10416 --- .../boot/autoconfigure/jdbc/DataSourceProperties.java | 5 +++-- .../src/main/asciidoc/appendix-application-properties.adoc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java index 6b79062f89..73d5c8cd6c 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -102,7 +102,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"; diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index a0b55f477a..950880d1da 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -637,7 +637,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). From 93844bffbc41597c4064dc2356096c8bd4faa6ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Sun, 24 Sep 2017 18:32:41 -0500 Subject: [PATCH 2/3] Polish JacksonAutoConfiguration This commit removes unused constructor parameters introduced in 0c2ecb7. Closes gh-10412 --- .../boot/autoconfigure/jackson/JacksonAutoConfiguration.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java index f8eef994d3..189def167a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java @@ -166,9 +166,7 @@ public class JacksonAutoConfiguration { private final ApplicationContext applicationContext; - JacksonObjectMapperBuilderConfiguration(ApplicationContext applicationContext, - JacksonProperties jacksonProperties, - List customizers) { + JacksonObjectMapperBuilderConfiguration(ApplicationContext applicationContext) { this.applicationContext = applicationContext; } From ca04b24814ca7d752647924c5e26b0258c51d35c Mon Sep 17 00:00:00 2001 From: Christoph Deppisch Date: Fri, 22 Sep 2017 16:31:00 +0200 Subject: [PATCH 3/3] Add reference to Citrus simulator Spring Boot starter Closes gh-10382 --- spring-boot-starters/README.adoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spring-boot-starters/README.adoc b/spring-boot-starters/README.adoc index b3f3377903..0c600841d1 100644 --- a/spring-boot-starters/README.adoc +++ b/spring-boot-starters/README.adoc @@ -43,6 +43,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