Merge branch '2.1.x'

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java

@@ -76,6 +76,7 @@ import org.springframework.web.context.support.GenericWebApplicationContext;
  * @author Andy Wilkinson
  * @author Stephane Nicoll
  * @author Madhura Bhave
+ * @since 1.4.0
  * @see SpringBootTest
  */
 public class SpringBootContextLoader extends AbstractContextLoader {

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssertProvider.java

@@ -43,6 +43,7 @@ import org.springframework.util.Assert;
  *
  * @param <C> the application context type
  * @author Phillip Webb
+ * @since 2.0.0
  * @see AssertableApplicationContext
  * @see AssertableWebApplicationContext
  * @see AssertableReactiveWebApplicationContext

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java

@@ -38,7 +38,6 @@ import org.springframework.util.ClassUtils;
  * @author Madhura Bhave
  * @author Phillip Webb
  * @author Andy Wilkinson
- * @since 2.2.0
  * @see OutputCaptureExtension
  * @see OutputCaptureRule
  */