From d077ef4f7ef2acb4ee490372470db66e46990123 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 21 Sep 2022 17:19:49 -0400 Subject: [PATCH] Migrates to new AutoConfiguration.imports Fixes gh-795 --- .../src/main/resources/META-INF/spring.factories | 3 --- ...ramework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 3 --- ...ramework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 9 --------- ...ramework.boot.autoconfigure.AutoConfiguration.imports | 7 +++++++ 6 files changed, 9 insertions(+), 15 deletions(-) create mode 100644 spring-cloud-consul-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 spring-cloud-consul-core/src/main/resources/META-INF/spring.factories create mode 100644 spring-cloud-consul-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 spring-cloud-consul-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/spring-cloud-consul-config/src/main/resources/META-INF/spring.factories b/spring-cloud-consul-config/src/main/resources/META-INF/spring.factories index 77d3e902..d9dd0d08 100644 --- a/spring-cloud-consul-config/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-consul-config/src/main/resources/META-INF/spring.factories @@ -1,6 +1,3 @@ -# Auto Configuration -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.consul.config.ConsulConfigAutoConfiguration # Bootstrap Configuration org.springframework.cloud.bootstrap.BootstrapConfiguration=\ org.springframework.cloud.consul.config.ConsulConfigBootstrapConfiguration diff --git a/spring-cloud-consul-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-consul-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..3a0088f9 --- /dev/null +++ b/spring-cloud-consul-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.cloud.consul.config.ConsulConfigAutoConfiguration diff --git a/spring-cloud-consul-core/src/main/resources/META-INF/spring.factories b/spring-cloud-consul-core/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 2273bcb2..00000000 --- a/spring-cloud-consul-core/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Auto Configuration -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.consul.ConsulAutoConfiguration diff --git a/spring-cloud-consul-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-consul-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..97f88daa --- /dev/null +++ b/spring-cloud-consul-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.cloud.consul.ConsulAutoConfiguration diff --git a/spring-cloud-consul-discovery/src/main/resources/META-INF/spring.factories b/spring-cloud-consul-discovery/src/main/resources/META-INF/spring.factories index 79c24fe3..f4ad92ea 100644 --- a/spring-cloud-consul-discovery/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-consul-discovery/src/main/resources/META-INF/spring.factories @@ -1,12 +1,3 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.consul.discovery.configclient.ConsulConfigServerAutoConfiguration,\ -org.springframework.cloud.consul.serviceregistry.ConsulAutoServiceRegistrationAutoConfiguration,\ -org.springframework.cloud.consul.serviceregistry.ConsulServiceRegistryAutoConfiguration,\ -org.springframework.cloud.consul.discovery.ConsulDiscoveryClientConfiguration,\ -org.springframework.cloud.consul.discovery.reactive.ConsulReactiveDiscoveryClientConfiguration,\ -org.springframework.cloud.consul.discovery.ConsulCatalogWatchAutoConfiguration, \ -org.springframework.cloud.consul.support.ConsulHeartbeatAutoConfiguration - org.springframework.cloud.bootstrap.BootstrapConfiguration=\ org.springframework.cloud.consul.discovery.configclient.ConsulDiscoveryClientConfigServiceBootstrapConfiguration diff --git a/spring-cloud-consul-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-consul-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..971efdef --- /dev/null +++ b/spring-cloud-consul-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,7 @@ +org.springframework.cloud.consul.discovery.configclient.ConsulConfigServerAutoConfiguration +org.springframework.cloud.consul.serviceregistry.ConsulAutoServiceRegistrationAutoConfiguration +org.springframework.cloud.consul.serviceregistry.ConsulServiceRegistryAutoConfiguration +org.springframework.cloud.consul.discovery.ConsulDiscoveryClientConfiguration +org.springframework.cloud.consul.discovery.reactive.ConsulReactiveDiscoveryClientConfiguration +org.springframework.cloud.consul.discovery.ConsulCatalogWatchAutoConfiguration +org.springframework.cloud.consul.support.ConsulHeartbeatAutoConfiguration \ No newline at end of file