From bf88073f7e7eef9cd9378fa22edb11c86c994e85 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 16 Jan 2018 12:02:03 +0100 Subject: [PATCH] Tighten Liquibase auto-configuration to require Liquibase 3 Closes gh-11641 --- .../autoconfigure/liquibase/LiquibaseAutoConfiguration.java | 5 +++-- 1 file changed, 3 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 fb3415e9bc..0368ac1030 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-2017 the original author or authors. + * Copyright 2012-2018 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. @@ -24,6 +24,7 @@ import javax.annotation.PostConstruct; import javax.persistence.EntityManagerFactory; import javax.sql.DataSource; +import liquibase.change.DatabaseChange; import liquibase.exception.LiquibaseException; import liquibase.integration.spring.SpringLiquibase; @@ -60,7 +61,7 @@ import org.springframework.util.ReflectionUtils; * @since 1.1.0 */ @Configuration -@ConditionalOnClass(SpringLiquibase.class) +@ConditionalOnClass({ SpringLiquibase.class, DatabaseChange.class }) @ConditionalOnBean(DataSource.class) @ConditionalOnProperty(prefix = "spring.liquibase", name = "enabled", matchIfMissing = true) @AutoConfigureAfter({ DataSourceAutoConfiguration.class,