From 26dd1b9a263a80acb22d37b69f1125f267e3321d Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 29 Mar 2021 14:24:55 -0700 Subject: [PATCH] Update deprecations with for removal targets Update all deprecation tags to include a removal target. Closes gh-25808 --- .../endpoint/ExposeExcludePropertyEndpointFilter.java | 5 +++-- .../health/CompositeHealthIndicatorConfiguration.java | 5 +++-- .../CompositeReactiveHealthIndicatorConfiguration.java | 4 ++-- .../health/HealthIndicatorAutoConfiguration.java | 5 +++-- .../health/HealthIndicatorProperties.java | 4 ++-- .../boot/actuate/autoconfigure/metrics/MeterValue.java | 4 ++-- .../metrics/ServiceLevelAgreementBoundary.java | 5 +++-- .../invoker/cache/CachingOperationInvoker.java | 4 ++-- .../boot/actuate/health/AbstractHealthAggregator.java | 5 +++-- .../boot/actuate/health/CompositeHealthIndicator.java | 5 +++-- .../health/CompositeReactiveHealthIndicator.java | 5 +++-- .../actuate/health/DefaultHealthIndicatorRegistry.java | 4 ++-- .../health/DefaultReactiveHealthIndicatorRegistry.java | 4 ++-- .../boot/actuate/health/HealthAggregator.java | 4 ++-- .../actuate/health/HealthIndicatorNameFactory.java | 5 +++-- .../actuate/health/HealthIndicatorReactiveAdapter.java | 4 ++-- .../boot/actuate/health/HealthIndicatorRegistry.java | 5 +++-- .../actuate/health/HealthIndicatorRegistryFactory.java | 5 +++-- .../boot/actuate/health/OrderedHealthAggregator.java | 4 ++-- .../health/ReactiveHealthIndicatorRegistry.java | 5 +++-- .../health/ReactiveHealthIndicatorRegistryFactory.java | 5 +++-- .../web/reactive/client/WebClientExchangeTags.java | 8 +++++--- .../batch/JobLauncherCommandLineRunner.java | 5 +++-- .../cache/CouchbaseCacheConfiguration.java | 6 +++--- .../data/solr/SolrRepositoriesAutoConfiguration.java | 2 +- .../rest/RestClientBuilderCustomizer.java | 4 ++-- .../boot/autoconfigure/mongo/MongoClientFactory.java | 4 ++-- .../transaction/jta/BitronixJtaConfiguration.java | 5 +++-- .../autoconfigure/web/format/WebConversionService.java | 4 ++-- .../error/AbstractErrorWebExceptionHandler.java | 4 ++-- .../web/servlet/error/AbstractErrorController.java | 4 ++-- .../boot/test/context/SpringBootContextLoader.java | 4 ++-- .../boot/gradle/tasks/bundling/BootArchive.java | 10 +++++----- .../boot/gradle/tasks/bundling/BootJar.java | 5 +++-- .../org/springframework/boot/loader/tools/Layout.java | 4 ++-- .../springframework/boot/loader/tools/Packager.java | 2 +- .../springframework/boot/loader/tools/Repackager.java | 4 ++-- .../java/org/springframework/boot/loader/Launcher.java | 7 ++++--- .../springframework/boot/loader/archive/Archive.java | 10 +++++----- .../springframework/boot/maven/AbstractRunMojo.java | 4 ++-- .../org/springframework/boot/SpringApplication.java | 2 +- .../properties/ConfigurationBeanFactoryMetadata.java | 5 +++-- .../BitronixDependentBeanFactoryPostProcessor.java | 5 +++-- .../bitronix/BitronixXAConnectionFactoryWrapper.java | 5 +++-- .../boot/jta/bitronix/BitronixXADataSourceWrapper.java | 5 +++-- .../jta/bitronix/PoolingConnectionFactoryBean.java | 5 +++-- .../boot/jta/bitronix/PoolingDataSourceBean.java | 5 +++-- .../boot/jta/bitronix/package-info.java | 5 +++-- .../boot/rsocket/netty/NettyRSocketServerFactory.java | 10 +++++----- .../rsocket/server/ServerRSocketFactoryProcessor.java | 4 ++-- .../embedded/undertow/UndertowServletWebServer.java | 8 ++++---- .../boot/web/embedded/undertow/UndertowWebServer.java | 2 +- .../web/reactive/error/DefaultErrorAttributes.java | 4 ++-- .../boot/web/reactive/error/ErrorAttributes.java | 4 ++-- .../boot/web/servlet/error/DefaultErrorAttributes.java | 4 ++-- .../boot/web/servlet/error/ErrorAttributes.java | 4 ++-- .../boot/web/servlet/error/ErrorController.java | 5 +++-- 57 files changed, 150 insertions(+), 124 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/ExposeExcludePropertyEndpointFilter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/ExposeExcludePropertyEndpointFilter.java index b0d290fc9e..b3932fa128 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/ExposeExcludePropertyEndpointFilter.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/ExposeExcludePropertyEndpointFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -30,7 +30,8 @@ import org.springframework.core.env.Environment; * @param the endpoint type * @author Phillip Webb * @since 2.0.0 - * @deprecated since 2.2.7 in favor of {@link IncludeExcludeEndpointFilter} + * @deprecated since 2.2.7 for removal in 2.4 in favor of + * {@link IncludeExcludeEndpointFilter} */ @Deprecated public class ExposeExcludePropertyEndpointFilter> diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeHealthIndicatorConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeHealthIndicatorConfiguration.java index 4ed3da3bee..d3ae11c1e1 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeHealthIndicatorConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeHealthIndicatorConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -34,7 +34,8 @@ import org.springframework.core.ResolvableType; * @param the bean source type * @author Stephane Nicoll * @since 2.0.0 - * @deprecated since 2.2.0 in favor of {@link CompositeHealthContributorConfiguration} + * @deprecated since 2.2 for removal in 2.4 in favor of + * {@link CompositeHealthContributorConfiguration} */ @Deprecated public abstract class CompositeHealthIndicatorConfiguration { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeReactiveHealthIndicatorConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeReactiveHealthIndicatorConfiguration.java index 06f788bbc7..fdb76071ec 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeReactiveHealthIndicatorConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeReactiveHealthIndicatorConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -33,7 +33,7 @@ import org.springframework.core.ResolvableType; * @param the bean source type * @author Stephane Nicoll * @since 2.0.0 - * @deprecated since 2.2.0 in favor of + * @deprecated since 2.2 for removal in 2.4 in favor of * {@link CompositeReactiveHealthContributorConfiguration} */ @Deprecated diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java index 330e625bba..9119ac73b6 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -29,7 +29,8 @@ import org.springframework.context.annotation.Configuration; * @author Phillip Webb * @author Vedran Pavic * @since 2.0.0 - * @deprecated since 2.2.0 in favor of {@link HealthContributorAutoConfiguration} + * @deprecated since 2.2 for removal in 2.4 in favor of + * {@link HealthContributorAutoConfiguration} */ @Deprecated @Configuration(proxyBeanMethods = false) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorProperties.java index 42afd82d5a..0e93ea6400 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthIndicatorProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -29,7 +29,7 @@ import org.springframework.boot.context.properties.DeprecatedConfigurationProper * * @author Christian Dupuis * @since 2.0.0 - * @deprecated since 2.2.0 in favor of {@link HealthEndpointProperties} + * @deprecated since 2.2 for removal in 2.4 in favor of {@link HealthEndpointProperties} */ @Deprecated @ConfigurationProperties(prefix = "management.health.status") diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterValue.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterValue.java index 2d3f31b505..3dc9eb3148 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterValue.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -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 as of 2.3.0 in favor of {@link #valueOf(double)} + * @deprecated since 2.3 for removal in 2.5 in favor of {@link #valueOf(double)} */ @Deprecated public static MeterValue valueOf(long value) { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/ServiceLevelAgreementBoundary.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/ServiceLevelAgreementBoundary.java index a6a8014a90..c9a836c494 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/ServiceLevelAgreementBoundary.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/ServiceLevelAgreementBoundary.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -27,7 +27,8 @@ import io.micrometer.core.instrument.Meter; * * @author Phillip Webb * @since 2.0.0 - * @deprecated as of 2.3.0 in favor of {@link ServiceLevelObjectiveBoundary} + * @deprecated since 2.3 for removal in 2.5 in favor of + * {@link ServiceLevelObjectiveBoundary} */ @Deprecated public final class ServiceLevelAgreementBoundary { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java index 0b3d4a52e8..401aa648b5 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -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 as of 2.3.0 to make it package-private in 2.4 + * @deprecated as of 2.3 to make package-private in 2.4 */ @Deprecated public static OperationInvoker apply(OperationInvoker invoker, long timeToLive) { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthAggregator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthAggregator.java index 68e370cbdd..98bce01d10 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthAggregator.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthAggregator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -28,7 +28,8 @@ import java.util.stream.Collectors; * @author Christian Dupuis * @author Vedran Pavic * @since 1.1.0 - * @deprecated since 2.2.0 as {@link HealthAggregator} has been deprecated + * @deprecated since 2.2 for removal in 2.4 as {@link HealthAggregator} has been + * deprecated */ @Deprecated public abstract class AbstractHealthAggregator implements HealthAggregator { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeHealthIndicator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeHealthIndicator.java index 82c4c537db..e41eae5ecc 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeHealthIndicator.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeHealthIndicator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -26,7 +26,8 @@ import java.util.Map; * @author Phillip Webb * @author Christian Dupuis * @since 1.1.0 - * @deprecated since 2.2.0 in favor of a {@link CompositeHealthContributor} + * @deprecated since 2.2 for removal in 2.4 in favor of a + * {@link CompositeHealthContributor} */ @Deprecated public class CompositeHealthIndicator implements HealthIndicator { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeReactiveHealthIndicator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeReactiveHealthIndicator.java index af027feb33..96baca0997 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeReactiveHealthIndicator.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeReactiveHealthIndicator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -30,7 +30,8 @@ import reactor.util.function.Tuple2; * * @author Stephane Nicoll * @since 2.0.0 - * @deprecated since 2.2.0 in favor of a {@link CompositeReactiveHealthContributor} + * @deprecated since 2.2 for removal in 2.4 in favor of a + * {@link CompositeReactiveHealthContributor} */ @Deprecated public class CompositeReactiveHealthIndicator implements ReactiveHealthIndicator { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DefaultHealthIndicatorRegistry.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DefaultHealthIndicatorRegistry.java index fbbceee5dd..78af444f7e 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DefaultHealthIndicatorRegistry.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DefaultHealthIndicatorRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -28,7 +28,7 @@ import org.springframework.util.Assert; * @author Vedran Pavic * @author Stephane Nicoll * @since 2.1.0 - * @deprecated since 2.2.0 in favor of {@link DefaultContributorRegistry} + * @deprecated since 2.2 for removal in 2.4 in favor of {@link DefaultContributorRegistry} */ @Deprecated public class DefaultHealthIndicatorRegistry implements HealthIndicatorRegistry { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DefaultReactiveHealthIndicatorRegistry.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DefaultReactiveHealthIndicatorRegistry.java index 2d270b0d93..ead88d068a 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DefaultReactiveHealthIndicatorRegistry.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DefaultReactiveHealthIndicatorRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -28,7 +28,7 @@ import org.springframework.util.Assert; * @author Vedran Pavic * @author Stephane Nicoll * @since 2.1.0 - * @deprecated since 2.2.0 in favor of {@link DefaultContributorRegistry} + * @deprecated since 2.2 for removal in 2.4 in favor of {@link DefaultContributorRegistry} */ @Deprecated public class DefaultReactiveHealthIndicatorRegistry implements ReactiveHealthIndicatorRegistry { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthAggregator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthAggregator.java index 6d1ef43d0d..1b47fbb1a8 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthAggregator.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthAggregator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -32,7 +32,7 @@ import java.util.Map; * * @author Christian Dupuis * @since 1.1.0 - * @deprecated since 2.2.0 in favor of {@link StatusAggregator} + * @deprecated since 2.2 for removal in 2.4 in favor of {@link StatusAggregator} */ @FunctionalInterface @Deprecated diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorNameFactory.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorNameFactory.java index 15014a2a78..29a4f603df 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorNameFactory.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorNameFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -22,7 +22,8 @@ package org.springframework.boot.actuate.health; * @author Stephane Nicoll * @author Phillip Webb * @since 2.0.0 - * @deprecated since 2.2.0 in favor of {@link HealthContributorNameFactory} + * @deprecated since 2.2 for removal in 2.4 in favor of + * {@link HealthContributorNameFactory} */ @Deprecated public class HealthIndicatorNameFactory extends HealthContributorNameFactory { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorReactiveAdapter.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorReactiveAdapter.java index 21ca6bb384..2ce14fc41b 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorReactiveAdapter.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorReactiveAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -27,7 +27,7 @@ import org.springframework.util.Assert; * * @author Stephane Nicoll * @since 2.0.0 - * @deprecated since 2.2.0 in favor of + * @deprecated since 2.2 for removal in 2.4 in favor of * {@link ReactiveHealthContributor#adapt(HealthContributor)} * @see ReactiveHealthContributor#adapt(HealthContributor) */ diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorRegistry.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorRegistry.java index 86eb8d6952..545b08128f 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorRegistry.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -28,7 +28,8 @@ import java.util.Map; * @author Stephane Nicoll * @since 2.1.0 * @see HealthEndpoint - * @deprecated since 2.2.0 in favor of a {@link HealthContributorRegistry} + * @deprecated since 2.2 for removal in 2.4 in favor of a + * {@link HealthContributorRegistry} */ @Deprecated public interface HealthIndicatorRegistry { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorRegistryFactory.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorRegistryFactory.java index 0cdef86d45..5bbec34a56 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorRegistryFactory.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicatorRegistryFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -26,7 +26,8 @@ import org.springframework.util.Assert; * * @author Stephane Nicoll * @since 2.1.0 - * @deprecated since 2.2.0 in favor of {@link DefaultHealthIndicatorRegistry} + * @deprecated since 2.2 for removal in 2.4 in favor of + * {@link DefaultHealthIndicatorRegistry} */ @Deprecated public class HealthIndicatorRegistryFactory { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java index a3396f56b7..d975d316fb 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -32,7 +32,7 @@ import org.springframework.util.Assert; * * @author Christian Dupuis * @since 1.1.0 - * @deprecated since 2.2.0 in favor of {@link SimpleStatusAggregator} + * @deprecated since 2.2 for removal in 2.4 in favor of {@link SimpleStatusAggregator} */ @Deprecated public class OrderedHealthAggregator extends AbstractHealthAggregator { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthIndicatorRegistry.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthIndicatorRegistry.java index 84d92b97e2..c58191fa47 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthIndicatorRegistry.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthIndicatorRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -28,7 +28,8 @@ import java.util.Map; * @author Stephane Nicoll * @since 2.1.0 * @see HealthIndicatorRegistry - * @deprecated since 2.2.0 in favor of a {@link ReactiveHealthContributorRegistry} + * @deprecated since 2.2 for removal in 2.4 in favor of a + * {@link ReactiveHealthContributorRegistry} */ @Deprecated public interface ReactiveHealthIndicatorRegistry { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthIndicatorRegistryFactory.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthIndicatorRegistryFactory.java index d7939ac2a7..19efe9943c 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthIndicatorRegistryFactory.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ReactiveHealthIndicatorRegistryFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -28,7 +28,8 @@ import org.springframework.util.ObjectUtils; * * @author Stephane Nicoll * @since 2.1.0 - * @deprecated since 2.2.0 in favor of {@link DefaultReactiveHealthIndicatorRegistry} + * @deprecated since 2.2 for removal in 2.4 in favor of + * {@link DefaultReactiveHealthIndicatorRegistry} */ @Deprecated public class ReactiveHealthIndicatorRegistryFactory { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java index 6b72c4f735..1ca0b592cb 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -99,7 +99,8 @@ public final class WebClientExchangeTags { * {@link ClientResponse#statusCode()} of the given {@code response}. * @param response the response * @return the status tag - * @deprecated since 2.3.0 in favor of {@link #status(ClientResponse, Throwable)} + * @deprecated since 2.3 for removal in 2.5 in favor of + * {@link #status(ClientResponse, Throwable)} */ @Deprecated public static Tag status(ClientResponse response) { @@ -111,7 +112,8 @@ public final class WebClientExchangeTags { * client. * @param throwable the exception * @return the status tag - * @deprecated since 2.3.0 in favor of {@link #status(ClientResponse, Throwable)} + * @deprecated since 2.3 for removal in 2.5 in favor of + * {@link #status(ClientResponse, Throwable)} */ @Deprecated public static Tag status(Throwable throwable) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java index 7832c0a7fd..5cb25cc4f7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -30,7 +30,8 @@ import org.springframework.boot.ApplicationRunner; * @author Jean-Pierre Bergamin * @author Mahmoud Ben Hassine * @since 1.0.0 - * @deprecated since 2.3.0 in favor of {@link JobLauncherApplicationRunner} + * @deprecated since 2.3 for removal in 2.5 in favor of + * {@link JobLauncherApplicationRunner} */ @Deprecated public class JobLauncherCommandLineRunner extends JobLauncherApplicationRunner { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.java index 12028d2f2c..c7df964322 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -40,8 +40,8 @@ import org.springframework.util.ObjectUtils; * * @author Stephane Nicoll * @since 1.4.0 - * @deprecated since 2.3.3 as this class is not intended for public use. It will be made - * package-private in a future release + * @deprecated since 2.3.3 to be made package-private in 2.5 as this class is not intended + * for public use. */ @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Cluster.class, CouchbaseClientFactory.class, CouchbaseCacheManager.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfiguration.java index 1d417c7691..c9a37f3efc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.data.solr.repository.support.SolrRepositoryFactoryBea * * @author Christoph Strobl * @author Oliver Gierke - * @deprecated since 2.3.9 as Spring Data Solr is deprecated + * @deprecated since 2.3.9 for removal in 2.5 as Spring Data Solr is deprecated * @since 1.1.0 */ @Configuration(proxyBeanMethods = false) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientBuilderCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientBuilderCustomizer.java index f31e7309c2..e08641e42b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientBuilderCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientBuilderCustomizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -25,7 +25,7 @@ import org.elasticsearch.client.RestClientBuilder; * * @author Brian Clozel * @since 2.1.0 - * @deprecated as of 2.3.1 in favor of + * @deprecated as of 2.3.1 for removal in 2.5 in favor of * {@link org.springframework.boot.autoconfigure.elasticsearch.RestClientBuilderCustomizer} */ @FunctionalInterface diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactory.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactory.java index 60c775d0cf..458b04db1e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactory.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -43,7 +43,7 @@ public class MongoClientFactory extends MongoClientFactorySupport { * 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.0 in favor of + * @deprecated since 2.3 for removal in 2.5 in favor of * {@link #MongoClientFactory(MongoProperties, Environment, List)} */ @Deprecated diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java index 8ddf9e5cae..8bf4af32e1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -51,7 +51,8 @@ import org.springframework.util.StringUtils; * @author Phillip Webb * @author Andy Wilkinson * @author Kazuki Shimizu - * @deprecated since 2.3.0 as the Bitronix project is no longer being maintained + * @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being + * maintained */ @Deprecated @Configuration(proxyBeanMethods = false) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/format/WebConversionService.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/format/WebConversionService.java index 2aa3c91dcf..60a19346af 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/format/WebConversionService.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/format/WebConversionService.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -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.0 in favor of + * @deprecated since 2.3 for removal in 2.5 in favor of * {@link #WebConversionService(DateTimeFormatters)} */ @Deprecated diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/AbstractErrorWebExceptionHandler.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/AbstractErrorWebExceptionHandler.java index 86e87c38d0..c96273bec8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/AbstractErrorWebExceptionHandler.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/AbstractErrorWebExceptionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -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.0 in favor of + * @deprecated since 2.3 for removal in 2.5 in favor of * {@link #getErrorAttributes(ServerRequest, ErrorAttributeOptions)} */ @Deprecated diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/AbstractErrorController.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/AbstractErrorController.java index edbce0d914..5b23af0fe8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/AbstractErrorController.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/AbstractErrorController.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -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.0 in favor of + * @deprecated since 2.3 for removal in 2.5 in favor of * {@link #getErrorAttributes(HttpServletRequest, ErrorAttributeOptions)} */ @Deprecated diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java index 360af8dd83..6d5d822ce4 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -143,7 +143,7 @@ public class SpringBootContextLoader extends AbstractContextLoader { * empty array. * @param config the source context configuration * @return the application arguments to use - * @deprecated since 2.2.7 + * @deprecated since 2.2.7 for removal in 2.4 * @see SpringApplication#run(String...) */ @Deprecated diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchive.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchive.java index 8d1e48a48c..57efb7c666 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchive.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchive.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -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.0 in favour of configuring a classpath that does not include - * development-only dependencies + * @deprecated since 2.3 for removal in 2.5 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.0 in favour of configuring a classpath that does not include - * development-only dependencies + * @deprecated since 2.3 for removal in 2.5 in favor of configuring a classpath that + * does not include development-only dependencies */ @Deprecated void setExcludeDevtools(boolean excludeDevtools); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java index d8090f8325..c3437f7487 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -122,7 +122,8 @@ public class BootJar extends Jar implements BootArchive { * Returns the {@link Configuration Configurations} of the project associated with * this task. * @return the configurations - * @deprecated since 2.3.5 in favor of {@link Project#getConfigurations} + * @deprecated since 2.3.5 for removal in 2.5 in favor of + * {@link Project#getConfigurations} */ @Internal @Deprecated diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layout.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layout.java index 0634f8dff3..fb690c4cf5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layout.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layout.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -52,7 +52,7 @@ 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.0 in favor of {@link #getLibraryLocation} + * @deprecated since 2.3 for removal in 2.5 in favor of {@link #getLibraryLocation} */ @Deprecated String getLibraryDestination(String libraryName, LibraryScope scope); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Packager.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Packager.java index 8ad560ea4c..51c4c2071c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Packager.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Packager.java @@ -100,7 +100,7 @@ public abstract class Packager { * Create a new {@link Packager} instance. * @param source the source archive file to package * @param layoutFactory the layout factory to use or {@code null} - * @deprecated since 2.5.0 in favor of {@link #Packager(File)} and + * @deprecated since 2.3.10 for removal in 2.5 in favor of {@link #Packager(File)} and * {@link #setLayoutFactory(LayoutFactory)} */ @Deprecated diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java index 2e139a3f53..6e33032392 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java @@ -51,8 +51,8 @@ public class Repackager extends Packager { * Create a new {@link Repackager} instance. * @param source the source archive file to package * @param layoutFactory the layout factory to use or {@code null} - * @deprecated since 2.5.0 in favor of {@link #Repackager(File)} and - * {@link #setLayoutFactory(LayoutFactory)} + * @deprecated since 2.3.10 for removal in 2.5 in favor of {@link #Repackager(File)} + * and {@link #setLayoutFactory(LayoutFactory)} */ @Deprecated public Repackager(File source, LayoutFactory layoutFactory) { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java index 314da4090b..a292635f69 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -63,7 +63,8 @@ public abstract class Launcher { * @param archives the archives * @return the classloader * @throws Exception if the classloader cannot be created - * @deprecated since 2.3.0 in favor of {@link #createClassLoader(Iterator)} + * @deprecated since 2.3 for removal in 2.5 in favor of + * {@link #createClassLoader(Iterator)} */ @Deprecated protected ClassLoader createClassLoader(List archives) throws Exception { @@ -139,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.0 in favor of implementing + * @deprecated since 2.3 for removal in 2.5 in favor of implementing * {@link #getClassPathArchivesIterator()}. */ @Deprecated diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java index e3dd20ee7f..de1bf3761c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -75,7 +75,7 @@ public interface Archive extends Iterable, AutoCloseable { * @param filter the filter used to limit entries * @return nested archives * @throws IOException if nested archives cannot be read - * @deprecated since 2.3.0 in favor of + * @deprecated since 2.3 for removal in 2.5 in favor of * {@link #getNestedArchives(EntryFilter, EntryFilter)} */ @Deprecated @@ -86,7 +86,7 @@ public interface Archive extends Iterable, AutoCloseable { /** * Return a new iterator for the archive entries. * @see java.lang.Iterable#iterator() - * @deprecated since 2.3.0 in favor of using + * @deprecated since 2.3 for removal in 2.5 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, 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.0 in favor of using + * @deprecated since 2.3 for removal in 2.5 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, AutoCloseable { /** * Creates a {@link Spliterator} over the elements described by this {@code Iterable}. * @see Iterable#spliterator - * @deprecated since 2.3.0 in favor of using + * @deprecated since 2.3 for removal in 2.5 in favor of using * {@link org.springframework.boot.loader.jar.JarFile} to access entries and * {@link #getNestedArchives(EntryFilter, EntryFilter)} for accessing nested archives. */ diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java index 2c1833be15..f22f8ad984 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -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.0 in favor of {@code directories} + * @deprecated since 2.3 for removal in 2.5 in favor of {@code directories} */ @Deprecated @Parameter(property = "spring-boot.run.folders") diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java index 5d95f49423..ca6d1beaad 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java @@ -738,7 +738,7 @@ public class SpringApplication { /** * Refresh the underlying {@link ApplicationContext}. * @param applicationContext the application context to refresh - * @deprecated since 2.3.0 in favor of + * @deprecated since 2.3 for removal in 2.5 in favor of * {@link #refresh(ConfigurableApplicationContext)} */ @Deprecated diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationBeanFactoryMetadata.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationBeanFactoryMetadata.java index 6499b9af3e..bd095402ba 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationBeanFactoryMetadata.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationBeanFactoryMetadata.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -38,7 +38,8 @@ import org.springframework.core.annotation.AnnotationUtils; * * @author Dave Syer * @since 1.1.0 - * @deprecated since 2.2.0 in favor of {@link ConfigurationPropertiesBean} + * @deprecated since 2.2 for removal in 2.4 in favor of + * {@link ConfigurationPropertiesBean} */ @Deprecated public class ConfigurationBeanFactoryMetadata implements ApplicationContextAware { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixDependentBeanFactoryPostProcessor.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixDependentBeanFactoryPostProcessor.java index 3cebd875ac..d8069bd9d1 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixDependentBeanFactoryPostProcessor.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixDependentBeanFactoryPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -32,7 +32,8 @@ import org.springframework.core.Ordered; * * @author Phillip Webb * @since 1.2.0 - * @deprecated since 2.3.0 as the Bitronix project is no longer being maintained + * @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being + * maintained */ @Deprecated public class BitronixDependentBeanFactoryPostProcessor implements BeanFactoryPostProcessor, Ordered { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixXAConnectionFactoryWrapper.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixXAConnectionFactoryWrapper.java index fc1b0d7eab..172e85827b 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixXAConnectionFactoryWrapper.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixXAConnectionFactoryWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -27,7 +27,8 @@ import org.springframework.boot.jms.XAConnectionFactoryWrapper; * * @author Phillip Webb * @since 1.2.0 - * @deprecated since 2.3.0 as the Bitronix project is no longer being maintained + * @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being + * maintained */ @Deprecated public class BitronixXAConnectionFactoryWrapper implements XAConnectionFactoryWrapper { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixXADataSourceWrapper.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixXADataSourceWrapper.java index c766a82dab..a6db6c5a8a 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixXADataSourceWrapper.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/BitronixXADataSourceWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -26,7 +26,8 @@ import org.springframework.boot.jdbc.XADataSourceWrapper; * * @author Phillip Webb * @since 1.2.0 - * @deprecated since 2.3.0 as the Bitronix project is no longer being maintained + * @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being + * maintained */ @Deprecated public class BitronixXADataSourceWrapper implements XADataSourceWrapper { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java index 484c4c26be..03dd7f7904 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -41,7 +41,8 @@ import org.springframework.util.StringUtils; * @author Josh Long * @author Andy Wilkinson * @since 1.2.0 - * @deprecated since 2.3.0 as the Bitronix project is no longer being maintained + * @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being + * maintained */ @Deprecated @SuppressWarnings("serial") diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java index 21a80bb935..11c23ef836 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -42,7 +42,8 @@ import org.springframework.util.StringUtils; * @author Josh Long * @author Andy Wilkinson * @since 1.2.0 - * @deprecated since 2.3.0 as the Bitronix project is no longer being maintained + * @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being + * maintained */ @Deprecated @SuppressWarnings("serial") diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/package-info.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/package-info.java index 71a5709d26..fd5d1c4b71 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/package-info.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -16,6 +16,7 @@ /** * Support classes for Bitronix JTA. - * @deprecated since 2.3.0 as the Bitronix project is no longer being maintained + * @deprecated since 2.3 for removal in 2.5 as the Bitronix project is no longer being + * maintained */ package org.springframework.boot.jta.bitronix; diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java index dc54ce96e6..704640e98a 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -94,8 +94,8 @@ public class NettyRSocketServerFactory implements RSocketServerFactory, Configur * {@link ServerRSocketFactory} while building the server. Calling this method will * replace any existing processors. * @param socketFactoryProcessors processors to apply before the server starts - * @deprecated in favor of {@link #setRSocketServerCustomizers(Collection)} as of - * 2.2.7 + * @deprecated since 2.2.7 for removal in 2.4 in favor of + * {@link #setRSocketServerCustomizers(Collection)} */ @Deprecated public void setSocketFactoryProcessors( @@ -108,8 +108,8 @@ public class NettyRSocketServerFactory implements RSocketServerFactory, Configur * Add {@link ServerRSocketFactoryProcessor}s that should be called to process the * {@link ServerRSocketFactory} while building the server. * @param socketFactoryProcessors processors to apply before the server starts - * @deprecated in favor of - * {@link #addRSocketServerCustomizers(RSocketServerCustomizer...)} as of 2.2.7 + * @deprecated since 2.2.7 for removal in 2.4 in favor of + * {@link #addRSocketServerCustomizers(RSocketServerCustomizer...)} */ @Deprecated public void addSocketFactoryProcessors(ServerRSocketFactoryProcessor... socketFactoryProcessors) { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/ServerRSocketFactoryProcessor.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/ServerRSocketFactoryProcessor.java index 0edc20d8e0..6bf869a2c3 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/ServerRSocketFactoryProcessor.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/server/ServerRSocketFactoryProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -25,7 +25,7 @@ import io.rsocket.RSocketFactory.ServerRSocketFactory; * @author Brian Clozel * @see RSocketServerFactory * @since 2.2.0 - * @deprecated in favor of {@link RSocketServerCustomizer} as of 2.2.7 + * @deprecated since 2.2.7 for removal in 2.4 in favor of {@link RSocketServerCustomizer} */ @FunctionalInterface @Deprecated diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServer.java index 1a90823563..f69065bb8d 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -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.0 in favor of + * @deprecated since 2.3 for removal in 2.5 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.0 in favor of + * @deprecated since 2.3 for removal in 2.5 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.0 in favor of + * @deprecated since 2.3 for removal in 2.5 in favor of * {@link #UndertowServletWebServer(io.undertow.Undertow.Builder, Iterable, String, boolean)} */ @Deprecated diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java index 5278bf6920..a6c4809fb2 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java @@ -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.0 in favor of + * @deprecated since 2.3 for removal in 2.5 in favor of * {@link #UndertowWebServer(io.undertow.Undertow.Builder, Iterable, boolean)} */ @Deprecated diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java index 6210c5ce8c..cc5d0069b2 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -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.0 in favor of + * @deprecated since 2.3 for removal in 2.5 in favor of * {@link ErrorAttributeOptions#including(Include...)} */ @Deprecated diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/ErrorAttributes.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/ErrorAttributes.java index c1cd5d707e..182a45d6bc 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/ErrorAttributes.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/ErrorAttributes.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -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.0 in favor of + * @deprecated since 2.3 for removal in 2.5 in favor of * {@link #getErrorAttributes(ServerRequest, ErrorAttributeOptions)} */ @Deprecated diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributes.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributes.java index d1c991cf4b..33155996dc 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributes.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributes.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -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.0 in favor of + * @deprecated since 2.3 for removal in 2.5 in favor of * {@link ErrorAttributeOptions#including(Include...)} */ @Deprecated diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/ErrorAttributes.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/ErrorAttributes.java index f3ae6e38c8..dbd1096765 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/ErrorAttributes.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/ErrorAttributes.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -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.0 in favor of + * @deprecated since 2.3 for removal in 2.5 in favor of * {@link #getErrorAttributes(WebRequest, ErrorAttributeOptions)} */ @Deprecated diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/ErrorController.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/ErrorController.java index 225e345d2e..b15bbfd63e 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/ErrorController.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/ErrorController.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 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. @@ -33,7 +33,8 @@ 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.0 in favor of setting the property `server.error.path` + * @deprecated since 2.3 for removal in 2.5 in favor of setting the property + * `server.error.path` */ @Deprecated String getErrorPath();