Merge branch '1.5.x' into 2.0.x

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/Assume.java

@@ -26,6 +26,7 @@ import org.springframework.util.ClassUtils;
  * skipped.
  *
  * @author Stephane Nicoll
+ * @since 2.0.0
  */
 public abstract class Assume {
 

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/assertj/Matched.java

@@ -28,6 +28,7 @@ import org.springframework.util.Assert;
  *
  * @param <T> the type of object that the condition accepts
  * @author Phillip Webb
+ * @since 2.0.0
  */
 public final class Matched<T> extends Condition<T> {
 

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/compiler/TestCompiler.java

@@ -37,6 +37,7 @@ import org.junit.rules.TemporaryFolder;
  * @author Stephane Nicoll
  * @author Phillip Webb
  * @author Andy Wilkinson
+ * @since 1.5.0
  */
 public class TestCompiler {
 

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/context/AbstractConfigurationClassTests.java

@@ -41,6 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * Abstract base class for {@code @Configuration} sanity checks.
  *
  * @author Andy Wilkinson
+ * @since 2.0.0
  */
 public abstract class AbstractConfigurationClassTests {
 

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/rule/OutputCapture.java

@@ -36,6 +36,7 @@ import static org.hamcrest.Matchers.allOf;
  *
  * @author Phillip Webb
  * @author Andy Wilkinson
+ * @since 2.0.0
  */
 public class OutputCapture implements TestRule {
 

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/runner/classpath/ClassPathExclusions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -28,6 +28,7 @@ import java.lang.annotation.Target;
  * from the classpath.
  *
  * @author Andy Wilkinson
+ * @since 1.5.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/runner/classpath/ClassPathOverrides.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -27,6 +27,7 @@ import java.lang.annotation.Target;
  * on the classpath.
  *
  * @author Andy Wilkinson
+ * @since 1.5.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/runner/classpath/ModifiedClassPathRunner.java

@@ -64,6 +64,7 @@ import org.springframework.util.StringUtils;
  * the thread context class loader while the test is being run.
  *
  * @author Andy Wilkinson
+ * @since 1.5.0
  */
 public class ModifiedClassPathRunner extends BlockJUnit4ClassRunner {
 

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/CassandraContainer.java

@@ -32,6 +32,7 @@ import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
  *
  * @author Andy Wilkinson
  * @author Madhura Bhave
+ * @since 2.0.0
  */
 public class CassandraContainer extends Container {
 

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Neo4jContainer.java

@@ -31,6 +31,7 @@ import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
  *
  * @author Andy Wilkinson
  * @author Madhura Bhave
+ * @since 2.0.0
  */
 public class Neo4jContainer extends Container {
 

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/RedisContainer.java

@@ -23,6 +23,7 @@ import org.testcontainers.containers.GenericContainer;
  *
  * @author Andy Wilkinson
  * @author Madhura Bhave
+ * @since 2.0.0
  */
 public class RedisContainer extends Container {
 

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/web/servlet/ExampleFilter.java

@@ -29,6 +29,7 @@ import javax.servlet.ServletResponse;
  * Simple example Filter used for testing.
  *
  * @author Phillip Webb
+ * @since 2.0.0
  */
 public class ExampleFilter implements Filter {
 

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/web/servlet/ExampleServlet.java

@@ -30,6 +30,7 @@ import org.springframework.util.StreamUtils;
  * Simple example Servlet used for testing.
  *
  * @author Phillip Webb
+ * @since 2.0.0
  */
 @SuppressWarnings("serial")
 public class ExampleServlet extends GenericServlet {

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/web/servlet/MockServletWebServer.java

@@ -43,6 +43,7 @@ import static org.mockito.Mockito.mock;
  *
  * @author Phillip Webb
  * @author Andy Wilkinson
+ * @since 2.0.0
  */
 public abstract class MockServletWebServer {