Merge branch '2.0.x' into 2.1.x

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/Token.java

@@ -29,7 +29,7 @@ import org.springframework.util.StringUtils;
  * The JSON web token provided with each request that originates from Cloud Foundry.
  *
  * @author Madhura Bhave
- * @since 2.0.0
+ * @since 1.5.22
  */
 public class Token {
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java

@@ -40,7 +40,7 @@ import org.springframework.util.MultiValueMap;
  * Abstract base class for nested conditions.
  *
  * @author Phillip Webb
- * @since 2.0.1
+ * @since 1.5.22
  */
 public abstract class AbstractNestedCondition extends SpringBootCondition implements ConfigurationCondition {
 

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsMockMvcBuilderCustomizer.java

@@ -28,8 +28,9 @@ import org.springframework.test.web.servlet.setup.ConfigurableMockMvcBuilder;
  * A {@link MockMvcBuilderCustomizer} that configures Spring REST Docs.
  *
  * @author Andy Wilkinson
+ * @since 1.5.22
  */
-class RestDocsMockMvcBuilderCustomizer implements InitializingBean, MockMvcBuilderCustomizer {
+public class RestDocsMockMvcBuilderCustomizer implements InitializingBean, MockMvcBuilderCustomizer {
 
 	private final RestDocsProperties properties;
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java

@@ -39,9 +39,9 @@ import org.springframework.util.StringUtils;
  * @param <T> the type of {@link Filter} to register
  * @author Phillip Webb
  * @author Brian Clozel
- * @since 2.0.1
+ * @since 1.5.22
  */
-public abstract class AbstractFilterRegistrationBean<T extends Filter> extends DynamicRegistrationBean<Dynamic> {
+public abstract class AbstractFilterRegistrationBean extends RegistrationBean {
 
 	/**
 	 * Filters that wrap the servlet request should be ordered less than or equal to this.