Merge branch '1.5.x' into 2.0.x

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

@@ -40,6 +40,7 @@ import org.springframework.util.Assert;
  * (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 @@ import java.util.List;
  *
  * @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 @@ import org.springframework.util.Assert;
  * @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 @@ import org.springframework.util.Assert;
  * 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 @@ import org.springframework.boot.actuate.audit.AuditEventRepository;
  * @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 @@ import org.springframework.util.Assert;
  * 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 @@ import org.springframework.util.StringUtils;
  * 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 @@ import org.springframework.util.Assert;
  * 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 @@ package org.springframework.boot.actuate.health;
  *
  * @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 @@ package org.springframework.boot.actuate.health;
  * 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 @@ import org.springframework.util.Assert;
  *
  * @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 @@ import org.springframework.web.util.UriTemplateHandler;
  *
  * @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 @@ import org.springframework.util.ClassUtils;
  *
  * @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 @@ import org.springframework.security.access.event.AuthorizationFailureEvent;
  *
  * @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 @@ import org.springframework.web.context.WebApplicationContext;
  * 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.