Skip to content

Commit 065fde2

Browse files
committed
Start building against Spring Framework 5.2.12 snapshots
See gh-24277
1 parent 5f81882 commit 065fde2

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/BeansEndpointDocumentationTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
3030
import org.springframework.context.annotation.Configuration;
3131
import org.springframework.context.annotation.Import;
3232
import org.springframework.restdocs.payload.FieldDescriptor;
33+
import org.springframework.restdocs.payload.JsonFieldType;
3334
import org.springframework.restdocs.payload.ResponseFieldsSnippet;
3435
import org.springframework.util.CollectionUtils;
3536

@@ -52,7 +53,8 @@ void beans() throws Exception {
5253
List<FieldDescriptor> beanFields = Arrays.asList(fieldWithPath("aliases").description("Names of any aliases."),
5354
fieldWithPath("scope").description("Scope of the bean."),
5455
fieldWithPath("type").description("Fully qualified type of the bean."),
55-
fieldWithPath("resource").description("Resource in which the bean was defined, if any.").optional(),
56+
fieldWithPath("resource").description("Resource in which the bean was defined, if any.").optional()
57+
.type(JsonFieldType.STRING),
5658
fieldWithPath("dependencies").description("Names of any dependencies."));
5759
ResponseFieldsSnippet responseFields = responseFields(
5860
fieldWithPath("contexts").description("Application contexts keyed by id."), parentIdField(),

spring-boot-project/spring-boot-dependencies/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1672,7 +1672,7 @@ bom {
16721672
]
16731673
}
16741674
}
1675-
library("Spring Framework", "5.2.11.RELEASE") {
1675+
library("Spring Framework", "5.2.12.BUILD-SNAPSHOT") {
16761676
group("org.springframework") {
16771677
imports = [
16781678
"spring-framework-bom"

0 commit comments

Comments
 (0)