Merge branch '2.1.x'

Closes gh-17335
Closes gh-17292
This commit is contained in:
Andy Wilkinson
2019-06-27 11:46:52 +01:00
11 changed files with 74 additions and 60 deletions

View File

@@ -39,7 +39,7 @@ class ConfigurationProcessorIntegrationTests {
private static ConfigurationMetadataRepository repository;
@BeforeAll
public static void readMetadata() throws IOException {
static void readMetadata() throws IOException {
Resource resource = new ClassPathResource("META-INF/spring-configuration-metadata.json");
assertThat(resource.exists()).isTrue();
// Make sure the right file is detected