Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Liquibase 4.16.0

Browse Source 
Closes gh-32354
This commit is contained in:
Stephane Nicoll
2022-09-14 15:34:26 +02:00
parent 4c7d6799f8
commit bcb5f048d2
4 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,7 @@ public class LiquibaseAutoConfiguration {
liquibase.setDatabaseChangeLogLockTable(this.properties.getDatabaseChangeLogLockTable());
liquibase.setDropFirst(this.properties.isDropFirst());
liquibase.setShouldRun(this.properties.isEnabled());
liquibase.setLabels(this.properties.getLabels());
liquibase.setLabelFilter(this.properties.getLabelFilter());
liquibase.setChangeLogParameters(this.properties.getParameters());
liquibase.setRollbackFile(this.properties.getRollbackFile());
liquibase.setTestRollbackOnUpdate(this.properties.isTestRollbackOnUpdate());

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

@@ -22,6 +22,7 @@ import java.util.Map;
import liquibase.integration.spring.SpringLiquibase;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
import org.springframework.util.Assert;
/**
@@ -111,7 +112,7 @@ public class LiquibaseProperties {
/**
* Comma-separated list of runtime labels to use.
*/
private String labels;
private String labelFilter;
/**
* Change log parameters.
@@ -248,12 +249,23 @@ public class LiquibaseProperties {
this.url = url;
}
public String getLabels() {
return this.labels;
public String getLabelFilter() {
return this.labelFilter;
}
public void setLabelFilter(String labelFilter) {
this.labelFilter = labelFilter;
}
@Deprecated
@DeprecatedConfigurationProperty(replacement = "spring.liquibase.label-filter")
public String getLabels() {
return getLabelFilter();
}
@Deprecated
public void setLabels(String labels) {
this.labels = labels;
setLabelFilter(labels);
}
public Map<String, String> getParameters() {

14
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java
View File

@@ -296,10 +296,18 @@ class LiquibaseAutoConfigurationTests {
}
@Test
void overrideLabels() {
void overrideLabelFilter() {
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
.withPropertyValues("spring.liquibase.labels:test, production")
.run(assertLiquibase((liquibase) -> assertThat(liquibase.getLabels()).isEqualTo("test, production")));
.withPropertyValues("spring.liquibase.label-filter:test, production").run(assertLiquibase(
(liquibase) -> assertThat(liquibase.getLabelFilter()).isEqualTo("test, production")));
}
@Test
@Deprecated
void overrideLabelFilterWithDeprecatedLabelsProperty() {
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
.withPropertyValues("spring.liquibase.labels:test, production").run(assertLiquibase(
(liquibase) -> assertThat(liquibase.getLabelFilter()).isEqualTo("test, production")));
}
@Test

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@@ -845,7 +845,7 @@ bom {
]
}
}
library("Liquibase", "4.13.0") {
library("Liquibase", "4.16.0") {
group("org.liquibase") {
modules = [
"liquibase-cdi",