root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.5.x' 

Closes gh-28754
This commit is contained in:
Andy Wilkinson 2021-11-19 15:37:32 +00:00
parent 258222781a 015cf920da
commit 0074d621d0
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
View File

@ -214,7 +214,7 @@ tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) {
attributes "spring-integration-docs": integrationDocs attributes "spring-integration-docs": integrationDocs
} }
dependsOn test dependsOn test
inputs.dir("${buildDir}/generated-snippets").withPathSensitivity(PathSensitivity.RELATIVE) inputs.dir("${buildDir}/generated-snippets").withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("generatedSnippets")
} }
asciidoctor { asciidoctor {

4
spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle
View File

@ -41,8 +41,8 @@ processResources {
task integrationTest { task integrationTest {
dependsOn copyIntegrationTestSources, jar dependsOn copyIntegrationTestSources, jar
def resultsDir = file("${buildDir}/test-results/integrationTest") def resultsDir = file("${buildDir}/test-results/integrationTest")
inputs.dir(file("src/it")).withPathSensitivity(PathSensitivity.RELATIVE) inputs.dir(file("src/it")).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("source")
inputs.files(sourceSets.main.runtimeClasspath).withNormalizer(ClasspathNormalizer) inputs.files(sourceSets.main.runtimeClasspath).withNormalizer(ClasspathNormalizer).withPropertyName("classpath")
outputs.dirs resultsDir outputs.dirs resultsDir
doLast { doLast {
ant.with { ant.with {

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
View File

@ -64,7 +64,7 @@ task dependencyVersions(type: org.springframework.boot.build.constraints.Extract
tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) { tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) {
dependsOn dependencyVersions dependsOn dependencyVersions
inputs.dir('src/docs/gradle').withPathSensitivity(PathSensitivity.RELATIVE) inputs.dir('src/docs/gradle').withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName('buildScripts')
doFirst { doFirst {
attributes "dependency-management-plugin-version": dependencyVersions.versionConstraints["io.spring.gradle:dependency-management-plugin"] attributes "dependency-management-plugin-version": dependencyVersions.versionConstraints["io.spring.gradle:dependency-management-plugin"]
} }

2
spring-boot-system-tests/spring-boot-deployment-tests/build.gradle
View File

@ -37,7 +37,7 @@ dependencies {
} }
systemTest { systemTest {
inputs.files(war).withNormalizer(ClasspathNormalizer) inputs.files(war).withNormalizer(ClasspathNormalizer).withPropertyName("war")
} }
war { war {