Consistent use of @deprecated since

Restore the patch version number for consistency with `@since`
tags.

See gh-25808
pull/26093/head
Phillip Webb 4 years ago
parent 8b6eef6f1d
commit 9c8a97809d

@ -34,7 +34,7 @@ import org.springframework.core.ResolvableType;
* @param <S> the bean source type
* @author Stephane Nicoll
* @since 2.0.0
* @deprecated since 2.2 for removal in 2.4 in favor of
* @deprecated since 2.2.0 for removal in 2.4.0 in favor of
* {@link CompositeHealthContributorConfiguration}
*/
@Deprecated

@ -33,7 +33,7 @@ import org.springframework.core.ResolvableType;
* @param <S> the bean source type
* @author Stephane Nicoll
* @since 2.0.0
* @deprecated since 2.2 for removal in 2.4 in favor of
* @deprecated since 2.2.0 for removal in 2.4.0 in favor of
* {@link CompositeReactiveHealthContributorConfiguration}
*/
@Deprecated

@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration;
* @author Phillip Webb
* @author Vedran Pavic
* @since 2.0.0
* @deprecated since 2.2 for removal in 2.4 in favor of
* @deprecated since 2.2.0 for removal in 2.4.0 in favor of
* {@link HealthContributorAutoConfiguration}
*/
@Deprecated

@ -29,7 +29,8 @@ import org.springframework.boot.context.properties.DeprecatedConfigurationProper
*
* @author Christian Dupuis
* @since 2.0.0
* @deprecated since 2.2 for removal in 2.4 in favor of {@link HealthEndpointProperties}
* @deprecated since 2.2.0 for removal in 2.4.0 in favor of
* {@link HealthEndpointProperties}
*/
@Deprecated
@ConfigurationProperties(prefix = "management.health.status")

@ -97,7 +97,7 @@ public final class MeterValue {
* Return a new {@link MeterValue} instance for the given long value.
* @param value the source value
* @return a {@link MeterValue} instance
* @deprecated since 2.3 for removal in 2.5 in favor of {@link #valueOf(double)}
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of {@link #valueOf(double)}
*/
@Deprecated
public static MeterValue valueOf(long value) {

@ -27,7 +27,7 @@ import io.micrometer.core.instrument.Meter;
*
* @author Phillip Webb
* @since 2.0.0
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link ServiceLevelObjectiveBoundary}
*/
@Deprecated

@ -110,7 +110,7 @@ public class CachingOperationInvoker implements OperationInvoker {
* @param timeToLive the maximum time in milliseconds that a response can be cached
* @return a caching version of the invoker or the original instance if caching is not
* required
* @deprecated since 2.3 for removal in 2.5
* @deprecated since 2.3.0 for removal in 2.5.0
*/
@Deprecated
public static OperationInvoker apply(OperationInvoker invoker, long timeToLive) {

@ -28,7 +28,7 @@ import java.util.stream.Collectors;
* @author Christian Dupuis
* @author Vedran Pavic
* @since 1.1.0
* @deprecated since 2.2 for removal in 2.4 as {@link HealthAggregator} has been
* @deprecated since 2.2.0 for removal in 2.4.0 as {@link HealthAggregator} has been
* deprecated
*/
@Deprecated

@ -26,7 +26,7 @@ import java.util.Map;
* @author Phillip Webb
* @author Christian Dupuis
* @since 1.1.0
* @deprecated since 2.2 for removal in 2.4 in favor of a
* @deprecated since 2.2.0 for removal in 2.4.0 in favor of a
* {@link CompositeHealthContributor}
*/
@Deprecated

@ -30,7 +30,7 @@ import reactor.util.function.Tuple2;
*
* @author Stephane Nicoll
* @since 2.0.0
* @deprecated since 2.2 for removal in 2.4 in favor of a
* @deprecated since 2.2.0 for removal in 2.4.0 in favor of a
* {@link CompositeReactiveHealthContributor}
*/
@Deprecated

@ -28,7 +28,8 @@ import org.springframework.util.Assert;
* @author Vedran Pavic
* @author Stephane Nicoll
* @since 2.1.0
* @deprecated since 2.2 for removal in 2.4 in favor of {@link DefaultContributorRegistry}
* @deprecated since 2.2.0 for removal in 2.4.0 in favor of
* {@link DefaultContributorRegistry}
*/
@Deprecated
public class DefaultHealthIndicatorRegistry implements HealthIndicatorRegistry {

@ -28,7 +28,8 @@ import org.springframework.util.Assert;
* @author Vedran Pavic
* @author Stephane Nicoll
* @since 2.1.0
* @deprecated since 2.2 for removal in 2.4 in favor of {@link DefaultContributorRegistry}
* @deprecated since 2.2.0 for removal in 2.4.0 in favor of
* {@link DefaultContributorRegistry}
*/
@Deprecated
public class DefaultReactiveHealthIndicatorRegistry implements ReactiveHealthIndicatorRegistry {

@ -32,7 +32,7 @@ import java.util.Map;
*
* @author Christian Dupuis
* @since 1.1.0
* @deprecated since 2.2 for removal in 2.4 in favor of {@link StatusAggregator}
* @deprecated since 2.2.0 for removal in 2.4.0 in favor of {@link StatusAggregator}
*/
@FunctionalInterface
@Deprecated

@ -22,7 +22,7 @@ package org.springframework.boot.actuate.health;
* @author Stephane Nicoll
* @author Phillip Webb
* @since 2.0.0
* @deprecated since 2.2 for removal in 2.4 in favor of
* @deprecated since 2.2.0 for removal in 2.4.0 in favor of
* {@link HealthContributorNameFactory}
*/
@Deprecated

@ -27,7 +27,7 @@ import org.springframework.util.Assert;
*
* @author Stephane Nicoll
* @since 2.0.0
* @deprecated since 2.2 for removal in 2.4 in favor of
* @deprecated since 2.2.0 for removal in 2.4.0 in favor of
* {@link ReactiveHealthContributor#adapt(HealthContributor)}
* @see ReactiveHealthContributor#adapt(HealthContributor)
*/

@ -28,7 +28,7 @@ import java.util.Map;
* @author Stephane Nicoll
* @since 2.1.0
* @see HealthEndpoint
* @deprecated since 2.2 for removal in 2.4 in favor of a
* @deprecated since 2.2.0 for removal in 2.4.0 in favor of a
* {@link HealthContributorRegistry}
*/
@Deprecated

@ -26,7 +26,7 @@ import org.springframework.util.Assert;
*
* @author Stephane Nicoll
* @since 2.1.0
* @deprecated since 2.2 for removal in 2.4 in favor of
* @deprecated since 2.2.0 for removal in 2.4.0 in favor of
* {@link DefaultHealthIndicatorRegistry}
*/
@Deprecated

@ -32,7 +32,7 @@ import org.springframework.util.Assert;
*
* @author Christian Dupuis
* @since 1.1.0
* @deprecated since 2.2 for removal in 2.4 in favor of {@link SimpleStatusAggregator}
* @deprecated since 2.2.0 for removal in 2.4.0 in favor of {@link SimpleStatusAggregator}
*/
@Deprecated
public class OrderedHealthAggregator extends AbstractHealthAggregator {

@ -28,7 +28,7 @@ import java.util.Map;
* @author Stephane Nicoll
* @since 2.1.0
* @see HealthIndicatorRegistry
* @deprecated since 2.2 for removal in 2.4 in favor of a
* @deprecated since 2.2.0 for removal in 2.4.0 in favor of a
* {@link ReactiveHealthContributorRegistry}
*/
@Deprecated

@ -28,7 +28,7 @@ import org.springframework.util.ObjectUtils;
*
* @author Stephane Nicoll
* @since 2.1.0
* @deprecated since 2.2 for removal in 2.4 in favor of
* @deprecated since 2.2.0 for removal in 2.4.0 in favor of
* {@link DefaultReactiveHealthIndicatorRegistry}
*/
@Deprecated

@ -99,7 +99,7 @@ public final class WebClientExchangeTags {
* {@link ClientResponse#statusCode()} of the given {@code response}.
* @param response the response
* @return the status tag
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link #status(ClientResponse, Throwable)}
*/
@Deprecated
@ -112,7 +112,7 @@ public final class WebClientExchangeTags {
* client.
* @param throwable the exception
* @return the status tag
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link #status(ClientResponse, Throwable)}
*/
@Deprecated

@ -30,7 +30,7 @@ import org.springframework.boot.ApplicationRunner;
* @author Jean-Pierre Bergamin
* @author Mahmoud Ben Hassine
* @since 1.0.0
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link JobLauncherApplicationRunner}
*/
@Deprecated

@ -43,7 +43,7 @@ public class MongoClientFactory extends MongoClientFactorySupport<MongoClient> {
* Construct a factory for creating a blocking {@link MongoClient}.
* @param properties configuration properties
* @param environment a Spring {@link Environment} containing configuration properties
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link #MongoClientFactory(MongoProperties, Environment, List)}
*/
@Deprecated

@ -51,7 +51,7 @@ import org.springframework.util.StringUtils;
* @author Phillip Webb
* @author Andy Wilkinson
* @author Kazuki Shimizu
* @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being
* @deprecated since 2.3.0 for removal in 2.5.0 as the Bitronix project is no longer being
* maintained
*/
@Deprecated

@ -50,7 +50,7 @@ public class WebConversionService extends DefaultFormattingConversionService {
* Create a new WebConversionService that configures formatters with the provided date
* format, or register the default ones if no custom format is provided.
* @param dateFormat the custom date format to use for date conversions
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link #WebConversionService(DateTimeFormatters)}
*/
@Deprecated

@ -135,7 +135,7 @@ public abstract class AbstractErrorWebExceptionHandler implements ErrorWebExcept
* @param request the source request
* @param includeStackTrace whether to include the error stacktrace information
* @return the error attributes as a Map
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link #getErrorAttributes(ServerRequest, ErrorAttributeOptions)}
*/
@Deprecated

@ -75,7 +75,7 @@ public abstract class AbstractErrorController implements ErrorController {
* @param request the source request
* @param includeStackTrace if stack trace elements should be included
* @return the error attributes
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link #getErrorAttributes(HttpServletRequest, ErrorAttributeOptions)}
*/
@Deprecated

@ -118,8 +118,8 @@ public interface BootArchive extends Task {
* {@code false}.
* @return {@code true} if the Devtools jar should be excluded, or {@code false} if
* not
* @deprecated since 2.3 for removal in 2.5 in favor of configuring a classpath that
* does not include development-only dependencies
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of configuring a classpath
* that does not include development-only dependencies
*/
@Input
@Deprecated
@ -129,8 +129,8 @@ public interface BootArchive extends Task {
* Sets whether or not the Devtools jar should be excluded.
* @param excludeDevtools {@code true} if the Devtools jar should be excluded, or
* {@code false} if not
* @deprecated since 2.3 for removal in 2.5 in favor of configuring a classpath that
* does not include development-only dependencies
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of configuring a classpath
* that does not include development-only dependencies
*/
@Deprecated
void setExcludeDevtools(boolean excludeDevtools);

@ -52,7 +52,8 @@ public interface Layout {
* @param scope the scope of the library
* @return the destination relative to the root of the archive (should end with '/')
* or {@code null} if the library should not be included.
* @deprecated since 2.3 for removal in 2.5 in favor of {@link #getLibraryLocation}
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link #getLibraryLocation}
*/
@Deprecated
String getLibraryDestination(String libraryName, LibraryScope scope);

@ -63,7 +63,7 @@ public abstract class Launcher {
* @param archives the archives
* @return the classloader
* @throws Exception if the classloader cannot be created
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link #createClassLoader(Iterator)}
*/
@Deprecated
@ -140,7 +140,7 @@ public abstract class Launcher {
* Returns the archives that will be used to construct the class path.
* @return the class path archives
* @throws Exception if the class path archives cannot be obtained
* @deprecated since 2.3 for removal in 2.5 in favor of implementing
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of implementing
* {@link #getClassPathArchivesIterator()}.
*/
@Deprecated

@ -75,7 +75,7 @@ public interface Archive extends Iterable<Archive.Entry>, AutoCloseable {
* @param filter the filter used to limit entries
* @return nested archives
* @throws IOException if nested archives cannot be read
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link #getNestedArchives(EntryFilter, EntryFilter)}
*/
@Deprecated
@ -86,7 +86,7 @@ public interface Archive extends Iterable<Archive.Entry>, AutoCloseable {
/**
* Return a new iterator for the archive entries.
* @see java.lang.Iterable#iterator()
* @deprecated since 2.3 for removal in 2.5 in favor of using
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of using
* {@link org.springframework.boot.loader.jar.JarFile} to access entries and
* {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives.
*/
@ -98,7 +98,7 @@ public interface Archive extends Iterable<Archive.Entry>, AutoCloseable {
* Performs the given action for each element of the {@code Iterable} until all
* elements have been processed or the action throws an exception.
* @see Iterable#forEach
* @deprecated since 2.3 for removal in 2.5 in favor of using
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of using
* {@link org.springframework.boot.loader.jar.JarFile} to access entries and
* {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives.
*/
@ -114,7 +114,7 @@ public interface Archive extends Iterable<Archive.Entry>, AutoCloseable {
/**
* Creates a {@link Spliterator} over the elements described by this {@code Iterable}.
* @see Iterable#spliterator
* @deprecated since 2.3 for removal in 2.5 in favor of using
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of using
* {@link org.springframework.boot.loader.jar.JarFile} to access entries and
* {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives.
*/

@ -179,7 +179,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
* Additional directories besides the classes directory that should be added to the
* classpath.
* @since 1.0.0
* @deprecated since 2.3 for removal in 2.5 in favor of {@code directories}
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of {@code directories}
*/
@Deprecated
@Parameter(property = "spring-boot.run.folders")

@ -738,7 +738,7 @@ public class SpringApplication {
/**
* Refresh the underlying {@link ApplicationContext}.
* @param applicationContext the application context to refresh
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link #refresh(ConfigurableApplicationContext)}
*/
@Deprecated

@ -38,7 +38,7 @@ import org.springframework.core.annotation.AnnotationUtils;
*
* @author Dave Syer
* @since 1.1.0
* @deprecated since 2.2 for removal in 2.4 in favor of
* @deprecated since 2.2.0 for removal in 2.4.0 in favor of
* {@link ConfigurationPropertiesBean}
*/
@Deprecated

@ -32,7 +32,7 @@ import org.springframework.core.Ordered;
*
* @author Phillip Webb
* @since 1.2.0
* @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being
* @deprecated since 2.3.0 for removal in 2.5.0 as the Bitronix project is no longer being
* maintained
*/
@Deprecated

@ -27,7 +27,7 @@ import org.springframework.boot.jms.XAConnectionFactoryWrapper;
*
* @author Phillip Webb
* @since 1.2.0
* @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being
* @deprecated since 2.3.0 for removal in 2.5.0 as the Bitronix project is no longer being
* maintained
*/
@Deprecated

@ -26,7 +26,7 @@ import org.springframework.boot.jdbc.XADataSourceWrapper;
*
* @author Phillip Webb
* @since 1.2.0
* @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being
* @deprecated since 2.3.0 for removal in 2.5.0 as the Bitronix project is no longer being
* maintained
*/
@Deprecated

@ -41,7 +41,7 @@ import org.springframework.util.StringUtils;
* @author Josh Long
* @author Andy Wilkinson
* @since 1.2.0
* @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being
* @deprecated since 2.3.0 for removal in 2.5.0 as the Bitronix project is no longer being
* maintained
*/
@Deprecated

@ -42,7 +42,7 @@ import org.springframework.util.StringUtils;
* @author Josh Long
* @author Andy Wilkinson
* @since 1.2.0
* @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being
* @deprecated since 2.3.0 for removal in 2.5.0 as the Bitronix project is no longer being
* maintained
*/
@Deprecated

@ -16,7 +16,7 @@
/**
* Support classes for Bitronix JTA.
* @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being
* @deprecated since 2.3.0 for removal in 2.5.0 as the Bitronix project is no longer being
* maintained
*/
package org.springframework.boot.jta.bitronix;

@ -51,7 +51,7 @@ public class UndertowServletWebServer extends UndertowWebServer {
* @param contextPath the root context path
* @param autoStart if the server should be started
* @param compression compression configuration
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link #UndertowServletWebServer(io.undertow.Undertow.Builder, Iterable, String, boolean)}
*/
@Deprecated
@ -68,7 +68,7 @@ public class UndertowServletWebServer extends UndertowWebServer {
* @param useForwardHeaders if x-forward headers should be used
* @param autoStart if the server should be started
* @param compression compression configuration
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link #UndertowServletWebServer(io.undertow.Undertow.Builder, Iterable, String, boolean)}
*/
@Deprecated
@ -86,7 +86,7 @@ public class UndertowServletWebServer extends UndertowWebServer {
* @param autoStart if the server should be started
* @param compression compression configuration
* @param serverHeader string to be used in HTTP header
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link #UndertowServletWebServer(io.undertow.Undertow.Builder, Iterable, String, boolean)}
*/
@Deprecated

@ -92,7 +92,7 @@ public class UndertowWebServer implements WebServer {
* @param autoStart if the server should be started
* @param closeable called when the server is stopped
* @since 2.0.4
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link #UndertowWebServer(io.undertow.Undertow.Builder, Iterable, boolean)}
*/
@Deprecated

@ -75,7 +75,7 @@ public class DefaultErrorAttributes implements ErrorAttributes {
/**
* Create a new {@link DefaultErrorAttributes} instance.
* @param includeException whether to include the "exception" attribute
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link ErrorAttributeOptions#including(Include...)}
*/
@Deprecated

@ -41,7 +41,7 @@ public interface ErrorAttributes {
* @param request the source request
* @param includeStackTrace if stack trace attribute should be included
* @return a map of error attributes
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link #getErrorAttributes(ServerRequest, ErrorAttributeOptions)}
*/
@Deprecated

@ -81,7 +81,7 @@ public class DefaultErrorAttributes implements ErrorAttributes, HandlerException
/**
* Create a new {@link DefaultErrorAttributes} instance.
* @param includeException whether to include the "exception" attribute
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link ErrorAttributeOptions#including(Include...)}
*/
@Deprecated

@ -42,7 +42,7 @@ public interface ErrorAttributes {
* @param webRequest the source request
* @param includeStackTrace if stack trace element should be included
* @return a map of error attributes
* @deprecated since 2.3 for removal in 2.5 in favor of
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of
* {@link #getErrorAttributes(WebRequest, ErrorAttributeOptions)}
*/
@Deprecated

@ -33,7 +33,7 @@ public interface ErrorController {
* The return value from this method is not used; the property `server.error.path`
* must be set to override the default error page path.
* @return the error path
* @deprecated since 2.3 for removal in 2.5 in favor of setting the property
* @deprecated since 2.3.0 for removal in 2.5.0 in favor of setting the property
* `server.error.path`
*/
@Deprecated

Loading…
Cancel
Save