Merge branch '2.5.x'

Closes gh-28746
2021-11-19 10:19:14 +00:00
parent 96eaef4290 f2b959b0a5
commit 00fa0fb769
5 changed files with 88 additions and 7 deletions
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -293,7 +293,9 @@ bom {
 		}
 		group("org.elasticsearch.distribution.integ-test-zip") {
 			modules = [
-				"elasticsearch"
+				"elasticsearch" {
+					type = 'zip'
+				}
 			]
 		}
 		group("org.elasticsearch.plugin") {