Merge branch '2.3.x' into 2.4.x

Closes gh-25836

spring-boot-project/spring-boot-cli/build.gradle

@@ -111,8 +111,8 @@ task fullJar(type: Jar) {
 	from(sourceSets.main.output) {
 		into "BOOT-INF/classes"
 	}
-	into("") {
+	from {
-		from(zipTree(configurations.loader.singleFile)) {
+		zipTree(configurations.loader.singleFile).matching {
 			exclude "META-INF/LICENSE.txt"
 			exclude "META-INF/NOTICE.txt"
 		}

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

@@ -11,9 +11,11 @@ def generatedResources = "${buildDir}/generated-resources/main"
 configurations {
 	loader {
 		extendsFrom dependencyManagement
+		transitive = false
 	}
 	jarmode {
 		extendsFrom dependencyManagement
+		transitive = false
 	}
 }
 
@@ -40,10 +42,11 @@ sourceSets {
 }
 
 task reproducibleLoaderJar(type: Jar) {
-	dependsOn configurations.loader
+	from {
-	from(zipTree(configurations.loader.incoming.files.filter {it.name.startsWith "spring-boot-loader" }.singleFile)) {
+		zipTree(configurations.loader.incoming.files.singleFile).matching {
-		exclude "META-INF/LICENSE.txt"
+			exclude "META-INF/LICENSE.txt"
-		exclude "META-INF/NOTICE.txt"
+			exclude "META-INF/NOTICE.txt"
+		}
 	}
 	reproducibleFileOrder = true
 	preserveFileTimestamps = false
@@ -52,10 +55,11 @@ task reproducibleLoaderJar(type: Jar) {
 }
 
 task reproducibleJarModeLayerToolsJar(type: Jar) {
-	dependsOn configurations.jarmode
+	from {
-	from(zipTree(configurations.jarmode.incoming.files.filter {it.name.startsWith "spring-boot-jarmode-layertools" }.singleFile)) {
+		zipTree(configurations.jarmode.incoming.files.singleFile).matching {
-		exclude "META-INF/LICENSE.txt"
+			exclude "META-INF/LICENSE.txt"
-		exclude "META-INF/NOTICE.txt"
+			exclude "META-INF/NOTICE.txt"
+		}
 	}
 	reproducibleFileOrder = true
 	preserveFileTimestamps = false

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

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