Merge branch '2.4.x'

Closes gh-24519
This commit is contained in:
Andy Wilkinson 2020-12-15 17:22:01 +00:00
commit 4040105629
2 changed files with 11 additions and 0 deletions

View File

@ -61,6 +61,7 @@ dependencies {
configurationProperties(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure", configuration: "configurationPropertiesMetadata"))
configurationProperties(project(path: ":spring-boot-project:spring-boot-autoconfigure", configuration: "configurationPropertiesMetadata"))
configurationProperties(project(path: ":spring-boot-project:spring-boot-devtools", configuration: "configurationPropertiesMetadata"))
configurationProperties(project(path: ":spring-boot-project:spring-boot-test-autoconfigure", configuration: "configurationPropertiesMetadata"))
gradlePluginDocumentation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin", configuration: "documentation"))

View File

@ -88,6 +88,16 @@ dependencies {
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}
configurations {
configurationPropertiesMetadata
}
artifacts {
configurationPropertiesMetadata new File(sourceSets.main.output.resourcesDir, "META-INF/spring-configuration-metadata.json"), { artifact ->
artifact.builtBy sourceSets.main.processResourcesTaskName
}
}
test {
include "**/*Tests.class"
}