Merge branch '2.2.x'

Closes gh-19181
6 years ago · 60d563e88a
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeHealthIndicatorConfiguration.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeHealthIndicatorConfiguration.java
@ -34,7 +34,7 @@ import org.springframework.core.ResolvableType;
				@@ -34,7 +34,7 @@ import org.springframework.core.ResolvableType;
 * @param <S> the bean source type
 * @author Stephane Nicoll
 * @since 2.0.0
- * @deprecated since 2.0.0 in favor of {@link CompositeHealthContributorConfiguration}
+ * @deprecated since 2.2.0 in favor of {@link CompositeHealthContributorConfiguration}
 */
@Deprecated
 public abstract class CompositeHealthIndicatorConfiguration<H extends HealthIndicator, S> {