Move Liquibase endpoint auto-configuration into spring-boot-liquibase

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle

@@ -44,7 +44,6 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-jetty"))
 	optional(project(":spring-boot-project:spring-boot-jsonb"))
 	optional(project(":spring-boot-project:spring-boot-kafka"))
-	optional(project(":spring-boot-project:spring-boot-liquibase"))
 	optional(project(":spring-boot-project:spring-boot-mail"))
 	optional(project(":spring-boot-project:spring-boot-mongodb"))
 	optional(project(":spring-boot-project:spring-boot-quartz"))
@@ -135,9 +134,6 @@ dependencies {
 	optional("org.hibernate.validator:hibernate-validator")
 	optional("org.influxdb:influxdb-java")
 	optional("org.junit.platform:junit-platform-launcher")
-	optional("org.liquibase:liquibase-core") {
-		exclude group: "javax.xml.bind", module: "jaxb-api"
-	}
 	optional("org.mongodb:mongodb-driver-reactivestreams")
 	optional("org.mongodb:mongodb-driver-sync")
 	optional("org.neo4j.driver:neo4j-java-driver")

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -16,7 +16,6 @@ org.springframework.boot.actuate.autoconfigure.endpoint.jackson.JacksonEndpointA
 org.springframework.boot.actuate.autoconfigure.endpoint.jmx.JmxEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.env.EnvironmentEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.integration.IntegrationGraphEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.liquibase.LiquibaseEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.logging.LogFileWebEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.logging.LoggersEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.logging.OpenTelemetryLoggingAutoConfiguration

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebEndpointsAutoConfigurationIntegrationTests.java

@@ -34,7 +34,6 @@
 import org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration;
 import org.springframework.boot.data.redis.autoconfigure.RedisRepositoriesAutoConfiguration;
 import org.springframework.boot.data.rest.autoconfigure.RepositoryRestMvcAutoConfiguration;
-import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration;
 import org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration;
 import org.springframework.boot.mongodb.autoconfigure.MongoReactiveAutoConfiguration;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
@@ -75,12 +74,11 @@ private ReactiveWebApplicationContextRunner reactiveWebRunner() {
 			.withPropertyValues("management.tracing.enabled=false", "management.defaults.metrics.export.enabled=false");
 	}
 
-	@EnableAutoConfiguration(exclude = { LiquibaseAutoConfiguration.class, CassandraAutoConfiguration.class,
-			CassandraDataAutoConfiguration.class, Neo4jDataAutoConfiguration.class,
-			Neo4jReactiveDataAutoConfiguration.class, MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,
-			MongoReactiveAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class,
-			RepositoryRestMvcAutoConfiguration.class, RedisAutoConfiguration.class,
-			RedisRepositoriesAutoConfiguration.class, BraveAutoConfiguration.class,
+	@EnableAutoConfiguration(exclude = { CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class,
+			Neo4jDataAutoConfiguration.class, Neo4jReactiveDataAutoConfiguration.class, MongoAutoConfiguration.class,
+			MongoDataAutoConfiguration.class, MongoReactiveAutoConfiguration.class,
+			MongoReactiveDataAutoConfiguration.class, RepositoryRestMvcAutoConfiguration.class,
+			RedisAutoConfiguration.class, RedisRepositoriesAutoConfiguration.class, BraveAutoConfiguration.class,
 			OpenTelemetryTracingAutoConfiguration.class })
 	@SpringBootConfiguration
 	static class WebEndpointTestApplication {

spring-boot-project/spring-boot-liquibase/build.gradle

@@ -15,7 +15,7 @@ dependencies {
 		exclude(group: "javax.xml.bind", module: "jaxb-api")
 	}
 
-	optional(project(":spring-boot-project:spring-boot-actuator"))
+	optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-test"))

…/LiquibaseEndpointAutoConfiguration.java …/LiquibaseEndpointAutoConfiguration.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointAutoConfiguration.java renamed to spring-boot-project/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/actuate/endpoint/autoconfigure/LiquibaseEndpointAutoConfiguration.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointAutoConfiguration.java renamed to spring-boot-project/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/actuate/endpoint/autoconfigure/LiquibaseEndpointAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.liquibase;
+package org.springframework.boot.liquibase.actuate.endpoint.autoconfigure;
 
 import liquibase.integration.spring.SpringLiquibase;
 
@@ -39,7 +39,7 @@
  * @since 2.0.0
  */
 @AutoConfiguration(after = LiquibaseAutoConfiguration.class)
-@ConditionalOnClass({ SpringLiquibase.class, LiquibaseEndpoint.class })
+@ConditionalOnClass({ SpringLiquibase.class, LiquibaseEndpoint.class, ConditionalOnAvailableEndpoint.class })
 @ConditionalOnAvailableEndpoint(LiquibaseEndpoint.class)
 public class LiquibaseEndpointAutoConfiguration {
 

…utoconfigure/liquibase/package-info.java …endpoint/autoconfigure/package-info.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/liquibase/package-info.java renamed to spring-boot-project/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/actuate/endpoint/autoconfigure/package-info.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/liquibase/package-info.java renamed to spring-boot-project/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/actuate/endpoint/autoconfigure/package-info.java

@@ -15,6 +15,6 @@
  */
 
 /**
- * Auto-configuration for actuator Liquibase concerns.
+ * Auto-configuration for Liquibase actuator endpoint.
  */
-package org.springframework.boot.actuate.autoconfigure.liquibase;
+package org.springframework.boot.liquibase.actuate.endpoint.autoconfigure;

spring-boot-project/spring-boot-liquibase/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1,2 @@
-org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration
+org.springframework.boot.liquibase.actuate.endpoint.autoconfigure.LiquibaseEndpointAutoConfiguration
+org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration

…ibaseEndpointAutoConfigurationTests.java …ibaseEndpointAutoConfigurationTests.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointAutoConfigurationTests.java renamed to spring-boot-project/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/actuate/endpoint/autoconfigure/LiquibaseEndpointAutoConfigurationTests.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointAutoConfigurationTests.java renamed to spring-boot-project/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/actuate/endpoint/autoconfigure/LiquibaseEndpointAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.liquibase;
+package org.springframework.boot.liquibase.actuate.endpoint.autoconfigure;
 
 import liquibase.integration.spring.SpringLiquibase;
 import org.junit.jupiter.api.Test;