Merge branch '2.5.x' into 2.6.x

Author: wilkinsona

buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/github/StandardGitHubRepository.java

@@ -16,6 +16,7 @@
 
 package org.springframework.boot.build.bom.bomr.github;
 
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -52,14 +53,10 @@ public int openIssue(String title, String body, List<String> labels, Milestone m
 			requestBody.put("labels", labels);
 		}
 		requestBody.put("body", body);
-		try {
-			Thread.sleep(1000);
-		}
-		catch (InterruptedException ex) {
-			Thread.currentThread().interrupt();
-		}
 		try {
 			ResponseEntity<Map> response = this.rest.postForEntity("issues", requestBody, Map.class);
+			// See gh-30304
+			sleep(Duration.ofSeconds(3));
 			return (Integer) response.getBody().get("number");
 		}
 		catch (RestClientException ex) {
@@ -96,4 +93,13 @@ private <T> List<T> get(String name, Function<Map<String, Object>, T> mapper) {
 		return body.stream().map(mapper).collect(Collectors.toList());
 	}
 
+	private static void sleep(Duration duration) {
+		try {
+			Thread.sleep(duration.toMillis());
+		}
+		catch (InterruptedException ex) {
+			Thread.currentThread().interrupt();
+		}
+	}
+
 }