Merge branch '3.2.x' into 3.3.x

Closes gh-42930
2024-10-29 17:54:55 +00:00
parent 5d425fe3ff c340c691c5
commit c8b0e7f66a
11 changed files with 84 additions and 41 deletions
--- a/spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle
@@ -32,10 +32,11 @@ task syncIntegrationTestSources(type: Sync) {
 }

 processResources {
+	def version = project.version
 	eachFile {
-		filter { it.replace('${spring-boot.version}', project.version) }
+		filter { it.replace('${spring-boot.version}', version) }
 	}
-	inputs.property "version", project.version
+	inputs.property "version", version
 }

 task integrationTest {