Merge branch 'main' into 4.0.x

snicoll · snicoll · commit 3836b6055d5e · 2025-06-02T16:18:11.000+02:00
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -128,7 +128,7 @@ public void customize(ConfigurableServletWebServerFactory factory) {
 
 		@Override
 		public int getOrder() {
-			return 0;
+			return 10; // Run after ManagementWebServerFactoryCustomizer
 		}
 
 	}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2021 the original author or authors.`
	`2`	`+ * Copyright 2012-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -128,7 +128,7 @@ public void customize(ConfigurableServletWebServerFactory factory) {`
`128`	`128`
`129`	`129`	`@Override`
`130`	`130`	`public int getOrder() {`
`131`		`- return 0;`
	`131`	`+ return 10; // Run after ManagementWebServerFactoryCustomizer`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`}`