root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.4.x'

This commit is contained in:
Phillip Webb 2021-03-30 09:26:16 -07:00
parent fe1011c23d a28a3ae090
commit 8c31d29acf
51 changed files with 85 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java
View File

@ -137,7 +137,7 @@ public class ManagementServerProperties {
* Return the context path with no trailing slash (i.e. the '/' root context is
* represented as the empty string).
* @return the context path (no trailing slash)
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link ManagementServerProperties#getBasePath()}
*/
@Deprecated
@ -149,7 +149,7 @@ public class ManagementServerProperties {
/**
* Set the context path.
* @param contextPath the context path
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link ManagementServerProperties#setBasePath(String)}
*/
@Deprecated

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cassandra/CassandraHealthIndicator.java
View File

@ -32,7 +32,7 @@ import org.springframework.util.Assert;
* @author Julien Dubois
* @author Alexandre Dutra
* @since 2.0.0
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link CassandraDriverHealthIndicator}
*/
@Deprecated

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cassandra/CassandraReactiveHealthIndicator.java
View File

@ -31,7 +31,7 @@ import org.springframework.util.Assert;
*
* @author Artsiom Yudovin
* @since 2.1.0
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link CassandraDriverHealthIndicator}
*/
@Deprecated

4
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/InvocationContext.java
View File

@ -56,7 +56,7 @@ public class InvocationContext {
* @param securityContext the current security context. Never {@code null}
* @param arguments the arguments available to the operation. Never {@code null}
* @since 2.2.0
* @deprecated since 2.5 for removal in 2.7 in favor of
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of
* {@link #InvocationContext(SecurityContext, Map, OperationArgumentResolver[])}
*/
@Deprecated
@ -98,7 +98,7 @@ public class InvocationContext {
/**
* Return the security context to use for the invocation.
* @return the security context
* @deprecated since 2.5 for removal in 2.7 in favor of
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of
* {@link #resolveArgument(Class)}
*/
@Deprecated

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/http/ApiVersion.java
View File

@ -66,7 +66,7 @@ public enum ApiVersion implements Producible<ApiVersion> {
* will be deduced based on the {@code Accept} header.
* @param headers the HTTP headers
* @return the API version to use
* @deprecated since 2.5 for removal in 2.7 in favor of direct injection with
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of direct injection with
* resolution via the {@link ProducibleOperationArgumentResolver}.
*/
@Deprecated

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/WebFluxTags.java
View File

@ -172,7 +172,7 @@ public final class WebFluxTags {
* @param exchange the exchange
* @return the outcome tag derived from the response status
* @since 2.1.0
* @deprecated since 2.5 for removal in 2.7 in favor of
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of
* {@link #outcome(ServerWebExchange, Throwable)}
*/
@Deprecated

7
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java
View File

@ -39,7 +39,7 @@ public class BatchProperties {
/**
* Return the datasource schema.
* @return the schema
* @deprecated since 2.5 for removal in 2.7 in favor of {@link Jdbc#getSchema()}
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of {@link Jdbc#getSchema()}
*/
@Deprecated
@DeprecatedConfigurationProperty(replacement = "spring.batch.jdbc.schema")
@ -55,7 +55,8 @@ public class BatchProperties {
/**
* Return the table prefix.
* @return the table prefix
* @deprecated since 2.5 for removal in 2.7 in favor of {@link Jdbc#getTablePrefix()}
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of
* {@link Jdbc#getTablePrefix()}
*/
@Deprecated
@DeprecatedConfigurationProperty(replacement = "spring.batch.jdbc.table-prefix")
@ -71,7 +72,7 @@ public class BatchProperties {
/**
* Return whether the schema should be initialized.
* @return the initialization mode
* @deprecated since 2.5 for removal in 2.7 in favor of
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of
* {@link Jdbc#getInitializeSchema()}
*/
@Deprecated

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

@ -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.6 in favor of
* @deprecated since 2.3.0 for removal in 2.6.0 in favor of
* {@link JobLauncherApplicationRunner}
*/
@Deprecated

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/EntityManagerFactoryDependsOnPostProcessor.java
View File

@ -32,7 +32,7 @@ import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
* @author Andrii Hrytsiuk
* @since 1.1.0
* @see BeanDefinition#setDependsOn(String[])
* @deprecated since 2.5 for removal in 2.7 in favor of
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of
* {@link org.springframework.boot.autoconfigure.orm.jpa.EntityManagerFactoryDependsOnPostProcessor}
*/
@Deprecated

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayMigrationScriptMissingException.java
View File

@ -25,7 +25,7 @@ import java.util.List;
* @author Anand Shastri
* @author Stephane Nicoll
* @since 2.2.0
* @deprecated since 2.5 for removal in 2.7 as location checking is deprecated
* @deprecated since 2.5.0 for removal in 2.7.0 as location checking is deprecated
*/
@Deprecated
public class FlywayMigrationScriptMissingException extends RuntimeException {

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayMigrationScriptMissingFailureAnalyzer.java
View File

@ -25,7 +25,7 @@ import org.springframework.boot.diagnostics.FailureAnalysis;
*
* @author Anand Shastri
* @author Stephane Nicoll
* @deprecated since 2.5 for removal in 2.7 as location checking is deprecated
* @deprecated since 2.5.0 for removal in 2.7.0 as location checking is deprecated
*/
@Deprecated
class FlywayMigrationScriptMissingFailureAnalyzer

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
View File

@ -546,7 +546,7 @@ public class FlywayProperties {
/**
* Return if a new datasource is being created.
* @return {@code true} if a new datasource is created
* @deprecated since 2.5 for removal in 2.7 in favor of directly checking user and
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of directly checking user and
* url.
*/
@Deprecated

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaHttpMessageConverterConfiguration.java
View File

@ -42,7 +42,8 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl
*
* @author Andy Wilkinson
* @since 1.3.0
* @deprecated since 2.5 for removal in 2.7 in favor of a {@link HalConfiguration} bean
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of a {@link HalConfiguration}
* bean
*/
@Deprecated
@Configuration(proxyBeanMethods = false)

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceSchemaCreatedEvent.java
View File

@ -28,8 +28,8 @@ import org.springframework.context.ApplicationEvent;
* @author Dave Syer
* @author Stephane Nicoll
* @since 2.0.0
* @deprecated since 2.5 for removal in 2.7 with no replacement as the event is no longer
* published
* @deprecated since 2.5.0 for removal in 2.7.0 with no replacement as the event is no
* longer published
*/
@SuppressWarnings("serial")
@Deprecated

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcOperationsDependsOnPostProcessor.java
View File

@ -33,7 +33,7 @@ import org.springframework.jdbc.core.JdbcOperations;
* @author Andrii Hrytsiuk
* @since 2.0.4
* @see BeanDefinition#setDependsOn(String[])
* @deprecated since 2.5 for removal in 2.7 in favor of
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of
* {@link DependsOnDatabaseInitializationDetector}
*/
@Deprecated

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/NamedParameterJdbcOperationsDependsOnPostProcessor.java
View File

@ -31,7 +31,7 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
* @author Andrii Hrytsiuk
* @since 2.1.4
* @see BeanDefinition#setDependsOn(String[])
* @deprecated since 2.5 for removal in 2.7 in favor of
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of
* {@link DependsOnDatabaseInitializationDetector}
*/
@Deprecated

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisProperties.java
View File

@ -93,7 +93,7 @@ public class ArtemisProperties {
/**
* Return the host of the broker.
* @return the host
* @deprecated since 2.5 for removal in 2.7 in favor of broker url
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of broker url
*/
@Deprecated
@DeprecatedConfigurationProperty(replacement = "spring.artemis.broker-url")
@ -109,7 +109,7 @@ public class ArtemisProperties {
/**
* Return the port of the broker.
* @return the port
* @deprecated since 2.5 for removal in 2.7 in favor of broker url
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of broker url
*/
@Deprecated
@DeprecatedConfigurationProperty(replacement = "spring.artemis.broker-url")

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/DslContextDependsOnPostProcessor.java
View File

@ -30,7 +30,7 @@ import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitializat
* @author Eddú Meléndez
* @since 2.3.9
* @see BeanDefinition#setDependsOn(String[])
* @deprecated since 2.5 for removal in 2.7 in favor of
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of
* {@link DependsOnDatabaseInitializationDetector}
*/
@Deprecated

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java
View File

@ -198,7 +198,8 @@ public class MongoProperties {
/**
* Return the GridFS database name.
* @return the GridFS database name
* @deprecated since 2.4 for removal in 2.6 in favor of {@link Gridfs#getDatabase()}
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link Gridfs#getDatabase()}
*/
@DeprecatedConfigurationProperty(replacement = "spring.data.mongodb.gridfs.database")
@Deprecated

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheEnvironmentCollector.java
View File

@ -34,8 +34,8 @@ import org.springframework.core.env.Environment;
* @author Dave Syer
* @author Madhura Bhave
* @since 1.2.2
* @deprecated since 2.5 for removal in 2.7 in favor of direct addition of values from the
* Environment to the model
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of direct addition of values from
* the Environment to the model
*/
@Deprecated
public class MustacheEnvironmentCollector extends DefaultCollector implements EnvironmentAware {

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/netty/NettyProperties.java
View File

@ -22,7 +22,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* {@link ConfigurationProperties @ConfigurationProperties} for the Netty engine.
* <p>
* These properties apply globally to the Netty library, used as a client or a server.
*
*
* @author Brian Clozel
* @since 2.5.0
*/

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryBuilder.java
View File

@ -31,7 +31,7 @@ import io.r2dbc.spi.ConnectionFactoryOptions.Builder;
* @author Tadaya Tsuyukubo
* @author Stephane Nicoll
* @since 2.3.0
* @deprecated since 2.5 for removal in 2.7 in favor of
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of
* {@link org.springframework.boot.r2dbc.ConnectionFactoryBuilder}
*/
@Deprecated

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/EmbeddedDatabaseConnection.java
View File

@ -25,7 +25,7 @@ import org.springframework.util.ClassUtils;
* @author Mark Paluch
* @author Stephane Nicoll
* @since 2.3.0
* @deprecated since 2.5 for removal in 2.7 in favor of
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of
* {@link org.springframework.boot.r2dbc.EmbeddedDatabaseConnection}
*/
@Deprecated

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java
View File

@ -31,7 +31,8 @@ import org.springframework.boot.context.properties.DeprecatedConfigurationProper
* @author Venil Noronha
* @author Kristine Jetzke
* @since 1.1.0
* @deprecated since 2.4 for removal in 2.6 in favor of {@link WebProperties.Resources}
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link WebProperties.Resources}
*/
@Deprecated
@ConfigurationProperties(prefix = "spring.resources", ignoreUnknownFields = false)

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/AbstractErrorWebExceptionHandler.java
View File

@ -97,7 +97,7 @@ public abstract class AbstractErrorWebExceptionHandler implements ErrorWebExcept
* @param errorAttributes the error attributes
* @param resourceProperties the resource properties
* @param applicationContext the application context
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #AbstractErrorWebExceptionHandler(ErrorAttributes, Resources, ApplicationContext)}
*/
@Deprecated
@ -157,7 +157,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

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandler.java
View File

@ -97,7 +97,7 @@ public class DefaultErrorWebExceptionHandler extends AbstractErrorWebExceptionHa
* @param resourceProperties the resources configuration properties
* @param errorProperties the error configuration properties
* @param applicationContext the current application context
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #DefaultErrorWebExceptionHandler(ErrorAttributes, Resources, ErrorProperties, ApplicationContext)}
*/
@Deprecated

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java
View File

@ -553,7 +553,7 @@ public class WebMvcProperties {
/**
* Locale resolution options.
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link org.springframework.boot.autoconfigure.web.WebProperties.LocaleResolver}
*/
@Deprecated

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/DefaultErrorViewResolver.java
View File

@ -78,7 +78,7 @@ public class DefaultErrorViewResolver implements ErrorViewResolver, Ordered {
* Create a new {@link DefaultErrorViewResolver} instance.
* @param applicationContext the source application context
* @param resourceProperties resource properties
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #DefaultErrorViewResolver(ApplicationContext, Resources)}
*/
@Deprecated

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayMigrationScriptMissingFailureAnalyzerTests.java
View File

@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* Tests for {@link FlywayMigrationScriptMissingFailureAnalyzer}.
*
* @author Anand Shastri
* @deprecated since 2.5 for removal in 2.7 as location checking is deprecated
* @deprecated since 2.5.0 for removal in 2.7.0 as location checking is deprecated
*/
@Deprecated
class FlywayMigrationScriptMissingFailureAnalyzerTests {

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ConfigFileApplicationContextInitializer.java
View File

@ -28,7 +28,7 @@ import org.springframework.test.context.ContextConfiguration;
* @author Phillip Webb
* @since 1.4.0
* @see org.springframework.boot.context.config.ConfigFileApplicationListener
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link ConfigDataApplicationContextInitializer}
*/
@Deprecated

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java
View File

@ -314,7 +314,7 @@ public final class TestPropertyValues {
* Create a new {@link Pair} instance.
* @param name the name
* @param value the value
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #of(String, String)}
*/
@Deprecated

8
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildLog.java
View File

@ -47,7 +47,7 @@ public interface BuildLog {
* @param request the build request
* @param imageReference the builder image reference
* @return a consumer for progress update events
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #pullingImage(ImageReference, ImageType)}
*/
@Deprecated
@ -57,7 +57,7 @@ public interface BuildLog {
* Log that the builder image has been pulled.
* @param request the build request
* @param image the builder image that was pulled
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #pulledImage(Image, ImageType)}
*/
@Deprecated
@ -68,7 +68,7 @@ public interface BuildLog {
* @param request the build request
* @param imageReference the run image reference
* @return a consumer for progress update events
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #pullingImage(ImageReference, ImageType)}
*/
@Deprecated
@ -78,7 +78,7 @@ public interface BuildLog {
* Log that a run image has been pulled.
* @param request the build request
* @param image the run image that was pulled
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #pulledImage(Image, ImageType)}
*/
@Deprecated

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java
View File

@ -68,7 +68,7 @@ public class SpringBootExtension {
/**
* Returns the fully-qualified main class name of the application.
* @return the fully-qualified name of the application's main class
* @deprecated since 2.4 for removal in 2.6 in favor of {@link #getMainClass()}.
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of {@link #getMainClass()}.
*/
@Deprecated
@ReplacedBy("mainClass")
@ -79,7 +79,7 @@ public class SpringBootExtension {
/**
* Sets the fully-qualified main class name of the application.
* @param mainClassName the fully-qualified name of the application's main class
* @deprecated since 2.4 for removal in 2.6 in favor of {@link #getMainClass} and
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of {@link #getMainClass} and
* {@link Property#set(Object)}
*/
@Deprecated

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchive.java
View File

@ -47,7 +47,7 @@ public interface BootArchive extends Task {
/**
* Returns the fully-qualified main class name of the application.
* @return the fully-qualified name of the application's main class
* @deprecated since 2.4 for removal in 2.6 in favor of {@link #getMainClass()}.
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of {@link #getMainClass()}.
*/
@Deprecated
@ReplacedBy("mainClass")
@ -56,7 +56,7 @@ public interface BootArchive extends Task {
/**
* Sets the fully-qualified main class name of the application.
* @param mainClassName the fully-qualified name of the application's main class
* @deprecated since 2.4 for removal in 2.6 in favor of {@link #getMainClass} and
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of {@link #getMainClass} and
* {@link Property#set(Object)}
*/
@Deprecated

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImage.java
View File

@ -117,7 +117,7 @@ public class BootBuildImage extends DefaultTask {
/**
* Returns the property for the archive file from which the image will be built.
* @return the archive file property
* @deprecated since 2.5 for removal in 2.7 in favor of {@link #getArchiveFile()}
* @deprecated since 2.5.0 for removal in 2.7.0 in favor of {@link #getArchiveFile()}
*/
@Deprecated
@Input

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java
View File

@ -183,7 +183,7 @@ public class BootJar extends Jar implements BootArchive {
/**
* Configures the jar to be layered using the default layering.
* @since 2.3.0
* @deprecated since 2.4 for removal in 2.6 as layering as now enabled by default.
* @deprecated since 2.4.0 for removal in 2.6.0 as layering as now enabled by default.
*/
@Deprecated
public void layered() {

4
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java
View File

@ -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

8
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/Archive.java
View File

@ -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.
*/

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java
View File

@ -70,7 +70,7 @@ public class ArtifactsLibraries implements Libraries {
* @param artifacts the artifacts to represent as libraries
* @param unpacks artifacts that should be unpacked on launch
* @param log the log
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #ArtifactsLibraries(Set, Collection, Collection, Log)}
*/
@Deprecated

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

@ -164,7 +164,7 @@ public class SpringApplication {
/**
* The class name of application context that will be used by default for non-web
* environments.
* @deprecated since 2.4 for removal in 2.6 in favor of using a
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of using a
* {@link ApplicationContextFactory}
*/
@Deprecated
@ -174,7 +174,7 @@ public class SpringApplication {
/**
* The class name of application context that will be used by default for web
* environments.
* @deprecated since 2.4 for removal in 2.6 in favor of using an
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of using an
* {@link ApplicationContextFactory}
*/
@Deprecated
@ -184,7 +184,7 @@ public class SpringApplication {
/**
* The class name of application context that will be used by default for reactive web
* environments.
* @deprecated since 2.4 for removal in 2.6 in favor of using an
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of using an
* {@link ApplicationContextFactory}
*/
@Deprecated
@ -1233,7 +1233,7 @@ public class SpringApplication {
* applications or {@link AnnotationConfigApplicationContext} for non web based
* applications.
* @param applicationContextClass the context class to set
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #setApplicationContextFactory(ApplicationContextFactory)}
*/
@Deprecated

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

@ -47,7 +47,7 @@ public interface SpringApplicationRunListener {
/**
* Called immediately when the run method has first started. Can be used for very
* early initialization.
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #starting(ConfigurableBootstrapContext)}
*/
@Deprecated
@ -69,7 +69,7 @@ public interface SpringApplicationRunListener {
* Called once the environment has been prepared, but before the
* {@link ApplicationContext} has been created.
* @param environment the environment
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #environmentPrepared(ConfigurableBootstrapContext, ConfigurableEnvironment)}
*/
@Deprecated

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

@ -276,7 +276,7 @@ public class SpringApplicationBuilder {
* Explicitly set the context class to be used.
* @param cls the context class to use
* @return the current builder
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #contextFactory(ApplicationContextFactory)}
*/
@Deprecated

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

@ -107,7 +107,7 @@ public class CloudFoundryVcapEnvironmentPostProcessor
/**
* Create a new {@link CloudFoundryVcapEnvironmentPostProcessor} instance.
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #CloudFoundryVcapEnvironmentPostProcessor(Log)}
*/
@Deprecated
@ -154,7 +154,7 @@ public class CloudFoundryVcapEnvironmentPostProcessor
/**
* Event listener used to switch logging.
* @deprecated since 2.4 for removal in 2.6 in favor of only using
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of only using
* {@link EnvironmentPostProcessor} callbacks
*/
@Deprecated

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

@ -112,7 +112,7 @@ import org.springframework.util.StringUtils;
* @author Madhura Bhave
* @author Scott Frederick
* @since 1.0.0
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link ConfigDataEnvironmentPostProcessor}
*/
@Deprecated

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/FilteredPropertySource.java
View File

@ -28,7 +28,7 @@ import org.springframework.core.env.PropertySource;
* {@link ConfigFileApplicationListener} to filter out properties for specific operations.
*
* @author Phillip Webb
* @deprecated since 2.4 for removal in 2.6 along with
* @deprecated since 2.4.0 for removal in 2.6.0 along with
* {@link ConfigFileApplicationListener}
*/
@Deprecated

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

@ -40,7 +40,7 @@ public class ApplicationEnvironmentPreparedEvent extends SpringApplicationEvent
* @param application the current application
* @param args the arguments the application is running with
* @param environment the environment that was just created
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #ApplicationEnvironmentPreparedEvent(ConfigurableBootstrapContext, SpringApplication, String[], ConfigurableEnvironment)}
*/
@Deprecated

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationStartingEvent.java
View File

@ -42,7 +42,7 @@ public class ApplicationStartingEvent extends SpringApplicationEvent {
* Create a new {@link ApplicationStartingEvent} instance.
* @param application the current application
* @param args the arguments the application is running with
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #ApplicationStartingEvent(ConfigurableBootstrapContext, SpringApplication, String[])}
*/
@Deprecated

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/ClasspathLoggingApplicationListener.java
View File

@ -38,7 +38,7 @@ import org.springframework.core.ResolvableType;
*
* @author Andy Wilkinson
* @since 2.0.0
* @deprecated since 2.4 for removal in 2.6 with no direct replacement.
* @deprecated since 2.4.0 for removal in 2.6.0 with no direct replacement.
* {@link FailureAnalysis} is now the preferred approach for diagnosing and reporting
* startup failures.
*/

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

@ -63,7 +63,7 @@ public enum EmbeddedDatabaseConnection {
/**
* HSQL Database Connection.
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link EmbeddedDatabaseConnection#HSQLDB}.
*/
@Deprecated
@ -141,7 +141,7 @@ public enum EmbeddedDatabaseConnection {
* database type.
* @param driverClass the driver class
* @return true if the driver class is one of the embedded types
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #isEmbedded(String, String)}
*/
@Deprecated

10
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java
View File

@ -83,7 +83,7 @@ public class LoggingSystemProperties {
/**
* The name of the System property that contains the rolled-over log file name
* pattern.
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_FILE_NAME_PATTERN}
*/
@Deprecated
@ -91,7 +91,7 @@ public class LoggingSystemProperties {
/**
* The name of the System property that contains the clean history on start flag.
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_CLEAN_HISTORY_ON_START}
*/
@Deprecated
@ -99,7 +99,7 @@ public class LoggingSystemProperties {
/**
* The name of the System property that contains the file log max size.
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_MAX_FILE_SIZE}
*/
@Deprecated
@ -107,7 +107,7 @@ public class LoggingSystemProperties {
/**
* The name of the System property that contains the file total size cap.
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_TOTAL_SIZE_CAP}
*/
@Deprecated
@ -115,7 +115,7 @@ public class LoggingSystemProperties {
/**
* The name of the System property that contains the file log max history.
* @deprecated since 2.4 for removal in 2.6 in favor of
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_MAX_HISTORY}
*/
@Deprecated

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.java
View File

@ -250,7 +250,8 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
* Return if filters should be initialized eagerly.
* @return {@code true} if filters are initialized eagerly, otherwise {@code false}.
* @since 2.0.0
* @deprecated since 2.4 for removal in 2.6 in favor of {@link #isEagerFilterInit()}
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #isEagerFilterInit()}
*/
@Deprecated
public boolean isEagerInitFilters() {
@ -262,7 +263,8 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
* @param eagerInitFilters {@code true} if filters are initialized eagerly, otherwise
* {@code false}.
* @since 2.0.0
* @deprecated since 2.4 for removal in 2.6 in favor of {@link #isEagerFilterInit()}
* @deprecated since 2.4.0 for removal in 2.6.0 in favor of
* {@link #isEagerFilterInit()}
*/
@Deprecated
public void setEagerInitFilters(boolean eagerInitFilters) {