Move Liquibase testcontainers support into spring-boot-liquibase

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

@@ -3,6 +3,7 @@ plugins {
 	id "org.springframework.boot.auto-configuration"
 	id "org.springframework.boot.configuration-properties"
 	id "org.springframework.boot.deployed"
+	id "org.springframework.boot.docker-test"
 	id "org.springframework.boot.optional-dependencies"
 }
 
@@ -17,6 +18,14 @@ dependencies {
 	
 	optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
+	optional(project(":spring-boot-project:spring-boot-testcontainers"))
+	optional("org.testcontainers:jdbc")
+
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
+	dockerTestImplementation("org.testcontainers:junit-jupiter")
+	dockerTestImplementation("org.testcontainers:postgresql")
+	dockerTestRuntimeOnly("org.postgresql:postgresql")
 
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))

spring-boot-project/spring-boot-liquibase/src/dockerTest/java/org/springframework/boot/liquibase/testcontainers/LiquibaseContainerConnectionDetailsFactoryTests.java

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

spring-boot-project/spring-boot-liquibase/src/dockerTest/resources/logback-test.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
+</configuration>

spring-boot-project/spring-boot-liquibase/src/dockerTest/resources/spring.properties

@@ -0,0 +1 @@
+spring.test.context.cache.maxSize=1

spring-boot-project/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/testcontainers/LiquibaseContainerConnectionDetailsFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.testcontainers.service.connection.liquibase;
+package org.springframework.boot.liquibase.testcontainers;
 
 import org.testcontainers.containers.JdbcDatabaseContainer;
 

spring-boot-project/spring-boot-liquibase/src/main/java/org/springframework/boot/liquibase/testcontainers/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Support for testcontainers Liquibase service connections.
  */
-package org.springframework.boot.testcontainers.service.connection.liquibase;
+package org.springframework.boot.liquibase.testcontainers;

spring-boot-project/spring-boot-liquibase/src/main/resources/META-INF/spring.factories

@@ -1,3 +1,7 @@
+# Connection Details Factories
+org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
+org.springframework.boot.liquibase.testcontainers.LiquibaseContainerConnectionDetailsFactory
+
 # Failure Analyzers
 org.springframework.boot.diagnostics.FailureAnalyzer=\
 org.springframework.boot.liquibase.LiquibaseChangelogMissingFailureAnalyzer

spring-boot-project/spring-boot-testcontainers-all/build.gradle

@@ -13,7 +13,6 @@ dependencies {
 
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-jdbc"))
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-kafka"))
-	dockerTestImplementation(project(":spring-boot-project:spring-boot-liquibase"))
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-pulsar"))
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-r2dbc"))
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
@@ -27,9 +26,6 @@ dependencies {
 	dockerTestImplementation("org.awaitility:awaitility")
 	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
 	dockerTestImplementation("org.junit.platform:junit-platform-launcher")
-	dockerTestImplementation("org.liquibase:liquibase-core") {
-		exclude(group: "javax.xml.bind", module: "jaxb-api")
-	}
 	dockerTestImplementation("org.mockito:mockito-core")
 	dockerTestImplementation("org.springframework:spring-core-test")
 	dockerTestImplementation("org.springframework:spring-jdbc")
@@ -50,7 +46,6 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-jdbc"))
 	optional(project(":spring-boot-project:spring-boot-kafka"))
 	optional(project(":spring-boot-project:spring-boot-ldap"))
-	optional(project(":spring-boot-project:spring-boot-liquibase"))
 	optional(project(":spring-boot-project:spring-boot-mongodb"))
 	optional(project(":spring-boot-project:spring-boot-neo4j"))
 	optional(project(":spring-boot-project:spring-boot-pulsar"))

spring-boot-project/spring-boot-testcontainers-all/src/main/resources/META-INF/spring.factories

@@ -6,7 +6,6 @@ org.springframework.boot.testcontainers.service.connection.kafka.ConfluentKafkaC
 org.springframework.boot.testcontainers.service.connection.kafka.DeprecatedConfluentKafkaContainerConnectionDetailsFactory,\
 org.springframework.boot.testcontainers.service.connection.ldap.LLdapContainerConnectionDetailsFactory,\
 org.springframework.boot.testcontainers.service.connection.ldap.OpenLdapContainerConnectionDetailsFactory,\
-org.springframework.boot.testcontainers.service.connection.liquibase.LiquibaseContainerConnectionDetailsFactory,\
 org.springframework.boot.testcontainers.service.connection.mongo.MongoContainerConnectionDetailsFactory,\
 org.springframework.boot.testcontainers.service.connection.neo4j.Neo4jContainerConnectionDetailsFactory,\
 org.springframework.boot.testcontainers.service.connection.otlp.GrafanaOpenTelemetryLoggingContainerConnectionDetailsFactory,\