Merge branch '2.3.x' into 2.4.x

Closes gh-25140

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

@@ -108,7 +108,10 @@ task fullJar(type: Jar) {
 		into "BOOT-INF/classes"
 	}
 	into("") {
-		from zipTree(configurations.loader.singleFile)
+		from(zipTree(configurations.loader.singleFile)) {
+			exclude "META-INF/LICENSE.txt"
+			exclude "META-INF/NOTICE.txt"
+		}
 	}
 	manifest {
 		attributes(

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

@@ -41,8 +41,9 @@ 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.filter {it.name.startsWith "spring-boot-loader" }.singleFile)
+		exclude "META-INF/LICENSE.txt"
+		exclude "META-INF/NOTICE.txt"
 	}
 	reproducibleFileOrder = true
 	preserveFileTimestamps = false
@@ -52,8 +53,9 @@ 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.filter {it.name.startsWith "spring-boot-jarmode-layertools" }.singleFile)
+		exclude "META-INF/LICENSE.txt"
+		exclude "META-INF/NOTICE.txt"
 	}
 	reproducibleFileOrder = true
 	preserveFileTimestamps = false