Move Undertow management server support to spring-boot-undertow

Issue: 46074

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle

@@ -63,7 +63,6 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-security-oauth2-resource-server"))
 	optional(project(":spring-boot-project:spring-boot-security-saml2"))
 	optional(project(":spring-boot-project:spring-boot-tomcat"))
-	optional(project(":spring-boot-project:spring-boot-undertow"))
 	optional(project(":spring-boot-project:spring-boot-validation"))
 	optional(project(":spring-boot-project:spring-boot-webclient"))
 	optional(project(":spring-boot-project:spring-boot-webflux"))
@@ -112,7 +111,6 @@ dependencies {
 	optional("io.r2dbc:r2dbc-pool")
 	optional("io.r2dbc:r2dbc-proxy")
 	optional("io.r2dbc:r2dbc-spi")
-	optional("io.undertow:undertow-servlet")
 	optional("jakarta.persistence:jakarta.persistence-api")
 	optional("jakarta.servlet:jakarta.servlet-api")
 	optional("org.apache.activemq:activemq-broker")
@@ -160,8 +158,6 @@ dependencies {
 	testImplementation("io.prometheus:prometheus-metrics-exposition-formats")
 	testImplementation("io.r2dbc:r2dbc-h2")
 	testImplementation("com.squareup.okhttp3:mockwebserver")
-	testImplementation("io.undertow:undertow-core")
-	testImplementation("io.undertow:undertow-servlet")
 	testImplementation("jakarta.xml.bind:jakarta.xml.bind-api")
 	testImplementation("org.apache.activemq:artemis-jakarta-client")
 	testImplementation("org.apache.activemq:artemis-jakarta-server")

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports

@@ -2,7 +2,5 @@ org.springframework.boot.actuate.autoconfigure.endpoint.web.reactive.WebFluxEndp
 org.springframework.boot.actuate.autoconfigure.endpoint.web.servlet.WebMvcEndpointManagementContextConfiguration
 org.springframework.boot.actuate.autoconfigure.security.servlet.SecurityRequestMatchersManagementContextConfiguration
 org.springframework.boot.actuate.autoconfigure.web.reactive.ReactiveManagementChildContextConfiguration
-org.springframework.boot.actuate.autoconfigure.web.server.undertow.UndertowReactiveManagementChildContextConfiguration
-org.springframework.boot.actuate.autoconfigure.web.server.undertow.UndertowServletManagementChildContextConfiguration
 org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementChildContextConfiguration
 org.springframework.boot.actuate.autoconfigure.web.servlet.WebMvcEndpointChildContextConfiguration

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -67,6 +67,4 @@ org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesAutoCo
 org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.web.mappings.MappingsEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.web.server.netty.NettyReactiveManagementContextAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.web.server.undertow.UndertowReactiveManagementContextAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.web.server.undertow.UndertowServletManagementContextAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration

spring-boot-project/spring-boot-undertow/build.gradle

@@ -30,6 +30,7 @@ dependencies {
 	api("io.undertow:undertow-servlet")
 
 	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
+	optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	optional("io.undertow:undertow-websockets-jsr")
 	optional("org.springframework:spring-webflux")
 

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/undertow/UndertowAccessLogCustomizer.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/actuate/autoconfigure/web/server/UndertowAccessLogCustomizer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.web.server.undertow;
+package org.springframework.boot.undertow.actuate.autoconfigure.web.server;
 
 import java.util.function.Function;
 

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/undertow/UndertowManagementServerProperties.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/actuate/autoconfigure/web/server/UndertowManagementServerProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.web.server.undertow;
+package org.springframework.boot.undertow.actuate.autoconfigure.web.server;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/undertow/UndertowReactiveManagementChildContextConfiguration.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/actuate/autoconfigure/web/server/UndertowReactiveManagementChildContextConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.web.server.undertow;
+package org.springframework.boot.undertow.actuate.autoconfigure.web.server;
 
 import io.undertow.Undertow;
 

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/undertow/UndertowReactiveManagementContextAutoConfiguration.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/actuate/autoconfigure/web/server/UndertowReactiveManagementContextAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.web.server.undertow;
+package org.springframework.boot.undertow.actuate.autoconfigure.web.server;
 
 import io.undertow.Undertow;
 
@@ -37,7 +37,7 @@
  * @since 4.0.0
  */
 @AutoConfiguration
-@ConditionalOnClass(Undertow.class)
+@ConditionalOnClass({ Undertow.class, ManagementContextFactory.class })
 @ConditionalOnWebApplication(type = Type.REACTIVE)
 @ConditionalOnManagementPort(ManagementPortType.DIFFERENT)
 public class UndertowReactiveManagementContextAutoConfiguration {

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/undertow/UndertowServletManagementChildContextConfiguration.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/actuate/autoconfigure/web/server/UndertowServletManagementChildContextConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.web.server.undertow;
+package org.springframework.boot.undertow.actuate.autoconfigure.web.server;
 
 import io.undertow.Undertow;
 

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/undertow/UndertowServletManagementContextAutoConfiguration.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/actuate/autoconfigure/web/server/UndertowServletManagementContextAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.web.server.undertow;
+package org.springframework.boot.undertow.actuate.autoconfigure.web.server;
 
 import io.undertow.Undertow;
 
@@ -37,7 +37,7 @@
  * @since 4.0.0
  */
 @AutoConfiguration
-@ConditionalOnClass(Undertow.class)
+@ConditionalOnClass({ Undertow.class, ManagementContextFactory.class })
 @ConditionalOnWebApplication(type = Type.SERVLET)
 @ConditionalOnManagementPort(ManagementPortType.DIFFERENT)
 public class UndertowServletManagementContextAutoConfiguration {