Merge branch '3.1.x' into 3.2.x

wilkinsona · wilkinsona · commit 17819c02b77e · 2024-01-15T19:45:20.000Z
Closes gh-39139
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle
@@ -49,6 +49,7 @@ task downloadJdk(type: Download) {
 	dest destFolder
 	tempAndMove true
 	overwrite false
+	retries 3
 }
 
 task syncJdkDownloads(type: Sync) {
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle
@@ -64,6 +64,7 @@ task downloadJdk(type: Download) {
 	dest destFolder
 	tempAndMove true
 	overwrite false
+	retries 3
 }
 
 task syncJdkDownloads(type: Sync) {

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ task downloadJdk(type: Download) {`
`49`	`49`	`dest destFolder`
`50`	`50`	`tempAndMove true`
`51`	`51`	`overwrite false`
	`52`	`+ retries 3`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`task syncJdkDownloads(type: Sync) {`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ task downloadJdk(type: Download) {`
`64`	`64`	`dest destFolder`
`65`	`65`	`tempAndMove true`
`66`	`66`	`overwrite false`
	`67`	`+ retries 3`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`task syncJdkDownloads(type: Sync) {`