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

Merge branch '2.3.x' into 2.4.x 

See gh-25825
This commit is contained in:
Andy Wilkinson 2021-03-30 09:23:24 +01:00
parent a0f5169966 8b6eef6f1d
commit d9ce30b15c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java vendored
View File

@ -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 to make package-private in 2.4
* @deprecated since 2.3 for removal in 2.5
*/
@Deprecated
public static OperationInvoker apply(OperationInvoker invoker, long timeToLive) {

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientBuilderCustomizer.java
View File

@ -25,7 +25,7 @@ import org.elasticsearch.client.RestClientBuilder;
*
* @author Brian Clozel
* @since 2.1.0
* @deprecated as of 2.3.1 for removal in 2.5 in favor of
* @deprecated since 2.3.1 for removal in 2.5 in favor of
* {@link org.springframework.boot.autoconfigure.elasticsearch.RestClientBuilderCustomizer}
*/
@FunctionalInterface