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

Merge branch '2.3.x' into 2.4.x

Browse Source
This commit is contained in:
Phillip Webb
2021-03-30 09:21:43 -07:00
parent d9ce30b15c 9c8a97809d
commit a28a3ae090
55 changed files with 91 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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