From 4a29ea932dae4892d3c45e41e70ef7319a9720dd Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 22 Sep 2022 15:30:10 -0700 Subject: [PATCH] Adapt to API and framework changes in Spring Boot Auto-configuration. --- .../main/resources/META-INF/spring.factories | 4 ++-- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../main/resources/META-INF/spring.factories | 23 +++---------------- ...ot.autoconfigure.AutoConfiguration.imports | 17 ++++++++++++++ 4 files changed, 23 insertions(+), 22 deletions(-) create mode 100644 spring-geode-project/spring-geode-actuator-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 spring-geode-project/spring-geode-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/spring-geode-project/spring-geode-actuator-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-geode-project/spring-geode-actuator-autoconfigure/src/main/resources/META-INF/spring.factories index 377938b0..3eabc798 100644 --- a/spring-geode-project/spring-geode-actuator-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/spring-geode-project/spring-geode-actuator-autoconfigure/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.geode.boot.actuate.autoconfigure.GeodeHealthIndicatorAutoConfiguration +# Spring Boot Auto-configuration +# See /META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/spring-geode-project/spring-geode-actuator-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-geode-project/spring-geode-actuator-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..772e671b --- /dev/null +++ b/spring-geode-project/spring-geode-actuator-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.geode.boot.actuate.autoconfigure.GeodeHealthIndicatorAutoConfiguration diff --git a/spring-geode-project/spring-geode-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-geode-project/spring-geode-autoconfigure/src/main/resources/META-INF/spring.factories index 65cfea38..3c49e31e 100644 --- a/spring-geode-project/spring-geode-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/spring-geode-project/spring-geode-autoconfigure/src/main/resources/META-INF/spring.factories @@ -1,24 +1,7 @@ -# Auto Configuration -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.geode.boot.autoconfigure.CacheNameAutoConfiguration,\ -org.springframework.geode.boot.autoconfigure.ClientCacheAutoConfiguration,\ -org.springframework.geode.boot.autoconfigure.CachingProviderAutoConfiguration,\ -org.springframework.geode.boot.autoconfigure.ClientSecurityAutoConfiguration,\ -org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration,\ -org.springframework.geode.boot.autoconfigure.DataImportExportAutoConfiguration,\ -org.springframework.geode.boot.autoconfigure.EnvironmentSourcedGemFirePropertiesAutoConfiguration,\ -org.springframework.geode.boot.autoconfigure.FunctionExecutionAutoConfiguration,\ -org.springframework.geode.boot.autoconfigure.GemFirePropertiesAutoConfiguration,\ -org.springframework.geode.boot.autoconfigure.LoggingAutoConfiguration,\ -org.springframework.geode.boot.autoconfigure.PdxSerializationAutoConfiguration,\ -org.springframework.geode.boot.autoconfigure.PeerSecurityAutoConfiguration,\ -org.springframework.geode.boot.autoconfigure.RegionTemplateAutoConfiguration,\ -org.springframework.geode.boot.autoconfigure.RepositoriesAutoConfiguration,\ -org.springframework.geode.boot.autoconfigure.SpringSessionAutoConfiguration,\ -org.springframework.geode.boot.autoconfigure.SpringSessionPropertiesAutoConfiguration,\ -org.springframework.geode.boot.autoconfigure.SslAutoConfiguration +# Spring Boot Auto-configuration +# See /META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports -# Environment Post Processing +# Spring Boot Environment Post Processing org.springframework.boot.env.EnvironmentPostProcessor=\ org.springframework.geode.boot.autoconfigure.ClientSecurityAutoConfiguration.AutoConfiguredCloudSecurityEnvironmentPostProcessor,\ org.springframework.geode.boot.autoconfigure.DataImportExportAutoConfiguration.DisableGemFireShutdownHookEnvironmentPostProcessor,\ diff --git a/spring-geode-project/spring-geode-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-geode-project/spring-geode-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..1913e556 --- /dev/null +++ b/spring-geode-project/spring-geode-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,17 @@ +org.springframework.geode.boot.autoconfigure.CacheNameAutoConfiguration +org.springframework.geode.boot.autoconfigure.ClientCacheAutoConfiguration +org.springframework.geode.boot.autoconfigure.CachingProviderAutoConfiguration +org.springframework.geode.boot.autoconfigure.ClientSecurityAutoConfiguration +org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration +org.springframework.geode.boot.autoconfigure.DataImportExportAutoConfiguration +org.springframework.geode.boot.autoconfigure.EnvironmentSourcedGemFirePropertiesAutoConfiguration +org.springframework.geode.boot.autoconfigure.FunctionExecutionAutoConfiguration +org.springframework.geode.boot.autoconfigure.GemFirePropertiesAutoConfiguration +org.springframework.geode.boot.autoconfigure.LoggingAutoConfiguration +org.springframework.geode.boot.autoconfigure.PdxSerializationAutoConfiguration +org.springframework.geode.boot.autoconfigure.PeerSecurityAutoConfiguration +org.springframework.geode.boot.autoconfigure.RegionTemplateAutoConfiguration +org.springframework.geode.boot.autoconfigure.RepositoriesAutoConfiguration +org.springframework.geode.boot.autoconfigure.SpringSessionAutoConfiguration +org.springframework.geode.boot.autoconfigure.SpringSessionPropertiesAutoConfiguration +org.springframework.geode.boot.autoconfigure.SslAutoConfiguration