Merge branch '1.5.x' into 2.0.x

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/CommandLineRunner.java

@@ -29,6 +29,7 @@ import org.springframework.core.annotation.Order;
  * consider using {@link ApplicationRunner}.
  *
  * @author Dave Syer
+ * @since 1.0.0
  * @see ApplicationRunner
  */
 @FunctionalInterface

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ExitCodeGenerator.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.
@@ -21,6 +21,7 @@ package org.springframework.boot;
  * {@link SpringApplication}. Can be used on exceptions as well as directly on beans.
  *
  * @author Dave Syer
+ * @since 1.0.0
  * @see SpringApplication#exit(org.springframework.context.ApplicationContext,
  * ExitCodeGenerator...)
  */

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java

@@ -147,6 +147,7 @@ import org.springframework.web.context.support.StandardServletEnvironment;
  * @author Madhura Bhave
  * @author Brian Clozel
  * @author Ethan Rubinson
+ * @since 1.0.0
  * @see #run(Class, String[])
  * @see #run(Class[], String[])
  * @see #SpringApplication(Class...)

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListener.java

@@ -31,6 +31,7 @@ import org.springframework.core.io.support.SpringFactoriesLoader;
  * @author Phillip Webb
  * @author Dave Syer
  * @author Andy Wilkinson
+ * @since 1.0.0
  */
 public interface SpringApplicationRunListener {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiElement.java

@@ -20,6 +20,7 @@ package org.springframework.boot.ansi;
  * An ANSI encodable element.
  *
  * @author Phillip Webb
+ * @since 1.0.0
  */
 public interface AnsiElement {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiOutput.java

@@ -25,6 +25,7 @@ import org.springframework.util.Assert;
  * supports ANSI.
  *
  * @author Phillip Webb
+ * @since 1.0.0
  */
 public abstract class AnsiOutput {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/ParentContextApplicationContextInitializer.java

@@ -30,6 +30,7 @@ import org.springframework.core.Ordered;
  * listeners that the context is available and has a parent.
  *
  * @author Dave Syer
+ * @since 1.0.0
  */
 public class ParentContextApplicationContextInitializer
 		implements ApplicationContextInitializer<ConfigurableApplicationContext>, Ordered {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/ParentContextCloserApplicationListener.java

@@ -35,6 +35,7 @@ import org.springframework.util.ObjectUtils;
  *
  * @author Dave Syer
  * @author Eric Bottard
+ * @since 1.0.0
  */
 public class ParentContextCloserApplicationListener
 		implements ApplicationListener<ParentContextAvailableEvent>, ApplicationContextAware, Ordered {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java

@@ -62,6 +62,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Dave Syer
  * @author Andy Wilkinson
+ * @since 1.0.0
  * @see SpringApplication
  */
 public class SpringApplicationBuilder {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java

@@ -87,6 +87,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Dave Syer
  * @author Andy Wilkinson
+ * @since 1.3.0
  */
 public class CloudFoundryVcapEnvironmentPostProcessor implements EnvironmentPostProcessor, Ordered {
 

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

@@ -33,6 +33,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Dave Syer
  * @author Andy Wilkinson
+ * @since 1.0.0
  */
 public class ContextIdApplicationContextInitializer
 		implements ApplicationContextInitializer<ConfigurableApplicationContext>, Ordered {

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

@@ -43,6 +43,7 @@ import org.springframework.core.env.ConfigurableEnvironment;
  *
  * @author Dave Syer
  * @author Madhura Bhave
+ * @since 1.0.0
  */
 public class FileEncodingApplicationListener
 		implements ApplicationListener<ApplicationEnvironmentPreparedEvent>, Ordered {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java

@@ -97,6 +97,7 @@ import org.springframework.util.StringUtils;
  * @author Andy Wilkinson
  * @author Eddú Meléndez
  * @author Madhura Bhave
+ * @since 1.0.0
  */
 public class ConfigFileApplicationListener implements EnvironmentPostProcessor, SmartApplicationListener, Ordered {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java

@@ -37,6 +37,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Dave Syer
  * @author Phillip Webb
+ * @since 1.0.0
  */
 public class DelegatingApplicationContextInitializer
 		implements ApplicationContextInitializer<ConfigurableApplicationContext>, Ordered {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationListener.java

@@ -39,6 +39,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Dave Syer
  * @author Phillip Webb
+ * @since 1.0.0
  */
 public class DelegatingApplicationListener implements ApplicationListener<ApplicationEvent>, Ordered {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationEnvironmentPreparedEvent.java

@@ -25,6 +25,7 @@ import org.springframework.core.env.Environment;
  * {@link Environment} is first available for inspection and modification.
  *
  * @author Dave Syer
+ * @since 1.0.0
  */
 @SuppressWarnings("serial")
 public class ApplicationEnvironmentPreparedEvent extends SpringApplicationEvent {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationFailedEvent.java

@@ -23,6 +23,7 @@ import org.springframework.context.ConfigurableApplicationContext;
  * Event published by a {@link SpringApplication} when it fails to start.
  *
  * @author Dave Syer
+ * @since 1.0.0
  * @see ApplicationReadyEvent
  */
 @SuppressWarnings("serial")

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationPreparedEvent.java

@@ -27,6 +27,7 @@ import org.springframework.core.env.Environment;
  * will be loaded and the {@link Environment} is ready for use at this stage.
  *
  * @author Dave Syer
+ * @since 1.0.0
  */
 @SuppressWarnings("serial")
 public class ApplicationPreparedEvent extends SpringApplicationEvent {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/EventPublishingRunListener.java

@@ -40,6 +40,7 @@ import org.springframework.util.ErrorHandler;
  * @author Phillip Webb
  * @author Stephane Nicoll
  * @author Andy Wilkinson
+ * @since 1.0.0
  */
 public class EventPublishingRunListener implements SpringApplicationRunListener, Ordered {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/SpringApplicationEvent.java

@@ -23,6 +23,7 @@ import org.springframework.context.ApplicationEvent;
  * Base class for {@link ApplicationEvent} related to a {@link SpringApplication}.
  *
  * @author Phillip Webb
+ * @since 1.0.0
  */
 @SuppressWarnings("serial")
 public abstract class SpringApplicationEvent extends ApplicationEvent {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationProperties.java

@@ -33,6 +33,7 @@ import org.springframework.core.annotation.AliasFor;
  * values are externalized.
  *
  * @author Dave Syer
+ * @since 1.0.0
  * @see ConfigurationPropertiesBindingPostProcessor
  * @see EnableConfigurationProperties
  */

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBinding.java

@@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
  * {@link ConfigurationProperties} (e.g. Converters).
  *
  * @author Dave Syer
+ * @since 1.3.0
  */
 @Qualifier
 @Target({ ElementType.TYPE, ElementType.METHOD })

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java

@@ -41,6 +41,7 @@ import org.springframework.validation.annotation.Validated;
  * @author Christian Dupuis
  * @author Stephane Nicoll
  * @author Madhura Bhave
+ * @since 1.0.0
  */
 public class ConfigurationPropertiesBindingPostProcessor
 		implements BeanPostProcessor, PriorityOrdered, ApplicationContextAware, InitializingBean {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java

@@ -28,6 +28,7 @@ import org.springframework.core.type.AnnotationMetadata;
  *
  * @author Dave Syer
  * @author Phillip Webb
+ * @since 1.0.0
  */
 public class ConfigurationPropertiesBindingPostProcessorRegistrar implements ImportBeanDefinitionRegistrar {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationProperties.java

@@ -32,6 +32,7 @@ import org.springframework.context.annotation.Import;
  * directly on this annotation.
  *
  * @author Dave Syer
+ * @since 1.0.0
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/MapConfigurationPropertySource.java

@@ -26,11 +26,12 @@ import org.springframework.core.env.MapPropertySource;
 import org.springframework.util.Assert;
 
 /**
- * An {@link ConfigurationPropertySource} backed by a {@link Map} and using standard name
+ * A {@link ConfigurationPropertySource} backed by a {@link Map} and using standard name
  * mapping rules.
  *
  * @author Phillip Webb
  * @author Madhura Bhave
+ * @since 2.0.0
  */
 public class MapConfigurationPropertySource implements IterableConfigurationPropertySource {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzer.java

@@ -29,6 +29,7 @@ import org.springframework.boot.diagnostics.FailureAnalysis;
  * {@link BeanNotOfRequiredTypeException}.
  *
  * @author Andy Wilkinson
+ * @since 1.4.0
  */
 public class BeanNotOfRequiredTypeFailureAnalyzer extends AbstractFailureAnalyzer<BeanNotOfRequiredTypeException> {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/PropertiesPropertySourceLoader.java

@@ -31,6 +31,7 @@ import org.springframework.core.io.support.PropertiesLoaderUtils;
  * @author Dave Syer
  * @author Phillip Webb
  * @author Madhura Bhave
+ * @since 1.0.0
  */
 public class PropertiesPropertySourceLoader implements PropertySourceLoader {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/PropertySourceLoader.java

@@ -29,6 +29,7 @@ import org.springframework.core.io.support.SpringFactoriesLoader;
  *
  * @author Dave Syer
  * @author Phillip Webb
+ * @since 1.0.0
  */
 public interface PropertySourceLoader {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/RandomValuePropertySource.java

@@ -49,6 +49,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Dave Syer
  * @author Matt Benson
+ * @since 1.0.0
  */
 public class RandomValuePropertySource extends PropertySource<Random> {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/YamlPropertySourceLoader.java

@@ -32,6 +32,7 @@ import org.springframework.util.ClassUtils;
  * @author Dave Syer
  * @author Phillip Webb
  * @author Andy Wilkinson
+ * @since 1.0.0
  */
 public class YamlPropertySourceLoader implements PropertySourceLoader {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java

@@ -35,6 +35,7 @@ import org.springframework.util.ClassUtils;
  * @author Phillip Webb
  * @author Dave Syer
  * @author Stephane Nicoll
+ * @since 1.0.0
  * @see #get(ClassLoader)
  */
 public enum EmbeddedDatabaseConnection {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/JacksonJsonParser.java

@@ -26,6 +26,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  * Thin wrapper to adapt Jackson 2 {@link ObjectMapper} to {@link JsonParser}.
  *
  * @author Dave Syer
+ * @since 1.0.0
  * @see JsonParserFactory
  */
 public class JacksonJsonParser extends AbstractJsonParser {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/JsonParser.java

@@ -23,6 +23,7 @@ import java.util.Map;
  * Parser that can read JSON formatted strings into {@link Map}s or {@link List}s.
  *
  * @author Dave Syer
+ * @since 1.0.0
  * @see JsonParserFactory
  * @see BasicJsonParser
  * @see JacksonJsonParser

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/JsonParserFactory.java

@@ -22,6 +22,7 @@ import org.springframework.util.ClassUtils;
  * Factory to create a {@link JsonParser}.
  *
  * @author Dave Syer
+ * @since 1.0.0
  * @see JacksonJsonParser
  * @see GsonJsonParser
  * @see YamlJsonParser

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/YamlJsonParser.java

@@ -26,6 +26,7 @@ import org.yaml.snakeyaml.Yaml;
  *
  * @author Dave Syer
  * @author Jean de Klerk
+ * @since 1.0.0
  * @see JsonParserFactory
  */
 public class YamlJsonParser extends AbstractJsonParser {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/liquibase/LiquibaseServiceLocatorApplicationListener.java

@@ -31,6 +31,7 @@ import org.springframework.util.ClassUtils;
  *
  * @author Phillip Webb
  * @author Dave Syer
+ * @since 1.0.0
  */
 public class LiquibaseServiceLocatorApplicationListener implements ApplicationListener<ApplicationStartingEvent> {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/liquibase/SpringPackageScanClassResolver.java

@@ -36,6 +36,7 @@ import org.springframework.util.ClassUtils;
  * executable JARs.
  *
  * @author Phillip Webb
+ * @since 1.0.0
  */
 public class SpringPackageScanClassResolver extends DefaultPackageScanClassResolver {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java

@@ -34,6 +34,7 @@ import org.springframework.util.SystemPropertyUtils;
  *
  * @author Phillip Webb
  * @author Dave Syer
+ * @since 1.0.0
  */
 public abstract class AbstractLoggingSystem extends LoggingSystem {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LogLevel.java

@@ -20,6 +20,7 @@ package org.springframework.boot.logging;
  * Logging levels supported by a {@link LoggingSystem}.
  *
  * @author Phillip Webb
+ * @since 1.0.0
  */
 public enum LogLevel {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java

@@ -33,6 +33,7 @@ import org.springframework.util.StringUtils;
  * @author Dave Syer
  * @author Andy Wilkinson
  * @author Ben Hale
+ * @since 1.0.0
  */
 public abstract class LoggingSystem {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java

@@ -45,6 +45,7 @@ import org.springframework.util.StringUtils;
  * @author Dave Syer
  * @author Andy Wilkinson
  * @author Ben Hale
+ * @since 1.0.0
  */
 public class JavaLoggingSystem extends AbstractLoggingSystem {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/java/SimpleFormatter.java

@@ -28,6 +28,7 @@ import org.springframework.boot.logging.LoggingSystemProperties;
  * Simple 'Java Logging' {@link Formatter}.
  *
  * @author Phillip Webb
+ * @since 1.0.0
  */
 public class SimpleFormatter extends Formatter {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/ColorConverter.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.
@@ -35,6 +35,7 @@ import org.springframework.boot.ansi.AnsiStyle;
  * be picked based on the logging level.
  *
  * @author Phillip Webb
+ * @since 1.0.0
  */
 public class ColorConverter extends CompositeConverter<ILoggingEvent> {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java

@@ -45,7 +45,6 @@ import org.springframework.util.ReflectionUtils;
  * @author Phillip Webb
  * @author Madhura Bhave
  * @author Vedran Pavic
- * @since 1.1.2
  */
 class DefaultLogbackConfiguration {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackConfigurator.java

@@ -36,7 +36,6 @@ import org.springframework.util.Assert;
  * Allows programmatic configuration of logback which is usually faster than parsing XML.
  *
  * @author Phillip Webb
- * @since 1.2.0
  */
 class LogbackConfigurator {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java

@@ -59,6 +59,7 @@ import org.springframework.util.StringUtils;
  * @author Dave Syer
  * @author Andy Wilkinson
  * @author Ben Hale
+ * @since 1.0.0
  */
 public class LogbackLoggingSystem extends Slf4JLoggingSystem {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/WhitespaceThrowableProxyConverter.java

@@ -25,6 +25,7 @@ import ch.qos.logback.core.CoreConstants;
  * trace.
  *
  * @author Phillip Webb
+ * @since 1.0.0
  */
 public class WhitespaceThrowableProxyConverter extends ThrowableProxyConverter {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/validation/MessageInterpolatorFactory.java

@@ -35,6 +35,7 @@ import org.springframework.util.ClassUtils;
  * classpath.
  *
  * @author Phillip Webb
+ * @since 1.5.0
  */
 public class MessageInterpolatorFactory implements ObjectFactory<MessageInterpolator> {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/SslServerCustomizer.java

@@ -36,6 +36,7 @@ import org.springframework.util.ResourceUtils;
  * instance.
  *
  * @author Brian Clozel
+ * @since 2.0.0
  */
 public class SslServerCustomizer implements NettyServerCustomizer {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/ErrorAttributes.java

@@ -26,7 +26,7 @@ import org.springframework.web.server.ServerWebExchange;
  * Provides access to error attributes which can be logged or presented to the user.
  *
  * @author Brian Clozel
- * @since 2.0
+ * @since 2.0.0
  * @see DefaultErrorAttributes
  */
 public interface ErrorAttributes {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebServerApplicationContext.java

@@ -48,6 +48,7 @@ import org.springframework.web.context.support.AnnotationConfigWebApplicationCon
  * to deliberately override certain bean definitions via an extra Configuration class.
  *
  * @author Phillip Webb
+ * @since 1.0.0
  * @see #register(Class...)
  * @see #scan(String...)
  * @see ServletWebServerApplicationContext

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java

@@ -85,6 +85,7 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
  *
  * @author Phillip Webb
  * @author Dave Syer
+ * @since 2.0.0
  * @see AnnotationConfigServletWebServerApplicationContext
  * @see XmlServletWebServerApplicationContext
  * @see ServletWebServerFactory

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerInitializedEvent.java

@@ -29,6 +29,7 @@ import org.springframework.boot.web.server.WebServer;
  * stop and start it if they want to.
  *
  * @author Dave Syer
+ * @since 2.0.0
  */
 @SuppressWarnings("serial")
 public class ServletWebServerInitializedEvent extends WebServerInitializedEvent {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/WebApplicationContextServletContextAwareProcessor.java

@@ -30,6 +30,7 @@ import org.springframework.web.context.support.ServletContextAwareProcessor;
  * initialized.
  *
  * @author Phillip Webb
+ * @since 1.0.0
  */
 public class WebApplicationContextServletContextAwareProcessor extends ServletContextAwareProcessor {
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/XmlServletWebServerApplicationContext.java

@@ -32,6 +32,7 @@ import org.springframework.web.context.support.XmlWebApplicationContext;
  * bean definitions via an extra XML file.
  *
  * @author Phillip Webb
+ * @since 1.0.0
  * @see #setNamespace
  * @see #setConfigLocations
  * @see ServletWebServerApplicationContext