Skip to content

Commit 65cc3ab

Browse files
committed
Add support for new SpringLiquibase properties from 3.6.2
Issue: #13550
1 parent 04bca3f commit 65cc3ab

File tree

4 files changed

+63
-1
lines changed

4 files changed

+63
-1
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,12 @@ public SpringLiquibase liquibase() {
126126
liquibase.setChangeLog(this.properties.getChangeLog());
127127
liquibase.setContexts(this.properties.getContexts());
128128
liquibase.setDefaultSchema(this.properties.getDefaultSchema());
129+
liquibase.setLiquibaseSchema(this.properties.getLiquibaseSchema());
130+
liquibase.setLiquibaseTablespace(this.properties.getLiquibaseTablespace());
131+
liquibase.setDatabaseChangeLogTable(
132+
this.properties.getDatabaseChangeLogTable());
133+
liquibase.setDatabaseChangeLogLockTable(
134+
this.properties.getDatabaseChangeLogLockTable());
129135
liquibase.setDropFirst(this.properties.isDropFirst());
130136
liquibase.setShouldRun(this.properties.isEnabled());
131137
liquibase.setLabels(this.properties.getLabels());

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,26 @@ public class LiquibaseProperties {
5353
*/
5454
private String defaultSchema;
5555

56+
/**
57+
* Liquibase database schema.
58+
*/
59+
private String liquibaseSchema;
60+
61+
/**
62+
* Liquibase tablespace.
63+
*/
64+
private String liquibaseTablespace;
65+
66+
/**
67+
* Database changelog table.
68+
*/
69+
private String databaseChangeLogTable;
70+
71+
/**
72+
* Database changelog lock table.
73+
*/
74+
private String databaseChangeLogLockTable;
75+
5676
/**
5777
* Whether to first drop the database schema.
5878
*/
@@ -132,6 +152,38 @@ public void setDefaultSchema(String defaultSchema) {
132152
this.defaultSchema = defaultSchema;
133153
}
134154

155+
public String getLiquibaseSchema() {
156+
return this.liquibaseSchema;
157+
}
158+
159+
public void setLiquibaseSchema(String liquibaseSchema) {
160+
this.liquibaseSchema = liquibaseSchema;
161+
}
162+
163+
public String getLiquibaseTablespace() {
164+
return this.liquibaseTablespace;
165+
}
166+
167+
public void setLiquibaseTablespace(String liquibaseTablespace) {
168+
this.liquibaseTablespace = liquibaseTablespace;
169+
}
170+
171+
public String getDatabaseChangeLogTable() {
172+
return this.databaseChangeLogTable;
173+
}
174+
175+
public void setDatabaseChangeLogTable(String databaseChangeLogTable) {
176+
this.databaseChangeLogTable = databaseChangeLogTable;
177+
}
178+
179+
public String getDatabaseChangeLogLockTable() {
180+
return this.databaseChangeLogLockTable;
181+
}
182+
183+
public void setDatabaseChangeLogLockTable(String databaseChangeLogLockTable) {
184+
this.databaseChangeLogLockTable = databaseChangeLogLockTable;
185+
}
186+
135187
public boolean isDropFirst() {
136188
return this.dropFirst;
137189
}

spring-boot-project/spring-boot-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<kafka.version>1.1.0</kafka.version>
119119
<kotlin.version>1.2.51</kotlin.version>
120120
<lettuce.version>5.1.0.M1</lettuce.version>
121-
<liquibase.version>3.6.1</liquibase.version>
121+
<liquibase.version>3.6.2</liquibase.version>
122122
<log4j2.version>2.11.0</log4j2.version>
123123
<logback.version>1.2.3</logback.version>
124124
<lombok.version>1.18.0</lombok.version>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,10 @@ content into your application. Rather, pick only the properties that you need.
566566
spring.liquibase.check-change-log-location=true # Whether to check that the change log location exists.
567567
spring.liquibase.contexts= # Comma-separated list of runtime contexts to use.
568568
spring.liquibase.default-schema= # Default database schema.
569+
spring.liquibase.liquibase-schema # Liquibase database schema.
570+
spring.liquibase.liquibase-tablespace # Liquibase tablespace.
571+
spring.liquibase.database-change-log-table # Database changelog table.
572+
spring.liquibase.database-change-log-lock-table # Database changelog lock table.
569573
spring.liquibase.drop-first=false # Whether to first drop the database schema.
570574
spring.liquibase.enabled=true # Whether to enable Liquibase support.
571575
spring.liquibase.labels= # Comma-separated list of runtime labels to use.

0 commit comments

Comments
 (0)