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-cli/build.gradle
+++ b/spring-boot-project/spring-boot-cli/build.gradle
@@ -107,8 +107,8 @@ task fullJar(type: Jar) {
 	from(sourceSets.main.output) {
 		into "BOOT-INF/classes"
 	}
-	into("") {
-		from(zipTree(configurations.loader.singleFile)) {
+	from {
+		zipTree(configurations.loader.singleFile).matching {
 			exclude "META-INF/LICENSE.txt"
 			exclude "META-INF/NOTICE.txt"
 		}