Merge branch '2.3.x' into 2.4.x

See gh-25836
2021-03-30 20:52:15 +01:00
parent 38a4f135a9 e94f8bba62
commit 563b8a8cec
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
@@ -103,6 +103,7 @@ test {
 }

 task fullJar(type: Jar) {
+	dependsOn configurations.loader
 	classifier = "full"
 	entryCompression = "stored"
 	from(configurations.runtimeClasspath) {
--- 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
@@ -42,6 +42,7 @@ sourceSets {
 }

 task reproducibleLoaderJar(type: Jar) {
+	dependsOn configurations.loader
 	from {
 		zipTree(configurations.loader.incoming.files.singleFile).matching {
 			exclude "META-INF/LICENSE.txt"
@@ -55,6 +56,7 @@ task reproducibleLoaderJar(type: Jar) {
 }

 task reproducibleJarModeLayerToolsJar(type: Jar) {
+	dependsOn configurations.jarmode
 	from {
 		zipTree(configurations.jarmode.incoming.files.singleFile).matching {
 			exclude "META-INF/LICENSE.txt"