Move Flyway Docker Compose support into spring-boot-flyway

Author: philwebb

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

@@ -1,7 +1,6 @@
 # Connection Details Factories
 org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
 org.springframework.boot.docker.compose.service.connection.clickhouse.ClickHouseR2dbcDockerComposeConnectionDetailsFactory,\
-org.springframework.boot.docker.compose.service.connection.flyway.JdbcAdaptingFlywayConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.hazelcast.HazelcastDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.ldap.LLdapDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.ldap.OpenLdapDockerComposeConnectionDetailsFactory,\

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

@@ -15,6 +15,7 @@ dependencies {
 	api("org.flywaydb:flyway-core")
 	optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
+	optional(project(":spring-boot-project:spring-boot-docker-compose"))
 	optional(project(":spring-boot-project:spring-boot-testcontainers"))
 	optional("org.flywaydb:flyway-database-oracle")
 	optional("org.flywaydb:flyway-database-postgresql")
@@ -25,6 +26,7 @@ dependencies {
 dependencies {
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
+	dockerTestImplementation(testFixtures(project(":spring-boot-project:spring-boot-docker-compose")))
 	dockerTestImplementation("org.testcontainers:junit-jupiter")
 	dockerTestImplementation("org.testcontainers:postgresql")
 	dockerTestRuntimeOnly("org.postgresql:postgresql")

…ctionDetailsFactoryIntegrationTests.java …ctionDetailsFactoryIntegrationTests.javaspring-boot-project/spring-boot-docker-compose-all/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/flyway/JdbcAdaptingFlywayConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-flyway/src/dockerTest/java/org/springframework/boot/flyway/docker/compose/JdbcAdaptingFlywayConnectionDetailsFactoryIntegrationTests.java spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/flyway/JdbcAdaptingFlywayConnectionDetailsFactoryIntegrationTests.java renamed to spring-boot-project/spring-boot-flyway/src/dockerTest/java/org/springframework/boot/flyway/docker/compose/JdbcAdaptingFlywayConnectionDetailsFactoryIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docker.compose.service.connection.flyway;
+package org.springframework.boot.flyway.docker.compose;
 
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
 import org.springframework.boot.flyway.autoconfigure.FlywayConnectionDetails;

…ce/connection/flyway/flyway-compose.yaml …lyway/docker/compose/flyway-compose.yamlspring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/flyway/flyway-compose.yaml renamed to spring-boot-project/spring-boot-flyway/src/dockerTest/resources/org/springframework/boot/flyway/docker/compose/flyway-compose.yaml spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/flyway/flyway-compose.yaml renamed to spring-boot-project/spring-boot-flyway/src/dockerTest/resources/org/springframework/boot/flyway/docker/compose/flyway-compose.yaml

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docker.compose.service.connection.flyway;
+package org.springframework.boot.flyway.docker.compose;
 
 import org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory;
 import org.springframework.boot.flyway.autoconfigure.FlywayConnectionDetails;

…ptingFlywayConnectionDetailsFactory.java …ptingFlywayConnectionDetailsFactory.javaspring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/flyway/JdbcAdaptingFlywayConnectionDetailsFactory.java renamed to spring-boot-project/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/docker/compose/JdbcAdaptingFlywayConnectionDetailsFactory.java spring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/flyway/JdbcAdaptingFlywayConnectionDetailsFactory.java renamed to spring-boot-project/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/docker/compose/JdbcAdaptingFlywayConnectionDetailsFactory.java

@@ -15,6 +15,6 @@
  */
 
 /**
- * Auto-configuration for Docker Compose Flyway service connections.
+ * Support for Docker Compose Flyway service connections.
  */
-package org.springframework.boot.docker.compose.service.connection.flyway;
+package org.springframework.boot.flyway.docker.compose;

…vice/connection/flyway/package-info.java …/flyway/docker/compose/package-info.javaspring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/flyway/package-info.java renamed to spring-boot-project/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/docker/compose/package-info.java spring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/flyway/package-info.java renamed to spring-boot-project/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/docker/compose/package-info.java

@@ -1,5 +1,6 @@
 # Connection Details Factories
 org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
+org.springframework.boot.flyway.docker.compose.JdbcAdaptingFlywayConnectionDetailsFactory,\
 org.springframework.boot.flyway.testcontainers.FlywayContainerConnectionDetailsFactory
 
 # Database Initializer Detectors