Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x

Browse Source 
Closes gh-31174
This commit is contained in:
Andy Wilkinson
2022-05-26 14:01:23 +01:00
parent e617035dba cbf42dea14
commit b3a4982f31
27 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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.
@@ -49,7 +49,7 @@ public abstract class AbstractRabbitListenerContainerFactoryConfigurer<T extends
/**
* Creates a new configurer.
* @deprecated since 2.6.0 for removal in 2.8.0 in favor of
* @deprecated since 2.6.0 for removal in 3.0.0 in favor of
* {@link #AbstractRabbitListenerContainerFactoryConfigurer(RabbitProperties)}
*/
@Deprecated
@@ -94,7 +94,7 @@ public abstract class AbstractRabbitListenerContainerFactoryConfigurer<T extends
/**
* Set the {@link RabbitProperties} to use.
* @param rabbitProperties the {@link RabbitProperties}
* @deprecated since 2.6.0 for removal in 2.8.0 in favor of
* @deprecated since 2.6.0 for removal in 3.0.0 in favor of
* {@link #AbstractRabbitListenerContainerFactoryConfigurer(RabbitProperties)}
*/
@Deprecated

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/DirectRabbitListenerContainerFactoryConfigurer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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 @@ public final class DirectRabbitListenerContainerFactoryConfigurer
/**
* Creates a new configurer.
* @deprecated since 2.6.0 for removal in 2.8.0 in favor of
* @deprecated since 2.6.0 for removal in 3.0.0 in favor of
* {@link #DirectRabbitListenerContainerFactoryConfigurer(RabbitProperties)}
*/
@Deprecated

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitTemplateConfigurer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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 class RabbitTemplateConfigurer {
/**
* Creates a new configurer.
* @deprecated since 2.6.0 for removal in 2.8.0 in favor of
* @deprecated since 2.6.0 for removal in 3.0.0 in favor of
* {@link #RabbitTemplateConfigurer(RabbitProperties)}
*/
@Deprecated
@@ -81,7 +81,7 @@ public class RabbitTemplateConfigurer {
/**
* Set the {@link RabbitProperties} to use.
* @param rabbitProperties the {@link RabbitProperties}
* @deprecated since 2.6.0 for removal in 2.8.0 in favor of
* @deprecated since 2.6.0 for removal in 3.0.0 in favor of
* {@link #RabbitTemplateConfigurer(RabbitProperties)}
*/
@Deprecated

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/SimpleRabbitListenerContainerFactoryConfigurer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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 @@ public final class SimpleRabbitListenerContainerFactoryConfigurer
/**
* Creates a new configurer.
* @deprecated since 2.6.0 for removal in 2.8.0 in favor of
* @deprecated since 2.6.0 for removal in 3.0.0 in favor of
* {@link #SimpleRabbitListenerContainerFactoryConfigurer(RabbitProperties)}
*/
@Deprecated

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceInitializer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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,7 @@ import org.springframework.util.StringUtils;
* @author Dave Syer
* @author Vedran Pavic
* @since 1.0.0
* @deprecated since 2.6.0 for removal in 2.8.0 in favor of
* @deprecated since 2.6.0 for removal in 3.0.0 in favor of
* {@link BatchDataSourceScriptDatabaseInitializer}
*/
@Deprecated

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/DeprecatedReactiveElasticsearchRestClientProperties.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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.util.unit.DataSize;
* Deprecated configuration properties for Elasticsearch Reactive REST clients.
*
* @author Brian Clozel
* @deprecated since 2.6.0 for removal in 2.8.0
* @deprecated since 2.6.0 for removal in 3.0.0
*/
@Deprecated
@ConfigurationProperties(prefix = "spring.data.elasticsearch.client.reactive")

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/DeprecatedElasticsearchRestClientProperties.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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.boot.context.properties.DeprecatedConfigurationProper
* Deprecated configuration properties for Elasticsearch REST clients.
*
* @author Brian Clozel
* @deprecated since 2.6.0 for removal in 2.8.0.
* @deprecated since 2.6.0 for removal in 3.0.0.
*/
@ConfigurationProperties(prefix = "spring.elasticsearch.rest")
@Deprecated

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationDataSourceInitializer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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.StringUtils;
*
* @author Vedran Pavic
* @since 2.0.0
* @deprecated since 2.6.0 for removal in 2.8.0 in favor of
* @deprecated since 2.6.0 for removal in 3.0.0 in favor of
* {@link IntegrationDataSourceScriptDatabaseInitializer}
*/
@Deprecated

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzDataSourceInitializer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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.util.StringUtils;
*
* @author Vedran Pavic
* @since 2.0.0
* @deprecated since 2.6.0 for removal in 2.8.0 in favor of
* @deprecated since 2.6.0 for removal in 3.0.0 in favor of
* {@link QuartzDataSourceScriptDatabaseInitializer}
*/
@Deprecated

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionDataSourceInitializer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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.StringUtils;
*
* @author Vedran Pavic
* @since 1.4.0
* @deprecated since 2.6.0 for removal in 2.8.0 in favor of
* @deprecated since 2.6.0 for removal in 3.0.0 in favor of
* {@link JdbcSessionDataSourceScriptDatabaseInitializer}
*/
@Deprecated

8
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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.
@@ -127,7 +127,7 @@ public class WebFluxProperties {
/**
* Session properties.
*
* @deprecated since 2.6.0 for removal in 2.8.0 in favor of
* @deprecated since 2.6.0 for removal in 3.0.0 in favor of
* {@code server.reactive.session}.
*/
@Deprecated
@@ -145,7 +145,7 @@ public class WebFluxProperties {
/**
* Session cookie properties.
*
* @deprecated since 2.6.0 for removal in 2.8.0 in favor of
* @deprecated since 2.6.0 for removal in 3.0.0 in favor of
* {@link org.springframework.boot.web.server.Cookie}.
*/
@Deprecated
@@ -169,7 +169,7 @@ public class WebFluxProperties {
/**
* SameSite values.
* @deprecated since 2.6.0 for removal in 2.8.0 in favor of
* @deprecated since 2.6.0 for removal in 3.0.0 in favor of
* {@link org.springframework.boot.web.server.Cookie.SameSite}.
*/
@Deprecated