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-test/src/main/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunner.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.
@@ -113,7 +113,7 @@ public abstract class AbstractApplicationContextRunner<SELF extends AbstractAppl
/**
* Create a new {@link AbstractApplicationContextRunner} instance.
* @param contextFactory the factory used to create the actual context
* @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 #AbstractApplicationContextRunner(Supplier, Function)}
*/
@Deprecated
@@ -162,7 +162,7 @@ public abstract class AbstractApplicationContextRunner<SELF extends AbstractAppl
* @param parent the parent
* @param beanRegistrations the bean registrations
* @param configurations the configuration
* @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 #AbstractApplicationContextRunner(Supplier, Function)}
*/
@Deprecated