Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Start building against Spring Framework 5.2.12 snapshots

Browse Source 
See gh-24276
This commit is contained in:
Stephane Nicoll 2020-11-30 14:33:20 +01:00
parent afeb9f29d4
commit 9763ba56ba
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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(),

2
spring-boot-project/spring-boot-dependencies/pom.xml
View File

@ -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>