From 9763ba56baa8426290849419b6f113c6cd4465f0 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 30 Nov 2020 14:33:20 +0100
Subject: [PATCH] Start building against Spring Framework 5.2.12 snapshots

See gh-24276
---
 .../web/documentation/BeansEndpointDocumentationTests.java  | 6 ++++--
 spring-boot-project/spring-boot-dependencies/pom.xml        | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/BeansEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/BeansEndpointDocumentationTests.java
index e96b6ac54fc..41a4ae8563c 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/BeansEndpointDocumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/BeansEndpointDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.restdocs.payload.FieldDescriptor;
+import org.springframework.restdocs.payload.JsonFieldType;
 import org.springframework.restdocs.payload.ResponseFieldsSnippet;
 import org.springframework.util.CollectionUtils;
 
@@ -52,7 +53,8 @@ class BeansEndpointDocumentationTests extends MockMvcEndpointDocumentationTests
 		List<FieldDescriptor> beanFields = Arrays.asList(fieldWithPath("aliases").description("Names of any aliases."),
 				fieldWithPath("scope").description("Scope of the bean."),
 				fieldWithPath("type").description("Fully qualified type of the bean."),
-				fieldWithPath("resource").description("Resource in which the bean was defined, if any.").optional(),
+				fieldWithPath("resource").description("Resource in which the bean was defined, if any.").optional()
+						.type(JsonFieldType.STRING),
 				fieldWithPath("dependencies").description("Names of any dependencies."));
 		ResponseFieldsSnippet responseFields = responseFields(
 				fieldWithPath("contexts").description("Application contexts keyed by id."), parentIdField(),
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index b531304179b..b321b3221de 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -191,7 +191,7 @@
 		<spring-batch.version>4.2.4.RELEASE</spring-batch.version>
 		<spring-cloud-connectors.version>2.0.7.RELEASE</spring-cloud-connectors.version>
 		<spring-data-releasetrain.version>Moore-SR11</spring-data-releasetrain.version>
-		<spring-framework.version>5.2.10.RELEASE</spring-framework.version>
+		<spring-framework.version>5.2.12.BUILD-SNAPSHOT</spring-framework.version>
 		<spring-hateoas.version>1.0.5.RELEASE</spring-hateoas.version>
 		<spring-integration.version>5.2.9.RELEASE</spring-integration.version>
 		<spring-kafka.version>2.3.12.RELEASE</spring-kafka.version>