Move Amqp testcontainers support into spring-boot-amqp

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

@@ -1,5 +1,6 @@
 plugins {
 	id "java-library"
+	id "org.springframework.boot.docker-test"
 	id "org.springframework.boot.auto-configuration"
 	id "org.springframework.boot.configuration-properties"
 	id "org.springframework.boot.deployed"
@@ -19,10 +20,17 @@ 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("io.micrometer:micrometer-core")
 	optional("org.springframework.amqp:spring-rabbit-stream")
+	optional("org.testcontainers:rabbitmq")
+
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
+	dockerTestImplementation("ch.qos.logback:logback-classic")
+	dockerTestImplementation("org.testcontainers:junit-jupiter")
 
 	testCompileOnly("com.fasterxml.jackson.core:jackson-annotations")
+
 	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-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactoryIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.testcontainers.service.connection.amqp;
+package org.springframework.boot.amqp.testcontainers;
 
 import java.time.Duration;
 import java.util.ArrayList;

spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.testcontainers.service.connection.amqp;
+package org.springframework.boot.amqp.testcontainers;
 
 import java.net.URI;
 import java.util.List;

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

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

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

@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
+org.springframework.boot.amqp.testcontainers.RabbitContainerConnectionDetailsFactory

spring-boot-project/spring-boot-amqp/src/test/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-testcontainers-all/build.gradle

@@ -41,7 +41,6 @@ dependencies {
 	dockerTestImplementation("org.mockito:mockito-core")
 	dockerTestImplementation("org.springframework:spring-core-test")
 	dockerTestImplementation("org.springframework:spring-jdbc")
-	dockerTestImplementation("org.springframework.amqp:spring-rabbit")
 	dockerTestImplementation("org.springframework.data:spring-data-redis")
 	dockerTestImplementation("org.springframework.kafka:spring-kafka")
 	dockerTestImplementation("org.springframework.ldap:spring-ldap-core")
@@ -54,7 +53,6 @@ dependencies {
 	dockerTestRuntimeOnly("org.flywaydb:flyway-database-postgresql")
 	dockerTestRuntimeOnly("org.postgresql:postgresql")
 
-	optional(project(":spring-boot-project:spring-boot-amqp"))
 	optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure-all"))
 	optional(project(":spring-boot-project:spring-boot-cassandra"))
 	optional(project(":spring-boot-project:spring-boot-couchbase"))
@@ -91,7 +89,6 @@ dependencies {
 	optional("org.testcontainers:oracle-free")
 	optional("org.testcontainers:postgresql")
 	optional("org.testcontainers:pulsar")
-	optional("org.testcontainers:rabbitmq")
 	optional("org.testcontainers:redpanda")
 	optional("org.testcontainers:r2dbc")
 	optional("com.redis:testcontainers-redis")
@@ -100,7 +97,6 @@ dependencies {
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
 	testImplementation(testFixtures(project(":spring-boot-project:spring-boot-testcontainers")))
 	testImplementation("org.springframework:spring-jdbc")
-	testImplementation("org.springframework.amqp:spring-rabbit")
 	testImplementation("org.springframework.data:spring-data-redis")
 	testImplementation("org.springframework.kafka:spring-kafka")
 	testImplementation("org.testcontainers:junit-jupiter")

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

@@ -1,6 +1,5 @@
 # Connection Details Factories
 org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
-org.springframework.boot.testcontainers.service.connection.amqp.RabbitContainerConnectionDetailsFactory,\
 org.springframework.boot.testcontainers.service.connection.cassandra.CassandraContainerConnectionDetailsFactory,\
 org.springframework.boot.testcontainers.service.connection.cassandra.DeprecatedCassandraContainerConnectionDetailsFactory,\
 org.springframework.boot.testcontainers.service.connection.couchbase.CouchbaseContainerConnectionDetailsFactory,\

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/build.gradle

@@ -7,7 +7,7 @@ description = "Spring Boot AMQP smoke test"
 
 dependencies {
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-	dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers-all"))
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
 	dockerTestImplementation("org.awaitility:awaitility")
 	dockerTestImplementation("org.testcontainers:junit-jupiter")