root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.3.x' into 2.4.x 

Closes gh-25866
This commit is contained in:
Andy Wilkinson 2021-04-01 16:51:31 +01:00
parent d82889f42e cbf37b3a8b
commit ba28f21e27
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,7 @@ class InfoEndpointDocumentationTests extends MockMvcEndpointDocumentationTests {
@Bean
GitInfoContributor gitInfoContributor() {
Properties properties = new Properties();
properties.put("branch", "master");
properties.put("branch", "main");
properties.put("commit.id", "df027cf1ec5aeba2d4fedd7b8c42b88dc5ce38e5");
properties.put("commit.id.abbrev", "df027cf");
properties.put("commit.time", Long.toString(System.currentTimeMillis()));