diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java index f847e7cb0fb..32a8915e300 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java @@ -126,6 +126,12 @@ public class LiquibaseAutoConfiguration { liquibase.setChangeLog(this.properties.getChangeLog()); liquibase.setContexts(this.properties.getContexts()); liquibase.setDefaultSchema(this.properties.getDefaultSchema()); + liquibase.setLiquibaseSchema(this.properties.getLiquibaseSchema()); + liquibase.setLiquibaseTablespace(this.properties.getLiquibaseTablespace()); + liquibase.setDatabaseChangeLogTable( + this.properties.getDatabaseChangeLogTable()); + liquibase.setDatabaseChangeLogLockTable( + this.properties.getDatabaseChangeLogLockTable()); liquibase.setDropFirst(this.properties.isDropFirst()); liquibase.setShouldRun(this.properties.isEnabled()); liquibase.setLabels(this.properties.getLabels()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java index 62f906c1651..ef3f2d195b5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java @@ -53,6 +53,26 @@ public class LiquibaseProperties { */ private String defaultSchema; + /** + * Schema to use for Liquibase objects. + */ + private String liquibaseSchema; + + /** + * Tablespace to use for Liquibase objects. + */ + private String liquibaseTablespace; + + /** + * Name of table to use for tracking change history. + */ + private String databaseChangeLogTable; + + /** + * Name of table to use for tracking concurrent Liquibase usage. + */ + private String databaseChangeLogLockTable; + /** * Whether to first drop the database schema. */ @@ -132,6 +152,38 @@ public class LiquibaseProperties { this.defaultSchema = defaultSchema; } + public String getLiquibaseSchema() { + return this.liquibaseSchema; + } + + public void setLiquibaseSchema(String liquibaseSchema) { + this.liquibaseSchema = liquibaseSchema; + } + + public String getLiquibaseTablespace() { + return this.liquibaseTablespace; + } + + public void setLiquibaseTablespace(String liquibaseTablespace) { + this.liquibaseTablespace = liquibaseTablespace; + } + + public String getDatabaseChangeLogTable() { + return this.databaseChangeLogTable; + } + + public void setDatabaseChangeLogTable(String databaseChangeLogTable) { + this.databaseChangeLogTable = databaseChangeLogTable; + } + + public String getDatabaseChangeLogLockTable() { + return this.databaseChangeLogLockTable; + } + + public void setDatabaseChangeLogLockTable(String databaseChangeLogLockTable) { + this.databaseChangeLogLockTable = databaseChangeLogLockTable; + } + public boolean isDropFirst() { return this.dropFirst; } diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 402c87a802d..f227e4658ea 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -118,7 +118,7 @@ 1.1.0 1.2.51 5.1.0.M1 - 3.6.1 + 3.6.2 2.11.0 1.2.3 1.18.0 diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 432ac27ab7d..fe2a1b305bd 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -566,6 +566,10 @@ content into your application. Rather, pick only the properties that you need. spring.liquibase.check-change-log-location=true # Whether to check that the change log location exists. spring.liquibase.contexts= # Comma-separated list of runtime contexts to use. spring.liquibase.default-schema= # Default database schema. + spring.liquibase.liquibase-schema= # Schema to use for Liquibase objects. + spring.liquibase.liquibase-tablespace= # Tablespace to use for Liquibase objects. + spring.liquibase.database-change-log-table= # Name of table to use for tracking change history. + spring.liquibase.database-change-log-lock-table= # Name of table to use for tracking concurrent Liquibase usage. spring.liquibase.drop-first=false # Whether to first drop the database schema. spring.liquibase.enabled=true # Whether to enable Liquibase support. spring.liquibase.labels= # Comma-separated list of runtime labels to use.