Skip to content

Commit ee8c018

Browse files
wilkinsonawilkinsona
committed
Move Undertow management server support to spring-boot-undertow
1 parent 5dbd0ee commit ee8c018

14 files changed

+15
-18
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ dependencies {
4646
optional(project(":spring-boot-project:spring-boot-security-oauth2-resource-server"))
4747
optional(project(":spring-boot-project:spring-boot-security-saml2"))
4848
optional(project(":spring-boot-project:spring-boot-tomcat"))
49-
optional(project(":spring-boot-project:spring-boot-undertow"))
5049
optional(project(":spring-boot-project:spring-boot-validation"))
5150
optional(project(":spring-boot-project:spring-boot-webclient"))
5251
optional(project(":spring-boot-project:spring-boot-webflux"))
@@ -97,7 +96,6 @@ dependencies {
9796
optional("io.r2dbc:r2dbc-pool")
9897
optional("io.r2dbc:r2dbc-proxy")
9998
optional("io.r2dbc:r2dbc-spi")
100-
optional("io.undertow:undertow-servlet")
10199
optional("jakarta.persistence:jakarta.persistence-api")
102100
optional("jakarta.servlet:jakarta.servlet-api")
103101
optional("org.apache.activemq:activemq-broker")
@@ -145,8 +143,6 @@ dependencies {
145143
testImplementation("io.prometheus:prometheus-metrics-exposition-formats")
146144
testImplementation("io.r2dbc:r2dbc-h2")
147145
testImplementation("com.squareup.okhttp3:mockwebserver")
148-
testImplementation("io.undertow:undertow-core")
149-
testImplementation("io.undertow:undertow-servlet")
150146
testImplementation("jakarta.xml.bind:jakarta.xml.bind-api")
151147
testImplementation("org.apache.activemq:artemis-jakarta-client")
152148
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‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@ org.springframework.boot.actuate.autoconfigure.endpoint.web.reactive.WebFluxEndp
22
org.springframework.boot.actuate.autoconfigure.endpoint.web.servlet.WebMvcEndpointManagementContextConfiguration
33
org.springframework.boot.actuate.autoconfigure.security.servlet.SecurityRequestMatchersManagementContextConfiguration
44
org.springframework.boot.actuate.autoconfigure.web.reactive.ReactiveManagementChildContextConfiguration
5-
org.springframework.boot.actuate.autoconfigure.web.server.undertow.UndertowReactiveManagementChildContextConfiguration
6-
org.springframework.boot.actuate.autoconfigure.web.server.undertow.UndertowServletManagementChildContextConfiguration
75
org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementChildContextConfiguration
86
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‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,4 @@ org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesAutoCo
7070
org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesEndpointAutoConfiguration
7171
org.springframework.boot.actuate.autoconfigure.web.mappings.MappingsEndpointAutoConfiguration
7272
org.springframework.boot.actuate.autoconfigure.web.server.netty.NettyReactiveManagementContextAutoConfiguration
73-
org.springframework.boot.actuate.autoconfigure.web.server.undertow.UndertowReactiveManagementContextAutoConfiguration
74-
org.springframework.boot.actuate.autoconfigure.web.server.undertow.UndertowServletManagementContextAutoConfiguration
7573
org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ dependencies {
1313
api("io.undertow:undertow-servlet")
1414

1515
optional(project(":spring-boot-project:spring-boot-autoconfigure"))
16+
optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
1617
optional("io.undertow:undertow-websockets-jsr")
1718
optional("org.springframework:spring-webflux")
1819

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.web.server.undertow;
17+
package org.springframework.boot.undertow.actuate.autoconfigure.web.server;
1818

1919
import java.util.function.Function;
2020

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.web.server.undertow;
17+
package org.springframework.boot.undertow.actuate.autoconfigure.web.server;
1818

1919
import org.springframework.boot.context.properties.ConfigurationProperties;
2020

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.web.server.undertow;
17+
package org.springframework.boot.undertow.actuate.autoconfigure.web.server;
1818

1919
import io.undertow.Undertow;
2020

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.web.server.undertow;
17+
package org.springframework.boot.undertow.actuate.autoconfigure.web.server;
1818

1919
import io.undertow.Undertow;
2020

@@ -37,7 +37,7 @@
3737
* @since 4.0.0
3838
*/
3939
@AutoConfiguration
40-
@ConditionalOnClass(Undertow.class)
40+
@ConditionalOnClass({ Undertow.class, ManagementContextFactory.class })
4141
@ConditionalOnWebApplication(type = Type.REACTIVE)
4242
@ConditionalOnManagementPort(ManagementPortType.DIFFERENT)
4343
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.web.server.undertow;
17+
package org.springframework.boot.undertow.actuate.autoconfigure.web.server;
1818

1919
import io.undertow.Undertow;
2020

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.web.server.undertow;
17+
package org.springframework.boot.undertow.actuate.autoconfigure.web.server;
1818

1919
import io.undertow.Undertow;
2020

@@ -37,7 +37,7 @@
3737
* @since 4.0.0
3838
*/
3939
@AutoConfiguration
40-
@ConditionalOnClass(Undertow.class)
40+
@ConditionalOnClass({ Undertow.class, ManagementContextFactory.class })
4141
@ConditionalOnWebApplication(type = Type.SERVLET)
4242
@ConditionalOnManagementPort(ManagementPortType.DIFFERENT)
4343
public class UndertowServletManagementContextAutoConfiguration {

0 commit comments

Comments
 (0)