Move mail health auto-configuration into spring-boot-mail

Author: wilkinsona

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

@@ -44,7 +44,6 @@ dependencies {
 	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-mail"))
 	optional(project(":spring-boot-project:spring-boot-mongodb"))
 	optional(project(":spring-boot-project:spring-boot-quartz"))
 	optional(project(":spring-boot-project:spring-boot-r2dbc"))
@@ -122,7 +121,6 @@ dependencies {
 	optional("org.aspectj:aspectjweaver")
 	optional("org.cache2k:cache2k-micrometer")
 	optional("org.cache2k:cache2k-spring")
-	optional("org.eclipse.angus:angus-mail")
 	optional("org.eclipse.jetty:jetty-server") {
 		exclude group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api"
 	}

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

@@ -65,12 +65,6 @@
       "description": "Whether to enable liveness state health check.",
       "defaultValue": false
     },
-    {
-      "name": "management.health.mail.enabled",
-      "type": "java.lang.Boolean",
-      "description": "Whether to enable Mail health check.",
-      "defaultValue": true
-    },
     {
       "name": "management.health.mongo.enabled",
       "type": "java.lang.Boolean",

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

@@ -20,7 +20,6 @@ org.springframework.boot.actuate.autoconfigure.logging.LogFileWebEndpointAutoCon
 org.springframework.boot.actuate.autoconfigure.logging.LoggersEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.logging.OpenTelemetryLoggingAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.logging.otlp.OtlpLoggingAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.mail.MailHealthContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.management.HeapDumpWebEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.management.ThreadDumpEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.metrics.amqp.RabbitMetricsAutoConfiguration

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

@@ -16,7 +16,7 @@ dependencies {
 
 	compileOnly("com.fasterxml.jackson.core:jackson-annotations")
 
-	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"))
 
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/mail/MailHealthContributorAutoConfiguration.java renamed to spring-boot-project/spring-boot-mail/src/main/java/org/springframework/boot/mail/actuate/health/autoconfigure/MailHealthContributorAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.mail;
+package org.springframework.boot.mail.actuate.health.autoconfigure;
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
@@ -34,10 +34,10 @@
  * {@link EnableAutoConfiguration Auto-configuration} for {@link MailHealthIndicator}.
  *
  * @author Johannes Edmeier
- * @since 2.0.0
+ * @since 4.0.0
  */
 @AutoConfiguration(after = MailSenderAutoConfiguration.class)
-@ConditionalOnClass({ JavaMailSenderImpl.class, MailHealthIndicator.class })
+@ConditionalOnClass({ JavaMailSenderImpl.class, MailHealthIndicator.class, ConditionalOnEnabledHealthIndicator.class })
 @ConditionalOnBean(JavaMailSenderImpl.class)
 @ConditionalOnEnabledHealthIndicator("mail")
 public class MailHealthContributorAutoConfiguration

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/mail/package-info.java renamed to spring-boot-project/spring-boot-mail/src/main/java/org/springframework/boot/mail/actuate/health/autoconfigure/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for actuator JavaMail concerns.
  */
-package org.springframework.boot.actuate.autoconfigure.mail;
+package org.springframework.boot.mail.actuate.health.autoconfigure;

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

@@ -1,6 +1,12 @@
 {
   "groups": [],
   "properties": [
+    {
+      "name": "management.health.mail.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable Mail health check.",
+      "defaultValue": true
+    },
     {
       "name": "spring.mail.test-connection",
       "description": "Whether to test that the mail server is available on startup.",

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

@@ -1,2 +1,3 @@
+org.springframework.boot.mail.actuate.health.autoconfigure.MailHealthContributorAutoConfiguration
 org.springframework.boot.mail.autoconfigure.MailSenderAutoConfiguration
-org.springframework.boot.mail.autoconfigure.MailSenderValidatorAutoConfiguration
+org.springframework.boot.mail.autoconfigure.MailSenderValidatorAutoConfiguration

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/mail/MailHealthContributorAutoConfigurationTests.java renamed to spring-boot-project/spring-boot-mail/src/test/java/org/springframework/boot/mail/actuate/health/autoconfigure/MailHealthContributorAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.mail;
+package org.springframework.boot.mail.actuate.health.autoconfigure;
 
 import org.junit.jupiter.api.Test;