From 9d17ef0a3a2f61eb3510ba7001ae4598afb4dd7d Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 22 Sep 2022 12:26:29 -0400 Subject: [PATCH] Migrates to AutoConfiguration.imports Fixes gh-658 --- .../src/main/resources/META-INF/spring.factories | 3 --- ...ingframework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 5 ----- ...ingframework.boot.autoconfigure.AutoConfiguration.imports | 3 +++ 4 files changed, 4 insertions(+), 8 deletions(-) create mode 100644 spring-cloud-vault-config-consul/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 spring-cloud-vault-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/spring-cloud-vault-config-consul/src/main/resources/META-INF/spring.factories b/spring-cloud-vault-config-consul/src/main/resources/META-INF/spring.factories index e5224489..4cc99ff8 100644 --- a/spring-cloud-vault-config-consul/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-vault-config-consul/src/main/resources/META-INF/spring.factories @@ -2,9 +2,6 @@ org.springframework.cloud.bootstrap.BootstrapConfiguration=\ org.springframework.cloud.vault.config.consul.VaultConfigConsulBootstrapConfiguration -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.vault.config.consul.VaultConfigConsulAutoConfiguration - org.springframework.cloud.vault.config.SecretBackendMetadataFactory=\ org.springframework.cloud.vault.config.consul.VaultConfigConsulBootstrapConfiguration.ConsulSecretBackendMetadataFactory diff --git a/spring-cloud-vault-config-consul/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-vault-config-consul/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..f1e1cc21 --- /dev/null +++ b/spring-cloud-vault-config-consul/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.cloud.vault.config.consul.VaultConfigConsulAutoConfiguration diff --git a/spring-cloud-vault-config/src/main/resources/META-INF/spring.factories b/spring-cloud-vault-config/src/main/resources/META-INF/spring.factories index 5539a227..cc383f7e 100644 --- a/spring-cloud-vault-config/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-vault-config/src/main/resources/META-INF/spring.factories @@ -1,8 +1,3 @@ -# Auto-Configuration -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.vault.config.VaultReactiveAutoConfiguration,\ -org.springframework.cloud.vault.config.VaultAutoConfiguration,\ -org.springframework.cloud.vault.config.VaultHealthIndicatorAutoConfiguration # Bootstrap Configuration org.springframework.cloud.bootstrap.BootstrapConfiguration=\ org.springframework.cloud.vault.config.DiscoveryClientVaultBootstrapConfiguration,\ diff --git a/spring-cloud-vault-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-vault-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..d723c452 --- /dev/null +++ b/spring-cloud-vault-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +org.springframework.cloud.vault.config.VaultReactiveAutoConfiguration +org.springframework.cloud.vault.config.VaultAutoConfiguration +org.springframework.cloud.vault.config.VaultHealthIndicatorAutoConfiguration \ No newline at end of file