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

4
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.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.
@@ -85,7 +85,7 @@ public abstract class OnEndpointElementCondition extends SpringBootCondition {
* Return the default outcome that should be used.
* @param context the condition context
* @return the default outcome
* @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 #getDefaultOutcome(ConditionContext, AnnotationAttributes)}
*/
@Deprecated

8
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/IncludeExcludeEndpointFilter.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.
@@ -58,7 +58,7 @@ public class IncludeExcludeEndpointFilter<E extends ExposableEndpoint<?>> implem
* @param environment the environment containing the properties
* @param prefix the property prefix to bind
* @param defaultIncludes the default {@code includes} to use when none are specified.
* @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 #IncludeExcludeEndpointFilter(Class, Environment, String, String[])}
*/
@Deprecated
@@ -103,7 +103,7 @@ public class IncludeExcludeEndpointFilter<E extends ExposableEndpoint<?>> implem
* @param include the include patterns
* @param exclude the exclude patterns
* @param defaultIncludes the default {@code includes} to use when none are specified.
* @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 #IncludeExcludeEndpointFilter(Class, Environment, String, String[])}
*/
@Deprecated
@@ -174,7 +174,7 @@ public class IncludeExcludeEndpointFilter<E extends ExposableEndpoint<?>> implem
/**
* Default include patterns that can be used.
* @deprecated since 2.6.0 for removal in 2.8.0 in favor of {@link EndpointExposure}.
* @deprecated since 2.6.0 for removal in 3.0.0 in favor of {@link EndpointExposure}.
*/
@Deprecated
public enum DefaultIncludes {