Merge branch '1.5.x' into 2.0.x

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabase.java

@@ -35,6 +35,7 @@ import org.springframework.boot.test.autoconfigure.properties.SkipPropertyMappin
  * instead of any application defined or auto-configured {@link DataSource}.
  *
  * @author Phillip Webb
+ * @since 1.5.0
  * @see TestDatabaseAutoConfiguration
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTest.java

@@ -54,6 +54,7 @@ import org.springframework.transaction.annotation.Transactional;
  * annotation.
  *
  * @author Stephane Nicoll
+ * @since 1.5.0
  * @see AutoConfigureJdbc
  * @see AutoConfigureTestDatabase
  * @see AutoConfigureCache

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestEntityManager.java

@@ -30,6 +30,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
  * {@link TestEntityManager}.
  *
  * @author Phillip Webb
+ * @since 1.4.0
  * @see TestEntityManagerAutoConfiguration
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTest.java

@@ -56,6 +56,7 @@ import org.springframework.transaction.annotation.Transactional;
  * annotation.
  *
  * @author Phillip Webb
+ * @since 1.4.0
  * @see AutoConfigureDataJpa
  * @see AutoConfigureTestDatabase
  * @see AutoConfigureTestEntityManager