Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Start building against Spring Framework 6.1.0-M4 snapshots

Browse Source 
See gh-36678
This commit is contained in:
Stephane Nicoll 2023-08-01 14:49:15 +02:00
parent 57eee66b8e
commit b46e81c230
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
kotlinVersion=1.9.0
nativeBuildToolsVersion=0.9.23
springFrameworkVersion=6.1.0-M3
springFrameworkVersion=6.1.0-SNAPSHOT
tomcatVersion=10.1.11
kotlin.stdlib.default.dependency=false

4
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
View File

@ -230,8 +230,8 @@ public class SpringBootContextLoader extends AbstractContextLoader implements Ao
setActiveProfiles(environment, mergedConfig.getActiveProfiles(), applicationEnvironment);
ResourceLoader resourceLoader = (application.getResourceLoader() != null) ? application.getResourceLoader()
: new DefaultResourceLoader(null);
TestPropertySourceUtils.addPropertiesFilesToEnvironment(environment, resourceLoader,
mergedConfig.getPropertySourceLocations());
TestPropertySourceUtils.addPropertySourcesToEnvironment(environment, resourceLoader,
mergedConfig.getPropertySourceDescriptors());
TestPropertySourceUtils.addInlinedPropertiesToEnvironment(environment, getInlinedProperties(mergedConfig));
}

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java
View File

@ -376,7 +376,7 @@ public class SpringBootTestContextBootstrapper extends DefaultTestContextBootstr
contextCustomizers.add(new SpringBootTestAnnotation(mergedConfig.getTestClass()));
return new MergedContextConfiguration(mergedConfig.getTestClass(), mergedConfig.getLocations(), classes,
mergedConfig.getContextInitializerClasses(), mergedConfig.getActiveProfiles(),
mergedConfig.getPropertySourceLocations(), propertySourceProperties, contextCustomizers,
mergedConfig.getPropertySourceDescriptors(), propertySourceProperties, contextCustomizers,
mergedConfig.getContextLoader(), getCacheAwareContextLoaderDelegate(), mergedConfig.getParent());
}