diff --git a/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/ConfigDataApplicationContextInitializer.java b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/ConfigDataApplicationContextInitializer.java index 046812a1afb..cf2581242d1 100644 --- a/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/ConfigDataApplicationContextInitializer.java +++ b/core/spring-boot-test/src/main/java/org/springframework/boot/test/context/ConfigDataApplicationContextInitializer.java @@ -16,10 +16,10 @@ package org.springframework.boot.test.context; -import org.springframework.boot.DefaultPropertiesPropertySource; import org.springframework.boot.bootstrap.DefaultBootstrapContext; import org.springframework.boot.context.config.ConfigData; import org.springframework.boot.context.config.ConfigDataEnvironmentPostProcessor; +import org.springframework.boot.env.DefaultPropertiesPropertySource; import org.springframework.boot.env.RandomValuePropertySource; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; diff --git a/core/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/core/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java index 8014385c21a..d4062fa4e68 100644 --- a/core/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java +++ b/core/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java @@ -65,6 +65,7 @@ import org.springframework.boot.context.properties.bind.Bindable; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.boot.context.properties.source.ConfigurationPropertySources; import org.springframework.boot.convert.ApplicationConversionService; +import org.springframework.boot.env.DefaultPropertiesPropertySource; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ApplicationListener; diff --git a/core/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironment.java b/core/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironment.java index 6fe6053ce9a..68ff61f1d1c 100644 --- a/core/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironment.java +++ b/core/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironment.java @@ -26,7 +26,6 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.jspecify.annotations.Nullable; -import org.springframework.boot.DefaultPropertiesPropertySource; import org.springframework.boot.bootstrap.BootstrapRegistry.InstanceSupplier; import org.springframework.boot.bootstrap.BootstrapRegistry.Scope; import org.springframework.boot.bootstrap.ConfigurableBootstrapContext; @@ -36,6 +35,7 @@ import org.springframework.boot.context.properties.bind.Bindable; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.boot.context.properties.bind.PlaceholdersResolver; import org.springframework.boot.context.properties.source.ConfigurationPropertySource; +import org.springframework.boot.env.DefaultPropertiesPropertySource; import org.springframework.boot.logging.DeferredLogFactory; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.Environment; diff --git a/core/spring-boot/src/main/java/org/springframework/boot/DefaultPropertiesPropertySource.java b/core/spring-boot/src/main/java/org/springframework/boot/env/DefaultPropertiesPropertySource.java similarity index 99% rename from core/spring-boot/src/main/java/org/springframework/boot/DefaultPropertiesPropertySource.java rename to core/spring-boot/src/main/java/org/springframework/boot/env/DefaultPropertiesPropertySource.java index 5b4dfb4b450..871577a9c52 100644 --- a/core/spring-boot/src/main/java/org/springframework/boot/DefaultPropertiesPropertySource.java +++ b/core/spring-boot/src/main/java/org/springframework/boot/env/DefaultPropertiesPropertySource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot; +package org.springframework.boot.env; import java.util.HashMap; import java.util.Map; diff --git a/core/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java b/core/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java index e7925a483c5..e709b60335e 100644 --- a/core/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java +++ b/core/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java @@ -71,6 +71,7 @@ import org.springframework.boot.context.event.ApplicationStartedEvent; import org.springframework.boot.context.event.ApplicationStartingEvent; import org.springframework.boot.context.event.SpringApplicationEvent; import org.springframework.boot.convert.ApplicationConversionService; +import org.springframework.boot.env.DefaultPropertiesPropertySource; import org.springframework.boot.testsupport.classpath.ForkedClassPath; import org.springframework.boot.testsupport.classpath.resources.WithResource; import org.springframework.boot.testsupport.system.CapturedOutput; diff --git a/core/spring-boot/src/test/java/org/springframework/boot/DefaultPropertiesPropertySourceTests.java b/core/spring-boot/src/test/java/org/springframework/boot/env/DefaultPropertiesPropertySourceTests.java similarity index 99% rename from core/spring-boot/src/test/java/org/springframework/boot/DefaultPropertiesPropertySourceTests.java rename to core/spring-boot/src/test/java/org/springframework/boot/env/DefaultPropertiesPropertySourceTests.java index 178a25c0304..fad63bd24fb 100644 --- a/core/spring-boot/src/test/java/org/springframework/boot/DefaultPropertiesPropertySourceTests.java +++ b/core/spring-boot/src/test/java/org/springframework/boot/env/DefaultPropertiesPropertySourceTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot; +package org.springframework.boot.env; import java.util.Collections; import java.util.function.Consumer;