From e77f157e04271646c744fbd10f9799a9feac8306 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 21 Sep 2022 17:13:51 -0400 Subject: [PATCH] Migrates to new AutoConfiguration.imports Fixes gh-265 --- .../src/main/resources/META-INF/spring.factories | 3 --- ...ngframework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../springframework/cloud/bus/BusAmqpIntegrationTests.java | 3 ++- .../src/main/resources/META-INF/spring.factories | 6 ------ ...ngframework.boot.autoconfigure.AutoConfiguration.imports | 5 +++++ 5 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 spring-cloud-bus-rsocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 spring-cloud-bus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/spring-cloud-bus-rsocket/src/main/resources/META-INF/spring.factories b/spring-cloud-bus-rsocket/src/main/resources/META-INF/spring.factories index 8b84263..0d36dfe 100644 --- a/spring-cloud-bus-rsocket/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-bus-rsocket/src/main/resources/META-INF/spring.factories @@ -1,6 +1,3 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.bus.rsocket.BusRSocketAutoConfiguration - # Environment Post Processor org.springframework.boot.env.EnvironmentPostProcessor=\ org.springframework.cloud.bus.rsocket.BusRSocketEnvironmentPostProcessor diff --git a/spring-cloud-bus-rsocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-bus-rsocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..91a5ae7 --- /dev/null +++ b/spring-cloud-bus-rsocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.cloud.bus.rsocket.BusRSocketAutoConfiguration diff --git a/spring-cloud-bus-tests/src/test/java/org/springframework/cloud/bus/BusAmqpIntegrationTests.java b/spring-cloud-bus-tests/src/test/java/org/springframework/cloud/bus/BusAmqpIntegrationTests.java index a09f047..07a5b89 100644 --- a/spring-cloud-bus-tests/src/test/java/org/springframework/cloud/bus/BusAmqpIntegrationTests.java +++ b/spring-cloud-bus-tests/src/test/java/org/springframework/cloud/bus/BusAmqpIntegrationTests.java @@ -52,7 +52,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen public class BusAmqpIntegrationTests { @Container - private static final RabbitMQContainer rabbitMQContainer = new RabbitMQContainer("rabbitmq:3.7.25-management-alpine"); + private static final RabbitMQContainer rabbitMQContainer = new RabbitMQContainer( + "rabbitmq:3.7.25-management-alpine"); private static ConfigurableApplicationContext context; diff --git a/spring-cloud-bus/src/main/resources/META-INF/spring.factories b/spring-cloud-bus/src/main/resources/META-INF/spring.factories index 08fc39d..665f0a3 100644 --- a/spring-cloud-bus/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-bus/src/main/resources/META-INF/spring.factories @@ -1,9 +1,3 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.bus.PathServiceMatcherAutoConfiguration,\ -org.springframework.cloud.bus.BusAutoConfiguration,\ -org.springframework.cloud.bus.BusRefreshAutoConfiguration,\ -org.springframework.cloud.bus.BusStreamAutoConfiguration,\ -org.springframework.cloud.bus.jackson.BusJacksonAutoConfiguration # Environment Post Processor org.springframework.boot.env.EnvironmentPostProcessor=\ org.springframework.cloud.bus.BusEnvironmentPostProcessor diff --git a/spring-cloud-bus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-bus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..ac7da21 --- /dev/null +++ b/spring-cloud-bus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,5 @@ +org.springframework.cloud.bus.PathServiceMatcherAutoConfiguration +org.springframework.cloud.bus.BusAutoConfiguration +org.springframework.cloud.bus.BusRefreshAutoConfiguration +org.springframework.cloud.bus.BusStreamAutoConfiguration +org.springframework.cloud.bus.jackson.BusJacksonAutoConfiguration \ No newline at end of file