From 96399395aebed6c17c3a91773b4382bcced2fd44 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 4 Sep 2017 10:05:27 +0200 Subject: [PATCH] Polish liquibase doc Closes gh-10139 --- .../src/main/asciidoc/appendix-configuration-metadata.adoc | 4 ++-- spring-boot-docs/src/main/asciidoc/howto.adoc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc b/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc index de11768d15..295da89d14 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc @@ -559,7 +559,7 @@ The following types can be used: NOTE: If multiple values can be provided, use a `Collection` or _Array_ type to teach the IDE about it. -The meta-data snippet below corresponds to the standard `liquibase.change-log` +The meta-data snippet below corresponds to the standard `spring.liquibase.change-log` property that defines the path to the changelog to use. It is actually used internally as a `org.springframework.core.io.Resource` but cannot be exposed as such as we need to keep the original String value to pass it to the Liquibase API. @@ -568,7 +568,7 @@ original String value to pass it to the Liquibase API. ---- {"hints": [ { - "name": "liquibase.change-log", + "name": "spring.liquibase.change-log", "providers": [ { "name": "handle-as", diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc index 953c5877ab..65c3a400d9 100644 --- a/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -2022,14 +2022,14 @@ To automatically run Liquibase database migrations on startup, add the `org.liquibase:liquibase-core` to your classpath. The master change log is by default read from `db/changelog/db.changelog-master.yaml` but -can be set using `liquibase.change-log`. In addition to YAML, Liquibase also supports -JSON, XML, and SQL change log formats. +can be set using `spring.liquibase.change-log`. In addition to YAML, Liquibase also +supports JSON, XML, and SQL change log formats. By default Liquibase will autowire the (`@Primary`) `DataSource` in your context and use that for migrations. If you like to use a different `DataSource` you can create one and mark its `@Bean` as `@LiquibaseDataSource` - if you do that remember to create another one and mark it as `@Primary` if you want two data sources. Or you can use Liquibase's native -`DataSource` by setting `liquibase.[url,user,password]` in external properties. +`DataSource` by setting `spring.liquibase.[url,user,password]` in external properties. See {sc-spring-boot-autoconfigure}/liquibase/LiquibaseProperties.{sc-ext}[`LiquibaseProperties`]