Merge branch '2.7.x' into main

4 years ago · 85ea6a1b8f
2 changed files with 3 additions and 0 deletions
--- a/spring-boot-project/spring-boot-cli/build.gradle
+++ b/spring-boot-project/spring-boot-cli/build.gradle
@ -116,6 +116,7 @@ task fullJar(type: Jar) {
				@@ -116,6 +116,7 @@ task fullJar(type: Jar) {
 		zipTree(configurations.loader.singleFile).matching {
 			exclude "META-INF/LICENSE.txt"
 			exclude "META-INF/NOTICE.txt"
+			exclude "META-INF/spring-boot.properties"
 		}
 	}
 	manifest {
--- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle
@ -41,6 +41,7 @@ task reproducibleLoaderJar(type: Jar) {
				@@ -41,6 +41,7 @@ task reproducibleLoaderJar(type: Jar) {
 		zipTree(configurations.loader.incoming.files.singleFile).matching {
 			exclude "META-INF/LICENSE.txt"
 			exclude "META-INF/NOTICE.txt"
+			exclude "META-INF/spring-boot.properties"
 		}
 	}
 	reproducibleFileOrder = true
@ -55,6 +56,7 @@ task reproducibleJarModeLayerToolsJar(type: Jar) {
				@@ -55,6 +56,7 @@ task reproducibleJarModeLayerToolsJar(type: Jar) {
 		zipTree(configurations.jarmode.incoming.files.singleFile).matching {
 			exclude "META-INF/LICENSE.txt"
 			exclude "META-INF/NOTICE.txt"
+			exclude "META-INF/spring-boot.properties"
 		}
 	}
 	reproducibleFileOrder = true