Merge branch '4.1.x'

Author: snicoll

module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConverters.java

@@ -53,10 +53,11 @@
  * @see #HttpMessageConverters(HttpMessageConverter...)
  * @see #HttpMessageConverters(Collection)
  * @see #getConverters()
- * @deprecated since 4.0 in favor of {@link ClientHttpMessageConvertersCustomizer} and
+ * @deprecated since 4.0.0 for removal in 4.2.0 in favor of
+ * {@link ClientHttpMessageConvertersCustomizer} and
  * {@link ServerHttpMessageConvertersCustomizer}.
  */
-@Deprecated(since = "4.0")
+@Deprecated(since = "4.0.0")
 public class HttpMessageConverters implements Iterable<HttpMessageConverter<?>> {
 
 	private static final List<Class<?>> NON_REPLACING_CONVERTERS;