Merge branch '1.5.x' into 2.0.x

Author: philwebb

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointProperties.java

@@ -27,6 +27,7 @@
  * Configuration properties for {@link HealthEndpoint}.
  *
  * @author Phillip Webb
+ * @since 2.0.0
  */
 @ConfigurationProperties("management.endpoint.health")
 public class HealthEndpointProperties {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java

@@ -40,6 +40,7 @@
  * (wrappers for AuditEvent).
  *
  * @author Dave Syer
+ * @since 1.0.0
  * @see AuditEventRepository
  */
 @JsonInclude(Include.NON_EMPTY)

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEventRepository.java

@@ -24,6 +24,7 @@
  *
  * @author Dave Syer
  * @author Vedran Pavic
+ * @since 1.0.0
  */
 public interface AuditEventRepository {
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java

@@ -28,6 +28,7 @@
  * @author Dave Syer
  * @author Phillip Webb
  * @author Vedran Pavic
+ * @since 1.0.0
  */
 public class InMemoryAuditEventRepository implements AuditEventRepository {
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditApplicationEvent.java

@@ -27,6 +27,7 @@
  * Spring {@link ApplicationEvent} to encapsulate {@link AuditEvent}s.
  *
  * @author Dave Syer
+ * @since 1.0.0
  */
 public class AuditApplicationEvent extends ApplicationEvent {
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditListener.java

@@ -29,6 +29,7 @@
  * @author Dave Syer
  * @author Stephane Nicoll
  * @author Vedran Pavic
+ * @since 1.0.0
  */
 public class AuditListener extends AbstractAuditListener {
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/DiscovererEndpointFilter.java

@@ -24,6 +24,7 @@
  * the endpoint.
  *
  * @author Phillip Webb
+ * @since 2.0.0
  */
 public abstract class DiscovererEndpointFilter implements EndpointFilter<DiscoveredEndpoint<?>> {
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/EndpointServlet.java

@@ -30,6 +30,7 @@
  * Contains details of a servlet that is exposed as an actuator endpoint.
  *
  * @author Phillip Webb
+ * @since 2.0.0
  */
 public final class EndpointServlet {
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/PathMappedEndpoints.java

@@ -33,6 +33,7 @@
  * A collection of {@link PathMappedEndpoint path mapped endpoints}.
  *
  * @author Phillip Webb
+ * @since 2.0.0
  */
 public class PathMappedEndpoints implements Iterable<PathMappedEndpoint> {
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ApplicationHealthIndicator.java

@@ -21,6 +21,7 @@
  *
  * @author Dave Syer
  * @author Christian Dupuis
+ * @since 1.2.0
  * @see Status#UP
  */
 public class ApplicationHealthIndicator extends AbstractHealthIndicator {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicator.java

@@ -20,6 +20,7 @@
  * Strategy interface used to provide an indication of application health.
  *
  * @author Dave Syer
+ * @since 1.0.0
  * @see ApplicationHealthIndicator
  */
 @FunctionalInterface

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/ldap/LdapHealthIndicator.java

@@ -31,7 +31,7 @@
  *
  * @author Eddú Meléndez
  * @author Stephane Nicoll
- * @version 2.0.0
+ * @since 2.0.0
  */
 public class LdapHealthIndicator extends AbstractHealthIndicator {
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsClientHttpRequestInterceptor.java

@@ -37,7 +37,6 @@
  *
  * @author Jon Schneider
  * @author Phillip Webb
- * @since 2.0.0
  */
 class MetricsClientHttpRequestInterceptor implements ClientHttpRequestInterceptor {
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthenticationAuditListener.java

@@ -31,6 +31,7 @@
  *
  * @author Dave Syer
  * @author Vedran Pavic
+ * @since 1.0.0
  */
 public class AuthenticationAuditListener extends AbstractAuthenticationAuditListener {
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java

@@ -29,6 +29,7 @@
  *
  * @author Dave Syer
  * @author Vedran Pavic
+ * @since 1.0.0
  */
 public class AuthorizationAuditListener extends AbstractAuthorizationAuditListener {
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/ServletsMappingDescriptionProvider.java

@@ -32,7 +32,7 @@
  * Servlets} registered with a {@link ServletContext}.
  *
  * @author Andy Wilkinson
- * @since 2.0
+ * @since 2.0.0
  */
 public class ServletsMappingDescriptionProvider implements MappingDescriptionProvider {
 

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/TestExposableJmxEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 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.

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

@@ -45,6 +45,7 @@
  * @author Phillip Webb
  * @author Dave Syer
  * @author Oliver Gierke
+ * @since 1.0.0
  */
 public abstract class AutoConfigurationPackages {
 

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

@@ -27,6 +27,7 @@
  * after other specified auto-configuration classes.
  *
  * @author Phillip Webb
+ * @since 1.0.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE })

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

@@ -27,6 +27,7 @@
  * before other specified auto-configuration classes.
  *
  * @author Phillip Webb
+ * @since 1.0.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE })

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.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.
@@ -66,6 +66,7 @@
  *
  * @author Phillip Webb
  * @author Stephane Nicoll
+ * @since 1.0.0
  * @see ConditionalOnBean
  * @see ConditionalOnMissingBean
  * @see ConditionalOnClass

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

@@ -44,7 +44,6 @@
  * {@link ConfigurationClassPostProcessor} and Spring Boot.
  *
  * @author Phillip Webb
- * @since 1.4.0
  */
 class SharedMetadataReaderFactoryContextInitializer
 		implements ApplicationContextInitializer<ConfigurableApplicationContext> {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/DirectRabbitListenerContainerFactoryConfigurer.java

@@ -26,7 +26,7 @@
  *
  * @author Gary Russell
  * @author Stephane Nicoll
- * @since 2.0
+ * @since 2.0.0
  */
 public final class DirectRabbitListenerContainerFactoryConfigurer
 		extends AbstractRabbitListenerContainerFactoryConfigurer<DirectRabbitListenerContainerFactory> {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java

@@ -35,7 +35,6 @@
  *
  * @author Stephane Nicoll
  * @author Josh Thornhill
- * @since 1.2.0
  */
 @Configuration
 @ConditionalOnClass(EnableRabbit.class)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java

@@ -83,6 +83,7 @@
  * @author Stephane Nicoll
  * @author Gary Russell
  * @author Phillip Webb
+ * @since 1.0.0
  */
 @Configuration
 @ConditionalOnClass({ RabbitTemplate.class, Channel.class })

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java

@@ -37,6 +37,7 @@
  * @author Andy Wilkinson
  * @author Josh Thornhill
  * @author Gary Russell
+ * @since 1.0.0
  */
 @ConfigurationProperties(prefix = "spring.rabbitmq")
 public class RabbitProperties {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java

@@ -37,6 +37,7 @@
  *
  * @author Dave Syer
  * @author Josh Long
+ * @since 1.0.0
  * @see EnableAspectJAutoProxy
  */
 @Configuration

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BasicBatchConfigurer.java

@@ -38,6 +38,7 @@
  * @author Andy Wilkinson
  * @author Kazuki Shimizu
  * @author Stephane Nicoll
+ * @since 1.0.0
  */
 public class BasicBatchConfigurer implements BatchConfigurer {
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java

@@ -57,6 +57,7 @@
  * @author Eddú Meléndez
  * @author Kazuki Shimizu
  * @author Mahmoud Ben Hassine
+ * @since 1.0.0
  */
 @Configuration
 @ConditionalOnClass({ JobLauncher.class, DataSource.class, JdbcOperations.class })

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceInitializer.java

@@ -28,6 +28,7 @@
  *
  * @author Dave Syer
  * @author Vedran Pavic
+ * @since 1.0.0
  */
 public class BatchDataSourceInitializer extends AbstractDataSourceInitializer {
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobExecutionEvent.java

@@ -23,6 +23,7 @@
  * Spring {@link ApplicationEvent} encapsulating a {@link JobExecution}.
  *
  * @author Dave Syer
+ * @since 1.0.0
  */
 @SuppressWarnings("serial")
 public class JobExecutionEvent extends ApplicationEvent {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobExecutionExitCodeGenerator.java

@@ -27,6 +27,7 @@
  * {@link ExitCodeGenerator} for {@link JobExecutionEvent}s.
  *
  * @author Dave Syer
+ * @since 1.0.0
  */
 public class JobExecutionExitCodeGenerator implements ApplicationListener<JobExecutionEvent>, ExitCodeGenerator {
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java

@@ -63,6 +63,7 @@
  * @author Dave Syer
  * @author Jean-Pierre Bergamin
  * @author Mahmoud Ben Hassine
+ * @since 1.0.0
  */
 public class JobLauncherCommandLineRunner implements CommandLineRunner, Ordered, ApplicationEventPublisherAware {
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JpaBatchConfigurer.java

@@ -30,6 +30,7 @@
  * A {@link BasicBatchConfigurer} tailored for JPA.
  *
  * @author Stephane Nicoll
+ * @since 2.0.0
  */
 public class JpaBatchConfigurer extends BasicBatchConfigurer {
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheCondition.java

@@ -34,7 +34,6 @@
  * @author Stephane Nicoll
  * @author Phillip Webb
  * @author Madhura Bhave
- * @since 1.3.0
  */
 class CacheCondition extends SpringBootCondition {
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CaffeineCacheConfiguration.java

@@ -37,7 +37,6 @@
  * Caffeine cache configuration.
  *
  * @author Eddú Meléndez
- * @since 1.4.0
  */
 @Configuration
 @ConditionalOnClass({ Caffeine.class, CaffeineCacheManager.class })

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/EhCacheCacheConfiguration.java

@@ -36,7 +36,6 @@
  * @author Eddú Meléndez
  * @author Stephane Nicoll
  * @author Madhura Bhave
- * @since 1.3.0
  */
 @Configuration
 @ConditionalOnClass({ Cache.class, EhCacheCacheManager.class })

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/GenericCacheConfiguration.java

@@ -32,7 +32,6 @@
  * context.
  *
  * @author Stephane Nicoll
- * @since 1.3.0
  */
 @Configuration
 @ConditionalOnBean(Cache.class)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/HazelcastCacheConfiguration.java

@@ -40,7 +40,6 @@
  * default {@link HazelcastInstance} is still made, using the same defaults.
  *
  * @author Stephane Nicoll
- * @since 1.3.0
  * @see HazelcastConfigResourceCondition
  */
 @Configuration

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java

@@ -54,7 +54,6 @@
  *
  * @author Stephane Nicoll
  * @author Madhura Bhave
- * @since 1.3.0
  */
 @Configuration
 @ConditionalOnClass({ Caching.class, JCacheCacheManager.class })

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/NoOpCacheConfiguration.java

@@ -27,7 +27,6 @@
  * No-op cache configuration used to disable caching via configuration.
  *
  * @author Stephane Nicoll
- * @since 1.3.0
  */
 @Configuration
 @ConditionalOnMissingBean(CacheManager.class)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/RedisCacheConfiguration.java

@@ -43,7 +43,6 @@
  * @author Stephane Nicoll
  * @author Mark Paluch
  * @author Ryon Day
- * @since 1.3.0
  */
 @Configuration
 @ConditionalOnClass(RedisConnectionFactory.class)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/SimpleCacheConfiguration.java

@@ -29,7 +29,6 @@
  * Simplest cache configuration, usually used as a fallback.
  *
  * @author Stephane Nicoll
- * @since 1.3.0
  */
 @Configuration
 @ConditionalOnMissingBean(CacheManager.class)

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

@@ -62,7 +62,6 @@
  *
  * @author Phillip Webb
  * @author Andy Wilkinson
- * @since 1.2.0
  */
 final class BeanTypeRegistry implements SmartInitializingSingleton {
 

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

@@ -43,6 +43,7 @@
  * @author Dave Syer
  * @author Phillip Webb
  * @author Andy Wilkinson
+ * @since 1.0.0
  */
 public final class ConditionEvaluationReport {
 

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

@@ -23,6 +23,7 @@
  * Outcome for a condition match, including log message.
  *
  * @author Phillip Webb
+ * @since 1.0.0
  * @see ConditionMessage
  */
 public class ConditionOutcome {

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

@@ -55,6 +55,7 @@
  * another auto-configuration, make sure that the one using this condition runs after.
  *
  * @author Phillip Webb
+ * @since 1.0.0
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)

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

@@ -34,6 +34,7 @@
  * matches the {@link #value target of the condition}.
  *
  * @author Phillip Webb
+ * @since 1.0.0
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)