Merge branch '3.4.x'

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointDocumentationTests.java

@@ -57,7 +57,7 @@
  * @author Andy Wilkinson
  */
 @TestPropertySource(
-		properties = "spring.config.location=classpath:/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/")
+		properties = "spring.config.location=classpath:/org/springframework/boot/actuate/autoconfigure/env/")
 class EnvironmentEndpointDocumentationTests extends MockMvcEndpointDocumentationTests {
 
 	private static final FieldDescriptor activeProfiles = fieldWithPath("activeProfiles")

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/flyway/FlywayEndpointDocumentationTests.java

@@ -46,7 +46,7 @@
  * @author Andy Wilkinson
  */
 @TestPropertySource(
-		properties = "spring.flyway.locations=classpath:org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation")
+		properties = "spring.flyway.locations=classpath:org/springframework/boot/actuate/autoconfigure/flyway")
 class FlywayEndpointDocumentationTests extends MockMvcEndpointDocumentationTests {
 
 	@Test

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointDocumentationTests.java

@@ -44,7 +44,7 @@
  * @author Andy Wilkinson
  */
 @TestPropertySource(
-		properties = "spring.liquibase.change-log=classpath:org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/db.changelog-master.yaml")
+		properties = "spring.liquibase.change-log=classpath:org/springframework/boot/actuate/autoconfigure/liquibase/db.changelog-master.yaml")
 class LiquibaseEndpointDocumentationTests extends MockMvcEndpointDocumentationTests {
 
 	@Test

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointDocumentationTests.java

@@ -56,7 +56,7 @@ static class TestConfiguration {
 		LogFileWebEndpoint endpoint() {
 			MockEnvironment environment = new MockEnvironment();
 			environment.setProperty("logging.file.name",
-					"src/test/resources/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/sample.log");
+					"src/test/resources/org/springframework/boot/actuate/autoconfigure/logging/sample.log");
 			return new LogFileWebEndpoint(LogFile.get(environment), null);
 		}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/sbom/SbomEndpointDocumentationTests.java

@@ -58,8 +58,7 @@ static class TestConfiguration {
 		SbomProperties sbomProperties() {
 			SbomProperties properties = new SbomProperties();
 			properties.getApplication()
-				.setLocation(
-						"classpath:org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/cyclonedx.json");
+				.setLocation("classpath:org/springframework/boot/actuate/autoconfigure/sbom/cyclonedx.json");
 			return properties;
 		}