From 8bd257710ad965f2dc03702cd67809c106a98cab Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 21 Sep 2022 14:08:42 -0400 Subject: [PATCH] Migrates to AutoConfiguration.imports Fixes gh-2729 --- .../src/main/resources/META-INF/spring.factories | 3 --- ...ork.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 13 ------------- ...ork.boot.autoconfigure.AutoConfiguration.imports | 10 ++++++++++ .../src/main/resources/META-INF/spring.factories | 3 --- ...ork.boot.autoconfigure.AutoConfiguration.imports | 1 + 6 files changed, 12 insertions(+), 19 deletions(-) create mode 100644 spring-cloud-gateway-mvc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 spring-cloud-gateway-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 spring-cloud-gateway-webflux/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/spring-cloud-gateway-mvc/src/main/resources/META-INF/spring.factories b/spring-cloud-gateway-mvc/src/main/resources/META-INF/spring.factories index ae9e0fda..cad77eff 100644 --- a/spring-cloud-gateway-mvc/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-gateway-mvc/src/main/resources/META-INF/spring.factories @@ -1,5 +1,2 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.gateway.mvc.config.ProxyResponseAutoConfiguration - org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc=\ org.springframework.cloud.gateway.mvc.config.ProxyResponseAutoConfiguration diff --git a/spring-cloud-gateway-mvc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-gateway-mvc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..6b27473e --- /dev/null +++ b/spring-cloud-gateway-mvc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.cloud.gateway.mvc.config.ProxyResponseAutoConfiguration diff --git a/spring-cloud-gateway-server/src/main/resources/META-INF/spring.factories b/spring-cloud-gateway-server/src/main/resources/META-INF/spring.factories index 85686393..dd7e5a51 100644 --- a/spring-cloud-gateway-server/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-gateway-server/src/main/resources/META-INF/spring.factories @@ -1,16 +1,3 @@ -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.gateway.config.GatewayClassPathWarningAutoConfiguration,\ -org.springframework.cloud.gateway.config.GatewayAutoConfiguration,\ -org.springframework.cloud.gateway.config.GatewayResilience4JCircuitBreakerAutoConfiguration,\ -org.springframework.cloud.gateway.config.GatewayNoLoadBalancerClientAutoConfiguration,\ -org.springframework.cloud.gateway.config.GatewayMetricsAutoConfiguration,\ -org.springframework.cloud.gateway.config.GatewayRedisAutoConfiguration,\ -org.springframework.cloud.gateway.discovery.GatewayDiscoveryClientAutoConfiguration,\ -org.springframework.cloud.gateway.config.SimpleUrlHandlerMappingGlobalCorsAutoConfiguration,\ -org.springframework.cloud.gateway.config.GatewayReactiveLoadBalancerClientAutoConfiguration,\ -org.springframework.cloud.gateway.config.GatewayReactiveOAuth2AutoConfiguration - org.springframework.boot.env.EnvironmentPostProcessor=\ org.springframework.cloud.gateway.config.GatewayEnvironmentPostProcessor diff --git a/spring-cloud-gateway-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-gateway-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..10ced6f9 --- /dev/null +++ b/spring-cloud-gateway-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,10 @@ +org.springframework.cloud.gateway.config.GatewayClassPathWarningAutoConfiguration +org.springframework.cloud.gateway.config.GatewayAutoConfiguration +org.springframework.cloud.gateway.config.GatewayResilience4JCircuitBreakerAutoConfiguration +org.springframework.cloud.gateway.config.GatewayNoLoadBalancerClientAutoConfiguration +org.springframework.cloud.gateway.config.GatewayMetricsAutoConfiguration +org.springframework.cloud.gateway.config.GatewayRedisAutoConfiguration +org.springframework.cloud.gateway.discovery.GatewayDiscoveryClientAutoConfiguration +org.springframework.cloud.gateway.config.SimpleUrlHandlerMappingGlobalCorsAutoConfiguration +org.springframework.cloud.gateway.config.GatewayReactiveLoadBalancerClientAutoConfiguration +org.springframework.cloud.gateway.config.GatewayReactiveOAuth2AutoConfiguration \ No newline at end of file diff --git a/spring-cloud-gateway-webflux/src/main/resources/META-INF/spring.factories b/spring-cloud-gateway-webflux/src/main/resources/META-INF/spring.factories index 2611f70c..848726e3 100644 --- a/spring-cloud-gateway-webflux/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-gateway-webflux/src/main/resources/META-INF/spring.factories @@ -1,5 +1,2 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.gateway.webflux.config.ProxyResponseAutoConfiguration - org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebFlux=\ org.springframework.cloud.gateway.webflux.config.ProxyResponseAutoConfiguration diff --git a/spring-cloud-gateway-webflux/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-cloud-gateway-webflux/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..c700d39e --- /dev/null +++ b/spring-cloud-gateway-webflux/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.springframework.cloud.gateway.webflux.config.ProxyResponseAutoConfiguration