Migrate Spring RabbitMQ support to spring-boot-rabbitmq

See gh-49620 Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
3 days ago · 72b8a6ca05
102 changed files with 15 additions and 15 deletions
--- a/documentation/spring-boot-docs/build.gradle
+++ b/documentation/spring-boot-docs/build.gradle
@ -94,7 +94,6 @@ dependencies {
				@@ -94,7 +94,6 @@ dependencies {
 	implementation(project(path: ":loader:spring-boot-loader-tools"))
 	implementation(project(path: ":module:spring-boot-actuator"))
 	implementation(project(path: ":module:spring-boot-actuator-autoconfigure"))
-	implementation(project(path: ":module:spring-boot-amqp"))
 	implementation(project(path: ":module:spring-boot-cache"))
 	implementation(project(path: ":module:spring-boot-cache-test"))
 	implementation(project(path: ":module:spring-boot-data-cassandra"))
@ -126,6 +125,7 @@ dependencies {
				@@ -126,6 +125,7 @@ dependencies {
 	implementation(project(path: ":module:spring-boot-micrometer-metrics"))
 	implementation(project(path: ":module:spring-boot-persistence"))
 	implementation(project(path: ":module:spring-boot-r2dbc"))
+	implementation(project(path: ":module:spring-boot-rabbitmq"))
 	implementation(project(path: ":module:spring-boot-restdocs"))
 	implementation(project(path: ":module:spring-boot-reactor-netty"))
 	implementation(project(path: ":module:spring-boot-restclient"))
--- a/module/spring-boot-autoconfigure-classic-modules/build.gradle
+++ b/module/spring-boot-autoconfigure-classic-modules/build.gradle
@ -28,9 +28,6 @@ dependencies {
				@@ -28,9 +28,6 @@ dependencies {
 	api(project(":module:spring-boot-activemq")) {
 		transitive = false
 	}
-	api(project(":module:spring-boot-amqp")) {
-		transitive = false
-	}
 	api(project(":module:spring-boot-artemis")) {
 		transitive = false
 	}
@ -208,6 +205,9 @@ dependencies {
				@@ -208,6 +205,9 @@ dependencies {
 	api(project(":module:spring-boot-r2dbc")) {
 		transitive = false
 	}
+	api(project(":module:spring-boot-rabbitmq")) {
+		transitive = false
+	}
 	api(project(":module:spring-boot-reactor")) {
 		transitive = false
 	}
--- a/module/spring-boot-rabbitmq/build.gradle
+++ b/module/spring-boot-rabbitmq/build.gradle
--- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java
+++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java
--- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java
+++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java
--- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java
+++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java
--- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/SingleServiceRabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java
+++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/SingleServiceRabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java
--- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactoryIntegrationTests.java
+++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactoryIntegrationTests.java
--- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactoryIntegrationTests.java
+++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactoryIntegrationTests.java
--- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java
+++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java
--- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitStreamWithSslContainerConnectionDetailsFactoryIntegrationTests.java
+++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitStreamWithSslContainerConnectionDetailsFactoryIntegrationTests.java
--- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/SeparateContainersRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java
+++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/SeparateContainersRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java
--- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/SingleContainerRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java
+++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/SingleContainerRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java
--- a/module/spring-boot-rabbitmq/src/dockerTest/resources/logback-test.xml
+++ b/module/spring-boot-rabbitmq/src/dockerTest/resources/logback-test.xml
--- a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/ca.crt
+++ b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/ca.crt
--- a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/client.crt
+++ b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/client.crt
--- a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/client.key
+++ b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/client.key
--- a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-and-rabbit-stream-separate-services-compose.yaml
+++ b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-and-rabbit-stream-separate-services-compose.yaml
--- a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-and-rabbit-stream-single-service-compose.yaml
+++ b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-and-rabbit-stream-single-service-compose.yaml
--- a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-compose.yaml
+++ b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-compose.yaml
--- a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-ssl-compose.yaml
+++ b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-ssl-compose.yaml
--- a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-stream-compose.yaml
+++ b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-stream-compose.yaml
--- a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-stream-ssl-compose.yaml
+++ b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-stream-ssl-compose.yaml
--- a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbitmq-ssl.conf
+++ b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbitmq-ssl.conf
--- a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbitmq-stream-ssl.conf
+++ b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbitmq-stream-ssl.conf
--- a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/server.crt
+++ b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/server.crt
--- a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/server.key
+++ b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/server.key
--- a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/testcontainers/rabbitmq-stream-ssl.conf
+++ b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/amqp/testcontainers/rabbitmq-stream-ssl.conf
--- a/module/spring-boot-rabbitmq/src/dockerTest/resources/spring.properties
+++ b/module/spring-boot-rabbitmq/src/dockerTest/resources/spring.properties
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/AbstractConnectionFactoryConfigurer.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/AbstractConnectionFactoryConfigurer.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/AbstractRabbitListenerContainerFactoryConfigurer.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/AbstractRabbitListenerContainerFactoryConfigurer.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/CachingConnectionFactoryConfigurer.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/CachingConnectionFactoryConfigurer.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/ConnectionFactoryCustomizer.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/ConnectionFactoryCustomizer.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/DirectRabbitListenerContainerFactoryConfigurer.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/DirectRabbitListenerContainerFactoryConfigurer.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/EnvironmentBuilderCustomizer.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/EnvironmentBuilderCustomizer.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/PropertiesRabbitConnectionDetails.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/PropertiesRabbitConnectionDetails.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAnnotationDrivenConfiguration.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAnnotationDrivenConfiguration.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfiguration.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfiguration.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionDetails.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionDetails.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionFactoryBeanConfigurer.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionFactoryBeanConfigurer.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitListenerRetrySettingsCustomizer.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitListenerRetrySettingsCustomizer.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitProperties.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitProperties.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitRetryTemplateSettings.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitRetryTemplateSettings.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamConfiguration.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamConfiguration.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamConnectionDetails.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamConnectionDetails.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamTemplateConfigurer.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamTemplateConfigurer.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateConfigurer.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateConfigurer.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateCustomizer.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateCustomizer.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateRetrySettingsCustomizer.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateRetrySettingsCustomizer.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/SimpleRabbitListenerContainerFactoryConfigurer.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/SimpleRabbitListenerContainerFactoryConfigurer.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/SslBundleRabbitConnectionFactoryBean.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/SslBundleRabbitConnectionFactoryBean.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/health/RabbitHealthContributorAutoConfiguration.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/health/RabbitHealthContributorAutoConfiguration.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/health/package-info.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/health/package-info.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitConnectionFactoryMetricsPostProcessor.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitConnectionFactoryMetricsPostProcessor.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfiguration.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfiguration.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/package-info.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/package-info.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/package-info.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/autoconfigure/package-info.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactory.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactory.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitEnvironment.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitEnvironment.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitStreamDockerComposeConnectionDetailsFactory.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitStreamDockerComposeConnectionDetailsFactory.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/docker/compose/package-info.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/docker/compose/package-info.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/health/RabbitHealthIndicator.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/health/RabbitHealthIndicator.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/health/package-info.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/health/package-info.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/metrics/RabbitMetrics.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/metrics/RabbitMetrics.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/metrics/package-info.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/metrics/package-info.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactory.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactory.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactory.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactory.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/testcontainers/RabbitStreamContainerConnectionDetailsFactory.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/testcontainers/RabbitStreamContainerConnectionDetailsFactory.java
--- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/testcontainers/package-info.java
+++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/amqp/testcontainers/package-info.java
--- a/module/spring-boot-rabbitmq/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/module/spring-boot-rabbitmq/src/main/resources/META-INF/additional-spring-configuration-metadata.json
--- a/module/spring-boot-rabbitmq/src/main/resources/META-INF/spring.factories
+++ b/module/spring-boot-rabbitmq/src/main/resources/META-INF/spring.factories
--- a/module/spring-boot-rabbitmq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/module/spring-boot-rabbitmq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
--- a/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/autoconfigure/PropertiesRabbitConnectionDetailsTests.java
+++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/autoconfigure/PropertiesRabbitConnectionDetailsTests.java
--- a/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfigurationTests.java
+++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfigurationTests.java
--- a/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitPropertiesTests.java
+++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitPropertiesTests.java
--- a/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamConfigurationTests.java
+++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamConfigurationTests.java
--- a/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/autoconfigure/health/RabbitHealthContributorAutoConfigurationTests.java
+++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/autoconfigure/health/RabbitHealthContributorAutoConfigurationTests.java
--- a/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java
+++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java
--- a/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfigurationTests.java
+++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfigurationTests.java
--- a/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/docker/compose/RabbitEnvironmentTests.java
+++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/docker/compose/RabbitEnvironmentTests.java
--- a/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/health/RabbitHealthIndicatorTests.java
+++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/health/RabbitHealthIndicatorTests.java
--- a/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/metrics/RabbitMetricsTests.java
+++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/amqp/metrics/RabbitMetricsTests.java
--- a/module/spring-boot-rabbitmq/src/test/resources/logback-test.xml
+++ b/module/spring-boot-rabbitmq/src/test/resources/logback-test.xml
--- a/module/spring-boot-rabbitmq/src/test/resources/org/springframework/boot/amqp/autoconfigure/test.jks
+++ b/module/spring-boot-rabbitmq/src/test/resources/org/springframework/boot/amqp/autoconfigure/test.jks
--- a/platform/spring-boot-dependencies/build.gradle
+++ b/platform/spring-boot-dependencies/build.gradle
@ -2049,7 +2049,6 @@ bom {
				@@ -2049,7 +2049,6 @@ bom {
 				"spring-boot-activemq",
 				"spring-boot-actuator",
 				"spring-boot-actuator-autoconfigure",
-				"spring-boot-amqp",
 				"spring-boot-artemis",
 				"spring-boot-autoconfigure",
 				"spring-boot-autoconfigure-classic",
@ -2141,6 +2140,7 @@ bom {
				@@ -2141,6 +2140,7 @@ bom {
 				"spring-boot-pulsar",
 				"spring-boot-quartz",
 				"spring-boot-r2dbc",
+				"spring-boot-rabbitmq",
 				"spring-boot-reactor",
 				"spring-boot-reactor-netty",
 				"spring-boot-restclient",
@ -2166,8 +2166,6 @@ bom {
				@@ -2166,8 +2166,6 @@ bom {
 				"spring-boot-starter-activemq-test",
 				"spring-boot-starter-actuator",
 				"spring-boot-starter-actuator-test",
-				"spring-boot-starter-amqp",
-				"spring-boot-starter-amqp-test",
 				"spring-boot-starter-artemis",
 				"spring-boot-starter-artemis-test",
 				"spring-boot-starter-aspectj",
@ -2280,6 +2278,8 @@ bom {
				@@ -2280,6 +2278,8 @@ bom {
 				"spring-boot-starter-quartz-test",
 				"spring-boot-starter-r2dbc",
 				"spring-boot-starter-r2dbc-test",
+				"spring-boot-starter-rabbitmqmq",
+				"spring-boot-starter-rabbitmqmq-test",
 				"spring-boot-starter-reactor-netty",
 				"spring-boot-starter-restclient",
 				"spring-boot-starter-restclient-test",
--- a/settings.gradle
+++ b/settings.gradle
@ -80,7 +80,6 @@ include "core:spring-boot-testcontainers"
				@@ -80,7 +80,6 @@ include "core:spring-boot-testcontainers"
 include "module:spring-boot-activemq"
 include "module:spring-boot-actuator"
 include "module:spring-boot-actuator-autoconfigure"
-include "module:spring-boot-amqp"
 include "module:spring-boot-artemis"
 include "module:spring-boot-autoconfigure-classic"
 include "module:spring-boot-autoconfigure-classic-modules"
@ -164,6 +163,7 @@ include "module:spring-boot-persistence"
				@@ -164,6 +163,7 @@ include "module:spring-boot-persistence"
 include "module:spring-boot-pulsar"
 include "module:spring-boot-quartz"
 include "module:spring-boot-r2dbc"
+include "module:spring-boot-rabbitmq"
 include "module:spring-boot-reactor"
 include "module:spring-boot-reactor-netty"
 include "module:spring-boot-restclient"
@ -208,8 +208,6 @@ include "starter:spring-boot-starter-activemq"
				@@ -208,8 +208,6 @@ include "starter:spring-boot-starter-activemq"
 include "starter:spring-boot-starter-activemq-test"
 include "starter:spring-boot-starter-actuator"
 include "starter:spring-boot-starter-actuator-test"
-include "starter:spring-boot-starter-amqp"
-include "starter:spring-boot-starter-amqp-test"
 include "starter:spring-boot-starter-artemis"
 include "starter:spring-boot-starter-artemis-test"
 include "starter:spring-boot-starter-aspectj"
@ -325,6 +323,8 @@ include "starter:spring-boot-starter-quartz"
				@@ -325,6 +323,8 @@ include "starter:spring-boot-starter-quartz"
 include "starter:spring-boot-starter-quartz-test"
 include "starter:spring-boot-starter-r2dbc"
 include "starter:spring-boot-starter-r2dbc-test"
+include "starter:spring-boot-starter-rabbitmq"
+include "starter:spring-boot-starter-rabbitmq-test"
 include "starter:spring-boot-starter-reactor-netty"
 include "starter:spring-boot-starter-restclient"
 include "starter:spring-boot-starter-restclient-test"
@ -393,7 +393,6 @@ include ":smoke-test:spring-boot-smoke-test-actuator-extension"
				@@ -393,7 +393,6 @@ include ":smoke-test:spring-boot-smoke-test-actuator-extension"
 include ":smoke-test:spring-boot-smoke-test-actuator-log4j2"
 include ":smoke-test:spring-boot-smoke-test-actuator-noweb"
 include ":smoke-test:spring-boot-smoke-test-actuator-ui"
-include ":smoke-test:spring-boot-smoke-test-amqp"
 include ":smoke-test:spring-boot-smoke-test-ant"
 include ":smoke-test:spring-boot-smoke-test-artemis"
 include ":smoke-test:spring-boot-smoke-test-aspectj"
@ -441,6 +440,7 @@ include ":smoke-test:spring-boot-smoke-test-prometheus"
				@@ -441,6 +440,7 @@ include ":smoke-test:spring-boot-smoke-test-prometheus"
 include ":smoke-test:spring-boot-smoke-test-property-validation"
 include ":smoke-test:spring-boot-smoke-test-pulsar"
 include ":smoke-test:spring-boot-smoke-test-quartz"
+include ":smoke-test:spring-boot-smoke-test-rabbitmq"
 include ":smoke-test:spring-boot-smoke-test-reactive-oauth2-client"
 include ":smoke-test:spring-boot-smoke-test-reactive-oauth2-resource-server"
 include ":smoke-test:spring-boot-smoke-test-restclient"
--- a/smoke-test/spring-boot-smoke-test-rabbitmq/build.gradle
+++ b/smoke-test/spring-boot-smoke-test-rabbitmq/build.gradle
@ -22,10 +22,10 @@ plugins {
				@@ -22,10 +22,10 @@ plugins {
 description = "Spring Boot AMQP smoke test"

 dependencies {
-	implementation(project(":starter:spring-boot-starter-amqp"))
+	implementation(project(":starter:spring-boot-starter-rabbitmq"))

 	dockerTestImplementation(project(":core:spring-boot-testcontainers"))
-	dockerTestImplementation(project(":starter:spring-boot-starter-amqp-test"))
+	dockerTestImplementation(project(":starter:spring-boot-starter-rabbitmq-test"))
 	dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
 	dockerTestImplementation("org.awaitility:awaitility")
 	dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter")
--- a/smoke-test/spring-boot-smoke-test-rabbitmq/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java
+++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java
--- a/smoke-test/spring-boot-smoke-test-rabbitmq/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java
+++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java
--- a/smoke-test/spring-boot-smoke-test-rabbitmq/src/dockerTest/java/smoketest/amqp/SecureRabbitMqContainer.java
+++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/dockerTest/java/smoketest/amqp/SecureRabbitMqContainer.java
--- a/smoke-test/spring-boot-smoke-test-rabbitmq/src/main/java/smoketest/amqp/SampleAmqpSimpleApplication.java
+++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/main/java/smoketest/amqp/SampleAmqpSimpleApplication.java
--- a/smoke-test/spring-boot-smoke-test-rabbitmq/src/main/java/smoketest/amqp/Sender.java
+++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/main/java/smoketest/amqp/Sender.java
--- a/smoke-test/spring-boot-smoke-test-rabbitmq/src/main/java/smoketest/amqp/package-info.java
+++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/main/java/smoketest/amqp/package-info.java
--- a/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/rabbitmq.conf
+++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/rabbitmq.conf
--- a/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-ca.crt
+++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-ca.crt
--- a/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-ca.key
+++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-ca.key
--- a/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-client.crt
+++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-client.crt
--- a/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-client.key
+++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-client.key
--- a/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-server.crt
+++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-server.crt
--- a/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-server.key
+++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-server.key
--- a/Show More
+++ b/Show More