Merge branch '2.4.x'

Closes gh-25837
2021-03-30 20:42:41 +01:00
parent 09173b81d6 38a4f135a9
commit df4b1ffb0d
3 changed files with 19 additions and 14 deletions
--- a/spring-boot-project/spring-boot/build.gradle
+++ b/spring-boot-project/spring-boot/build.gradle
@@ -119,11 +119,12 @@ dependencies {
 }

 task extractTomcatConfigProperties(type: Sync) {
-	dependsOn configurations.tomcatDistribution
 	destinationDir = file(tomcatConfigProperties)
-	from(zipTree(configurations.tomcatDistribution.incoming.files.singleFile).matching {
-		include '**/conf/catalina.properties'
-	}.singleFile)
+	from {
+		zipTree(configurations.tomcatDistribution.incoming.files.singleFile).matching {
+			include '**/conf/catalina.properties'
+		}.singleFile
+	}
 }

 sourceSets {