Move Jetty management server support to spring-boot-jetty

Author: wilkinsona

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

@@ -36,7 +36,6 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-http-codec"))
 	optional(project(":spring-boot-project:spring-boot-jackson"))
 	optional(project(":spring-boot-project:spring-boot-jersey"))
-	optional(project(":spring-boot-project:spring-boot-jetty"))
 	optional(project(":spring-boot-project:spring-boot-jsonb"))
 	optional(project(":spring-boot-project:spring-boot-kafka"))
 	optional(project(":spring-boot-project:spring-boot-metrics"))

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

@@ -2,8 +2,6 @@ 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.jetty.JettyReactiveManagementChildContextConfiguration
-org.springframework.boot.actuate.autoconfigure.web.server.jetty.JettyServletManagementChildContextConfiguration
 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

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

@@ -69,8 +69,6 @@ org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontAutoConfigurat
 org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.web.mappings.MappingsEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.web.server.jetty.JettyReactiveManagementContextAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.web.server.jetty.JettyServletManagementContextAutoConfiguration
 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

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

@@ -14,6 +14,7 @@ dependencies {
 	api("org.eclipse.jetty.ee10:jetty-ee10-webapp")
 
 	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
+	optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	optional(project(":spring-boot-project:spring-boot-metrics"))
 	optional("org.apache.tomcat.embed:tomcat-embed-jasper")
 	optional("org.eclipse.jetty:jetty-alpn-conscrypt-server")

…rver/jetty/JettyAccessLogCustomizer.java …web/server/JettyAccessLogCustomizer.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/jetty/JettyAccessLogCustomizer.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyAccessLogCustomizer.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/jetty/JettyAccessLogCustomizer.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyAccessLogCustomizer.java

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

…tty/JettyManagementServerProperties.java …ver/JettyManagementServerProperties.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/jetty/JettyManagementServerProperties.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyManagementServerProperties.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/jetty/JettyManagementServerProperties.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyManagementServerProperties.java

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

…ManagementChildContextConfiguration.java …ManagementChildContextConfiguration.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/jetty/JettyReactiveManagementChildContextConfiguration.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyReactiveManagementChildContextConfiguration.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/jetty/JettyReactiveManagementChildContextConfiguration.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyReactiveManagementChildContextConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.web.server.jetty;
+package org.springframework.boot.jetty.actuate.autoconfigure.web.server;
 
 import org.eclipse.jetty.server.Server;
 

…eManagementContextAutoConfiguration.java …eManagementContextAutoConfiguration.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/jetty/JettyReactiveManagementContextAutoConfiguration.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyReactiveManagementContextAutoConfiguration.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/jetty/JettyReactiveManagementContextAutoConfiguration.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyReactiveManagementContextAutoConfiguration.java

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

…ManagementChildContextConfiguration.java …ManagementChildContextConfiguration.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/jetty/JettyServletManagementChildContextConfiguration.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyServletManagementChildContextConfiguration.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/jetty/JettyServletManagementChildContextConfiguration.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyServletManagementChildContextConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.web.server.jetty;
+package org.springframework.boot.jetty.actuate.autoconfigure.web.server;
 
 import org.eclipse.jetty.server.Server;
 

…tManagementContextAutoConfiguration.java …tManagementContextAutoConfiguration.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/jetty/JettyServletManagementContextAutoConfiguration.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyServletManagementContextAutoConfiguration.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/jetty/JettyServletManagementContextAutoConfiguration.java renamed to spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyServletManagementContextAutoConfiguration.java

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