Move Quartz endpoint auto-configuration into spring-boot-quartz

Author: wilkinsona

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

@@ -44,7 +44,6 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-jsonb"))
 	optional(project(":spring-boot-project:spring-boot-kafka"))
 	optional(project(":spring-boot-project:spring-boot-mongodb"))
-	optional(project(":spring-boot-project:spring-boot-quartz"))
 	optional(project(":spring-boot-project:spring-boot-r2dbc"))
 	optional(project(":spring-boot-project:spring-boot-reactor-netty"))
 	optional(project(":spring-boot-project:spring-boot-restclient"))
@@ -133,7 +132,6 @@ dependencies {
 	optional("org.junit.platform:junit-platform-launcher")
 	optional("org.mongodb:mongodb-driver-reactivestreams")
 	optional("org.mongodb:mongodb-driver-sync")
-	optional("org.quartz-scheduler:quartz")
 	optional("org.springframework:spring-messaging")
 	optional("org.springframework:spring-webflux")
 	optional("org.springframework:spring-webmvc")

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

@@ -71,7 +71,6 @@ org.springframework.boot.actuate.autoconfigure.observation.web.client.HttpClient
 org.springframework.boot.actuate.autoconfigure.observation.web.reactive.WebFluxObservationAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.observation.web.servlet.WebMvcObservationAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.opentelemetry.OpenTelemetryAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.quartz.QuartzEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.r2dbc.ConnectionFactoryHealthContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.r2dbc.R2dbcObservationAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.sbom.SbomEndpointAutoConfiguration

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

@@ -15,7 +15,7 @@ dependencies {
 
 	implementation(project(":spring-boot-project:spring-boot-sql"))
 
-	optional(project(":spring-boot-project:spring-boot-actuator"))
+	optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
 	optional(project(":spring-boot-project:spring-boot-jdbc"))
 

…rtz/QuartzEndpointAutoConfiguration.java …ure/QuartzEndpointAutoConfiguration.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/quartz/QuartzEndpointAutoConfiguration.java renamed to spring-boot-project/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/actuate/endpoint/autoconfigure/QuartzEndpointAutoConfiguration.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/quartz/QuartzEndpointAutoConfiguration.java renamed to spring-boot-project/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/actuate/endpoint/autoconfigure/QuartzEndpointAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.quartz;
+package org.springframework.boot.quartz.actuate.endpoint.autoconfigure;
 
 import org.quartz.Scheduler;
 
@@ -38,10 +38,10 @@
  *
  * @author Vedran Pavic
  * @author Stephane Nicoll
- * @since 2.5.0
+ * @since 4.0.0
  */
 @AutoConfiguration(after = QuartzAutoConfiguration.class)
-@ConditionalOnClass({ Scheduler.class, QuartzEndpoint.class })
+@ConditionalOnClass({ Scheduler.class, QuartzEndpoint.class, ConditionalOnAvailableEndpoint.class })
 @ConditionalOnAvailableEndpoint(QuartzEndpoint.class)
 @EnableConfigurationProperties(QuartzEndpointProperties.class)
 public class QuartzEndpointAutoConfiguration {

…ure/quartz/QuartzEndpointProperties.java …oconfigure/QuartzEndpointProperties.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/quartz/QuartzEndpointProperties.java renamed to spring-boot-project/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/actuate/endpoint/autoconfigure/QuartzEndpointProperties.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/quartz/QuartzEndpointProperties.java renamed to spring-boot-project/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/actuate/endpoint/autoconfigure/QuartzEndpointProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.quartz;
+package org.springframework.boot.quartz.actuate.endpoint.autoconfigure;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -27,7 +27,7 @@
  * Configuration properties for {@link QuartzEndpoint}.
  *
  * @author Madhura Bhave
- * @since 3.0.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("management.endpoint.quartz")
 public class QuartzEndpointProperties {

…e/autoconfigure/quartz/package-info.java …endpoint/autoconfigure/package-info.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/quartz/package-info.java renamed to spring-boot-project/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/actuate/endpoint/autoconfigure/package-info.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/quartz/package-info.java renamed to spring-boot-project/spring-boot-quartz/src/main/java/org/springframework/boot/quartz/actuate/endpoint/autoconfigure/package-info.java

@@ -15,6 +15,6 @@
  */
 
 /**
- * Auto-configuration for actuator Quartz Scheduler concerns.
+ * Auto-configuration for Quartz Scheduler actuator endpoint.
  */
-package org.springframework.boot.actuate.autoconfigure.quartz;
+package org.springframework.boot.quartz.actuate.endpoint.autoconfigure;

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

@@ -1 +1,2 @@
+org.springframework.boot.quartz.actuate.endpoint.autoconfigure.QuartzEndpointAutoConfiguration
 org.springframework.boot.quartz.autoconfigure.QuartzAutoConfiguration

…uartzEndpointAutoConfigurationTests.java …uartzEndpointAutoConfigurationTests.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/quartz/QuartzEndpointAutoConfigurationTests.java renamed to spring-boot-project/spring-boot-quartz/src/test/java/org/springframework/boot/actuate/autoconfigure/quartz/QuartzEndpointAutoConfigurationTests.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/quartz/QuartzEndpointAutoConfigurationTests.java renamed to spring-boot-project/spring-boot-quartz/src/test/java/org/springframework/boot/actuate/autoconfigure/quartz/QuartzEndpointAutoConfigurationTests.java

@@ -26,6 +26,7 @@
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint;
 import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpointWebExtension;
+import org.springframework.boot.quartz.actuate.endpoint.autoconfigure.QuartzEndpointAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;