Merge branch '2.2.x' into 2.3.x

Closes gh-24338
This commit is contained in:
Phillip Webb
2020-12-04 18:13:41 -08:00
83 changed files with 84 additions and 3 deletions

View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.test.web;
import java.util.Objects;

View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.test.system;
import org.junit.jupiter.api.Test;

View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.test.web;
import java.util.Collections;

View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.test.web.client.scan;
import org.springframework.beans.factory.FactoryBean;