Skip to content

Commit b95f8e6

Browse files
committed
Updates for boot package changes
1 parent 97df1a7 commit b95f8e6

File tree

2 files changed

+6
-6
lines changed
  • spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web
  • spring-cloud-function-deployer/src/main/resources/META-INF

2 files changed

+6
-6
lines changed

spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessWebApplication.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,7 @@
3636
import org.springframework.boot.ApplicationArguments;
3737
import org.springframework.boot.ApplicationContextFactory;
3838
import org.springframework.boot.Banner;
39-
import org.springframework.boot.BootstrapRegistryInitializer;
40-
import org.springframework.boot.ConfigurableBootstrapContext;
4139
import org.springframework.boot.DefaultApplicationArguments;
42-
import org.springframework.boot.DefaultBootstrapContext;
43-
import org.springframework.boot.DefaultPropertiesPropertySource;
4440
import org.springframework.boot.LazyInitializationBeanFactoryPostProcessor;
4541
import org.springframework.boot.ResourceBanner;
4642
import org.springframework.boot.SpringApplication;
@@ -50,7 +46,11 @@
5046
import org.springframework.boot.ansi.AnsiColor;
5147
import org.springframework.boot.ansi.AnsiOutput;
5248
import org.springframework.boot.ansi.AnsiStyle;
49+
import org.springframework.boot.bootstrap.BootstrapRegistryInitializer;
50+
import org.springframework.boot.bootstrap.ConfigurableBootstrapContext;
51+
import org.springframework.boot.bootstrap.DefaultBootstrapContext;
5352
import org.springframework.boot.context.properties.source.ConfigurationPropertySources;
53+
import org.springframework.boot.env.DefaultPropertiesPropertySource;
5454
import org.springframework.context.ApplicationContextInitializer;
5555
import org.springframework.context.ConfigurableApplicationContext;
5656
import org.springframework.context.aot.AotApplicationContextInitializer;
@@ -125,7 +125,7 @@ public ConfigurableWebApplicationContext run(String... args) {
125125

126126

127127
private ConfigurableEnvironment prepareEnvironment(SpringApplicationRunListeners listeners,
128-
DefaultBootstrapContext bootstrapContext, ApplicationArguments applicationArguments) {
128+
ConfigurableBootstrapContext bootstrapContext, ApplicationArguments applicationArguments) {
129129
// Create and configure the environment
130130
ConfigurableEnvironment environment = getOrCreateEnvironment();
131131
configureEnvironment(environment, applicationArguments.getSourceArgs());
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
org.springframework.boot.env.EnvironmentPostProcessor=org.springframework.cloud.function.deployer.FunctionDeployerConfiguration$LegacyPropertyEnvironmentPostProcessor
1+
org.springframework.boot.EnvironmentPostProcessor=org.springframework.cloud.function.deployer.FunctionDeployerConfiguration$LegacyPropertyEnvironmentPostProcessor

0 commit comments

Comments
 (0)