mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Start building against Spring Framework 6.1.0-M4 snapshots
See gh-36678
This commit is contained in:
parent
57eee66b8e
commit
b46e81c230
@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
|
|||||||
|
|
||||||
kotlinVersion=1.9.0
|
kotlinVersion=1.9.0
|
||||||
nativeBuildToolsVersion=0.9.23
|
nativeBuildToolsVersion=0.9.23
|
||||||
springFrameworkVersion=6.1.0-M3
|
springFrameworkVersion=6.1.0-SNAPSHOT
|
||||||
tomcatVersion=10.1.11
|
tomcatVersion=10.1.11
|
||||||
|
|
||||||
kotlin.stdlib.default.dependency=false
|
kotlin.stdlib.default.dependency=false
|
||||||
|
@ -230,8 +230,8 @@ public class SpringBootContextLoader extends AbstractContextLoader implements Ao
|
|||||||
setActiveProfiles(environment, mergedConfig.getActiveProfiles(), applicationEnvironment);
|
setActiveProfiles(environment, mergedConfig.getActiveProfiles(), applicationEnvironment);
|
||||||
ResourceLoader resourceLoader = (application.getResourceLoader() != null) ? application.getResourceLoader()
|
ResourceLoader resourceLoader = (application.getResourceLoader() != null) ? application.getResourceLoader()
|
||||||
: new DefaultResourceLoader(null);
|
: new DefaultResourceLoader(null);
|
||||||
TestPropertySourceUtils.addPropertiesFilesToEnvironment(environment, resourceLoader,
|
TestPropertySourceUtils.addPropertySourcesToEnvironment(environment, resourceLoader,
|
||||||
mergedConfig.getPropertySourceLocations());
|
mergedConfig.getPropertySourceDescriptors());
|
||||||
TestPropertySourceUtils.addInlinedPropertiesToEnvironment(environment, getInlinedProperties(mergedConfig));
|
TestPropertySourceUtils.addInlinedPropertiesToEnvironment(environment, getInlinedProperties(mergedConfig));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -376,7 +376,7 @@ public class SpringBootTestContextBootstrapper extends DefaultTestContextBootstr
|
|||||||
contextCustomizers.add(new SpringBootTestAnnotation(mergedConfig.getTestClass()));
|
contextCustomizers.add(new SpringBootTestAnnotation(mergedConfig.getTestClass()));
|
||||||
return new MergedContextConfiguration(mergedConfig.getTestClass(), mergedConfig.getLocations(), classes,
|
return new MergedContextConfiguration(mergedConfig.getTestClass(), mergedConfig.getLocations(), classes,
|
||||||
mergedConfig.getContextInitializerClasses(), mergedConfig.getActiveProfiles(),
|
mergedConfig.getContextInitializerClasses(), mergedConfig.getActiveProfiles(),
|
||||||
mergedConfig.getPropertySourceLocations(), propertySourceProperties, contextCustomizers,
|
mergedConfig.getPropertySourceDescriptors(), propertySourceProperties, contextCustomizers,
|
||||||
mergedConfig.getContextLoader(), getCacheAwareContextLoaderDelegate(), mergedConfig.getParent());
|
mergedConfig.getContextLoader(), getCacheAwareContextLoaderDelegate(), mergedConfig.getParent());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user