Merge branch '2.5.x'

Closes gh-28754

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

@@ -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 {

spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle

@@ -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 {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle

@@ -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"]
 	}

spring-boot-system-tests/spring-boot-deployment-tests/build.gradle

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