Merge branch '2.5.x'

Closes gh-28754
This commit is contained in:
Andy Wilkinson 2021-11-19 15:37:32 +00:00
commit 0074d621d0
4 changed files with 5 additions and 5 deletions

View File

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

View File

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

View File

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

View File

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