From 407e237f109dc5a34a724c7cf3f39300baaa4578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Thu, 5 Dec 2019 19:11:54 -0600 Subject: [PATCH 1/2] Add support for configuring Liquibase tag property See gh-19316 --- .../liquibase/LiquibaseAutoConfiguration.java | 1 + .../liquibase/LiquibaseProperties.java | 14 ++++++++++++++ .../liquibase/LiquibaseAutoConfigurationTests.java | 7 +++++++ 3 files changed, 22 insertions(+) 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 2d165d52fe..f030a46915 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 @@ -112,6 +112,7 @@ public class LiquibaseAutoConfiguration { liquibase.setChangeLogParameters(this.properties.getParameters()); liquibase.setRollbackFile(this.properties.getRollbackFile()); liquibase.setTestRollbackOnUpdate(this.properties.isTestRollbackOnUpdate()); + liquibase.setTag(this.properties.getTag()); return liquibase; } 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 7cce05c042..b3bbbd80da 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 @@ -28,6 +28,7 @@ import org.springframework.util.Assert; * Configuration properties to configure {@link SpringLiquibase}. * * @author Marcel Overdijk + * @author Eddú Meléndez * @since 1.1.0 */ @ConfigurationProperties(prefix = "spring.liquibase", ignoreUnknownFields = false) @@ -114,6 +115,11 @@ public class LiquibaseProperties { */ private boolean testRollbackOnUpdate; + /** + * Name of the tag. + */ + private String tag; + public String getChangeLog() { return this.changeLog; } @@ -243,4 +249,12 @@ public class LiquibaseProperties { this.testRollbackOnUpdate = testRollbackOnUpdate; } + public String getTag() { + return this.tag; + } + + public void setTag(String tag) { + this.tag = tag; + } + } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java index 04398c3a9e..93b255d870 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java @@ -343,6 +343,13 @@ class LiquibaseAutoConfigurationTests { }); } + @Test + void overrideTag() { + this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class) + .withPropertyValues("spring.liquibase.tag:1.0.0") + .run(assertLiquibase((liquibase) -> assertThat(liquibase.getTag()).isEqualTo("1.0.0"))); + } + private ContextConsumer assertLiquibase(Consumer consumer) { return (context) -> { assertThat(context).hasSingleBean(SpringLiquibase.class); From 4bcf4245d1d6e7b655b516125d3c89821069bf0c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 17 Feb 2020 09:53:59 +0100 Subject: [PATCH 2/2] Polish "Add support for configuring Liquibase tag property" See gh-19316 --- .../autoconfigure/liquibase/LiquibaseAutoConfiguration.java | 2 +- .../boot/autoconfigure/liquibase/LiquibaseProperties.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 f030a46915..a393ce3309 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 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. 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 b3bbbd80da..02545a08e6 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 @@ -116,7 +116,9 @@ public class LiquibaseProperties { private boolean testRollbackOnUpdate; /** - * Name of the tag. + * Tag name to use when applying database changes. Can also be used with + * "rollbackFile" to generate a rollback script for all existing changes associated + * with that tag. */ private String tag;