Merge branch '2.6.x' into 2.7.x

Closes gh-33255

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

@@ -16,6 +16,7 @@
 
 package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
 
+import java.time.Instant;
 import java.util.List;
 import java.util.Properties;
 
@@ -83,7 +84,7 @@ class InfoEndpointDocumentationTests extends MockMvcEndpointDocumentationTests {
 			properties.put("branch", "main");
 			properties.put("commit.id", "df027cf1ec5aeba2d4fedd7b8c42b88dc5ce38e5");
 			properties.put("commit.id.abbrev", "df027cf");
-			properties.put("commit.time", Long.toString(System.currentTimeMillis()));
+			properties.put("commit.time", Long.toString(Instant.now().getEpochSecond()));
 			GitProperties gitProperties = new GitProperties(properties);
 			return new GitInfoContributor(gitProperties);
 		}