Create spring-boot-undertow module

Author: wilkinsona

settings.gradle

@@ -71,6 +71,7 @@ include "spring-boot-project:spring-boot-testcontainers"
 include "spring-boot-project:spring-boot-test-autoconfigure"
 include "spring-boot-project:spring-boot-test-integration-tests"
 include "spring-boot-project:spring-boot-tomcat"
+include "spring-boot-project:spring-boot-undertow"
 include "spring-boot-tests:spring-boot-integration-tests:spring-boot-configuration-processor-tests"
 include "spring-boot-tests:spring-boot-integration-tests:spring-boot-launch-script-tests"
 include "spring-boot-tests:spring-boot-integration-tests:spring-boot-loader-tests"

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

@@ -18,6 +18,7 @@ dependencies {
 	implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
 
 	optional(project(":spring-boot-project:spring-boot-tomcat"))
+	optional(project(":spring-boot-project:spring-boot-undertow"))
 	optional("ch.qos.logback:logback-classic")
 	optional("org.apache.cassandra:java-driver-core") {
 		exclude group: "org.slf4j", module: "jcl-over-slf4j"

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

@@ -19,7 +19,7 @@
 import java.util.function.Function;
 
 import org.springframework.boot.actuate.autoconfigure.web.server.AccessLogCustomizer;
-import org.springframework.boot.web.server.undertow.ConfigurableUndertowWebServerFactory;
+import org.springframework.boot.undertow.ConfigurableUndertowWebServerFactory;
 
 /**
  * {@link AccessLogCustomizer} for Undertow.

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

@@ -25,10 +25,10 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
-import org.springframework.boot.autoconfigure.web.server.reactive.undertow.UndertowReactiveWebServerAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.undertow.reactive.UndertowReactiveWebServerFactory;
+import org.springframework.boot.undertow.reactive.autoconfigure.UndertowReactiveWebServerAutoConfiguration;
 import org.springframework.boot.web.server.reactive.ReactiveWebServerFactory;
-import org.springframework.boot.web.server.reactive.undertow.UndertowReactiveWebServerFactory;
 import org.springframework.context.annotation.Bean;
 
 /**

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

@@ -26,7 +26,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
-import org.springframework.boot.autoconfigure.web.server.reactive.undertow.UndertowReactiveWebServerAutoConfiguration;
+import org.springframework.boot.undertow.reactive.autoconfigure.UndertowReactiveWebServerAutoConfiguration;
 import org.springframework.boot.web.server.reactive.ReactiveWebServerFactory;
 import org.springframework.context.annotation.Bean;
 

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

@@ -24,7 +24,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
+import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
 
 /**

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

@@ -26,7 +26,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
-import org.springframework.boot.autoconfigure.web.server.servlet.undertow.UndertowServletWebServerAutoConfiguration;
+import org.springframework.boot.undertow.servlet.autoconfigure.UndertowServletWebServerAutoConfiguration;
 import org.springframework.boot.web.server.servlet.ServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
 

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

@@ -24,6 +24,7 @@ dependencies {
 	dockerTestImplementation("org.testcontainers:testcontainers")
 
 	optional(project(":spring-boot-project:spring-boot-tomcat"))
+	optional(project(":spring-boot-project:spring-boot-undertow"))
 	optional("org.apache.cassandra:java-driver-core") {
 		exclude group: "org.slf4j", module: "jcl-over-slf4j"
 	}

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/DispatcherServletHandlerMappings.java

@@ -27,8 +27,8 @@
 import org.apache.catalina.core.StandardWrapper;
 
 import org.springframework.boot.tomcat.TomcatWebServer;
+import org.springframework.boot.undertow.servlet.UndertowServletWebServer;
 import org.springframework.boot.web.server.WebServer;
-import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServer;
 import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext;
 import org.springframework.util.ClassUtils;
 import org.springframework.web.context.WebApplicationContext;
@@ -47,6 +47,10 @@ final class DispatcherServletHandlerMappings {
 	private static final boolean TOMCAT_WEB_SERVER_PRESENT = ClassUtils.isPresent(
 			"org.springframework.boot.tomcat.TomcatWebServer", DispatcherServletHandlerMappings.class.getClassLoader());
 
+	private static final boolean UNDERTOW_WEB_SERVER_PRESENT = ClassUtils.isPresent(
+			"org.springframework.boot.undertow.UndertowWebServer",
+			DispatcherServletHandlerMappings.class.getClassLoader());
+
 	private final String name;
 
 	private final DispatcherServlet dispatcherServlet;
@@ -74,7 +78,7 @@ private void initializeDispatcherServletIfPossible() {
 			return;
 		}
 		WebServer webServer = webServerApplicationContext.getWebServer();
-		if (webServer instanceof UndertowServletWebServer undertowServletWebServer) {
+		if (UNDERTOW_WEB_SERVER_PRESENT && webServer instanceof UndertowServletWebServer undertowServletWebServer) {
 			new UndertowServletInitializer(undertowServletWebServer).initializeServlet(this.name);
 		}
 		else if (TOMCAT_WEB_SERVER_PRESENT && webServer instanceof TomcatWebServer tomcatWebServer) {

spring-boot-project/spring-boot-all-integration-tests/build.gradle

@@ -8,6 +8,7 @@ dependencies {
 	testImplementation(project(":spring-boot-project:spring-boot-all"))
 	testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation(project(":spring-boot-project:spring-boot-undertow"))
 	testImplementation("io.projectreactor.netty:reactor-netty-http")
 	testImplementation("org.apache.httpcomponents.client5:httpclient5")
 	testImplementation("org.eclipse.jetty:jetty-client")

spring-boot-project/spring-boot-all-integration-tests/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerMvcIntegrationTests.java

@@ -24,10 +24,10 @@
 import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.boot.testsupport.web.servlet.DirtiesUrlFactories;
 import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
+import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
 import org.springframework.boot.web.server.WebServer;
 import org.springframework.boot.web.server.servlet.ServletWebServerFactory;
 import org.springframework.boot.web.server.servlet.jetty.JettyServletWebServerFactory;
-import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-boot-project/spring-boot-all/src/main/resources/META-INF/spring/aot.factories

@@ -1,7 +1,6 @@
 org.springframework.aot.hint.RuntimeHintsRegistrar=\
 org.springframework.boot.http.client.ClientHttpRequestFactoryRuntimeHints,\
-org.springframework.boot.jdbc.DataSourceBuilderRuntimeHints,\
-org.springframework.boot.web.server.undertow.UndertowWebServer$UndertowWebServerRuntimeHints
+org.springframework.boot.jdbc.DataSourceBuilderRuntimeHints
 
 org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor=\
 org.springframework.boot.jackson.JsonComponentModule$JsonComponentBeanFactoryInitializationAotProcessor

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

@@ -238,6 +238,7 @@ dependencies {
 
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation(project(":spring-boot-project:spring-boot-undertow"))
 	testImplementation(testFixtures(project(":spring-boot-project:spring-boot")))
 	testImplementation(testFixtures(project(":spring-boot-project:spring-boot-autoconfigure")))
 	testImplementation("ch.qos.logback:logback-classic")

spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -65,14 +65,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "server.undertow.buffers-per-region",
-      "type": "java.lang.Integer",
-      "description": "Number of buffer per region.",
-      "deprecation": {
-        "level": "error"
-      }
-    },
     {
       "name": "spring.activemq.pool.create-connection-on-startup",
       "type": "java.lang.Boolean",

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

@@ -129,9 +129,7 @@ org.springframework.boot.autoconfigure.web.reactive.function.client.ClientHttpCo
 org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration
 org.springframework.boot.autoconfigure.web.server.reactive.jetty.JettyReactiveWebServerAutoConfiguration
 org.springframework.boot.autoconfigure.web.server.reactive.netty.NettyReactiveWebServerAutoConfiguration
-org.springframework.boot.autoconfigure.web.server.reactive.undertow.UndertowReactiveWebServerAutoConfiguration
 org.springframework.boot.autoconfigure.web.server.servlet.jetty.JettyServletWebServerAutoConfiguration
-org.springframework.boot.autoconfigure.web.server.servlet.undertow.UndertowServletWebServerAutoConfiguration
 org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration
 org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration
 org.springframework.boot.autoconfigure.web.servlet.HttpEncodingAutoConfiguration

spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfigurationTests.java

@@ -33,8 +33,8 @@
 import org.springframework.boot.testsupport.web.servlet.DirtiesUrlFactories;
 import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
 import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
+import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
 import org.springframework.boot.web.server.servlet.jetty.JettyServletWebServerFactory;
-import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
 import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

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

@@ -2094,7 +2094,8 @@ bom {
 				"spring-boot-starter-webflux",
 				"spring-boot-starter-websocket",
 				"spring-boot-starter-web-services",
-				"spring-boot-tomcat"
+				"spring-boot-tomcat",
+				"spring-boot-undertow"
 			]
 			plugins = [
 				"spring-boot-maven-plugin"

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

@@ -56,6 +56,7 @@ dependencies {
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-devtools", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-testcontainers", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-tomcat", configuration: "autoConfigurationMetadata"))
+	autoConfiguration(project(path: ":spring-boot-project:spring-boot-undertow", configuration: "autoConfigurationMetadata"))
 
 	configurationProperties(project(path: ":spring-boot-project:spring-boot", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-actuator", configuration: "configurationPropertiesMetadata"))
@@ -67,21 +68,23 @@ dependencies {
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-test-autoconfigure", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-testcontainers", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-tomcat", configuration: "configurationPropertiesMetadata"))
+	configurationProperties(project(path: ":spring-boot-project:spring-boot-undertow", configuration: "configurationPropertiesMetadata"))
 
 	dokkatoo(project(path: ":spring-boot-project:spring-boot-all"))
 	dokkatoo(project(path: ":spring-boot-project:spring-boot-test"))
 
 	implementation(project(path: ":spring-boot-project:spring-boot-actuator"))
 	implementation(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	implementation(project(path: ":spring-boot-project:spring-boot-autoconfigure-all"))
+	implementation(project(path: ":spring-boot-project:spring-boot-devtools"))
 	implementation(project(path: ":spring-boot-project:spring-boot-docker-compose"))
-	implementation(project(path: ":spring-boot-project:spring-boot-tomcat"))
-	implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-cli"))
-	implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
 	implementation(project(path: ":spring-boot-project:spring-boot-test"))
 	implementation(project(path: ":spring-boot-project:spring-boot-test-autoconfigure"))
 	implementation(project(path: ":spring-boot-project:spring-boot-testcontainers"))
-	implementation(project(path: ":spring-boot-project:spring-boot-devtools"))
+	implementation(project(path: ":spring-boot-project:spring-boot-tomcat"))
+	implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-cli"))
+	implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
+	implementation(project(path: ":spring-boot-project:spring-boot-undertow"))
 	implementation("ch.qos.logback:logback-classic")
 	implementation("com.redis:testcontainers-redis")
 	implementation("com.zaxxer:HikariCP")

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/webserver/enablemultiplelistenersinundertow/MyUndertowConfiguration.java

@@ -18,8 +18,8 @@
 
 import io.undertow.Undertow.Builder;
 
+import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
 import org.springframework.boot.web.server.WebServerFactoryCustomizer;
-import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/webserver/enablemultiplelistenersinundertow/MyUndertowConfiguration.kt

@@ -18,8 +18,8 @@ package org.springframework.boot.docs.howto.webserver.enablemultiplelistenersinu
 
 import io.undertow.Undertow
 import org.springframework.boot.web.server.WebServerFactoryCustomizer
-import org.springframework.boot.web.server.undertow.UndertowBuilderCustomizer
-import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory
+import org.springframework.boot.undertow.UndertowBuilderCustomizer
+import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 

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

@@ -5,7 +5,7 @@ plugins {
 description = "Starter for using Undertow as the embedded servlet container. An alternative to spring-boot-starter-tomcat"
 
 dependencies {
-	api("io.undertow:undertow-core")
+	api(project(":spring-boot-project:spring-boot-undertow"))
 	api("io.undertow:undertow-servlet")
 	api("io.undertow:undertow-websockets-jsr")
 	api("org.apache.tomcat.embed:tomcat-embed-el")

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

@@ -0,0 +1,41 @@
+plugins {
+	id "java-library"
+	id "org.springframework.boot.auto-configuration"
+	id "org.springframework.boot.configuration-properties"
+	id "org.springframework.boot.deployed"
+	id "org.springframework.boot.optional-dependencies"
+}
+
+description = "Spring Boot Undertow"
+
+dependencies {
+	api(project(":spring-boot-project:spring-boot"))
+	api("io.undertow:undertow-servlet")
+
+	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
+	optional("io.undertow:undertow-websockets-jsr")
+	optional("org.springframework:spring-webflux")
+
+	testImplementation(project(":spring-boot-project:spring-boot-test"))
+	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation(testFixtures(project(":spring-boot-project:spring-boot")))
+	testImplementation(testFixtures(project(":spring-boot-project:spring-boot-autoconfigure")))
+	testImplementation("org.apache.httpcomponents.client5:httpclient5")
+	testImplementation("org.apache.tomcat.embed:tomcat-embed-jasper")
+	testImplementation("org.assertj:assertj-core")
+	testImplementation("org.awaitility:awaitility")
+	testImplementation("org.junit.jupiter:junit-jupiter")
+	testImplementation("org.mockito:mockito-core")
+	testImplementation("org.mockito:mockito-junit-jupiter")
+
+	testRuntimeOnly("ch.qos.logback:logback-classic")
+	testRuntimeOnly("io.projectreactor:reactor-test")
+	testRuntimeOnly("io.projectreactor.netty:reactor-netty-http")
+	testRuntimeOnly("org.eclipse.jetty:jetty-client")
+	testRuntimeOnly("org.eclipse.jetty.http2:jetty-http2-client")
+	testRuntimeOnly("org.eclipse.jetty.http2:jetty-http2-client-transport")
+}
+
+test {
+	jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
+}

spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/AccessLogHttpHandlerFactory.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/AccessLogHttpHandlerFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.web.server.undertow;
+package org.springframework.boot.undertow;
 
 import java.io.Closeable;
 import java.io.File;

spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/CompressionHttpHandlerFactory.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/CompressionHttpHandlerFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.web.server.undertow;
+package org.springframework.boot.undertow;
 
 import java.util.ArrayList;
 import java.util.List;

spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/ConfigurableUndertowWebServerFactory.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/ConfigurableUndertowWebServerFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.web.server.undertow;
+package org.springframework.boot.undertow;
 
 import java.io.File;
 import java.util.Collection;

spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/HttpHandlerFactory.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/HttpHandlerFactory.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.web.server.undertow;
+package org.springframework.boot.undertow;
 
 import java.io.Closeable;
 
 import io.undertow.server.HttpHandler;
 import io.undertow.server.handlers.GracefulShutdownHandler;
 
-import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServer;
+import org.springframework.boot.undertow.servlet.UndertowServletWebServer;
 
 /**
  * Factory used by {@link UndertowServletWebServer} to add {@link HttpHandler

spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/SslBuilderCustomizer.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/SslBuilderCustomizer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.web.server.undertow;
+package org.springframework.boot.undertow;
 
 import java.net.InetAddress;
 import java.util.Map;

spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/UndertowBuilderCustomizer.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/UndertowBuilderCustomizer.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.web.server.undertow;
+package org.springframework.boot.undertow;
 
 import io.undertow.Undertow.Builder;
 
-import org.springframework.boot.web.server.servlet.undertow.UndertowServletWebServerFactory;
+import org.springframework.boot.undertow.servlet.UndertowServletWebServerFactory;
 
 /**
  * Callback interface that can be used to customize an Undertow {@link Builder}.

spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/UndertowWebServer.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/UndertowWebServer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.web.server.undertow;
+package org.springframework.boot.undertow;
 
 import java.io.Closeable;
 import java.io.IOException;

spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/web/server/undertow/UndertowWebServerFactory.java renamed to spring-boot-project/spring-boot-undertow/src/main/java/org/springframework/boot/undertow/UndertowWebServerFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.web.server.undertow;
+package org.springframework.boot.undertow;
 
 import java.io.File;
 import java.net.InetAddress;