Merge branch '3.4.x'

Author: snicoll

buildSrc/src/main/java/org/springframework/boot/build/bom/CheckLinks.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.boot.build.bom;
 
-import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -31,9 +30,8 @@
 
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.web.client.DefaultResponseErrorHandler;
+import org.springframework.web.client.NoOpResponseErrorHandler;
 import org.springframework.web.client.RestTemplate;
 
 /**
@@ -57,7 +55,7 @@ void releaseNotes() {
 		CloseableHttpClient httpClient = HttpClients.custom().setDefaultRequestConfig(config).build();
 		HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
 		RestTemplate restTemplate = new RestTemplate(requestFactory);
-		restTemplate.setErrorHandler(new IgnoringErrorHandler());
+		restTemplate.setErrorHandler(new NoOpResponseErrorHandler());
 		for (Library library : this.bom.getLibraries()) {
 			library.getLinks().forEach((name, links) -> links.forEach((link) -> {
 				URI uri;
@@ -74,12 +72,4 @@ void releaseNotes() {
 		}
 	}
 
-	static class IgnoringErrorHandler extends DefaultResponseErrorHandler {
-
-		@Override
-		public void handleError(ClientHttpResponse response) throws IOException {
-		}
-
-	}
-
 }

spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/intTest/java/org/springframework/boot/context/embedded/EmbeddedServerContainerInvocationContextProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,12 +44,10 @@
 import org.junit.platform.commons.util.ReflectionUtils;
 
 import org.springframework.boot.testsupport.BuildOutput;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.util.FileSystemUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.web.client.ResponseErrorHandler;
+import org.springframework.web.client.NoOpResponseErrorHandler;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriTemplateHandler;
 
@@ -188,23 +186,7 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
 			RestTemplate rest = new RestTemplate(new HttpComponentsClientHttpRequestFactory(HttpClients.custom()
 				.setRetryStrategy(new DefaultHttpRequestRetryStrategy(10, TimeValue.of(1, TimeUnit.SECONDS)))
 				.build()));
-			rest.setErrorHandler(new ResponseErrorHandler() {
-
-				@Override
-				public boolean hasError(ClientHttpResponse response) throws IOException {
-					return false;
-				}
-
-				@Override
-				@SuppressWarnings("removal")
-				public void handleError(ClientHttpResponse response) throws IOException {
-				}
-
-				@Override
-				public void handleError(URI url, HttpMethod method, ClientHttpResponse response) throws IOException {
-				}
-
-			});
+			rest.setErrorHandler(new NoOpResponseErrorHandler());
 			rest.setUriTemplateHandler(new UriTemplateHandler() {
 
 				@Override