SONAR-22516 Retrieve SMTP configuration from internal_properties

2 files changed, 3 insertions, 1 deletions

diff --git a/server/sonar-webserver-core/src/main/java/org/sonar/server/notification/NotificationModule.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/notification/NotificationModule.java
index f18ed2d3915..9fcd6a92918 100644
--- a/server/sonar-webserver-core/src/main/java/org/sonar/server/notification/NotificationModule.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/notification/NotificationModule.java
@@ -21,6 +21,7 @@ package org.sonar.server.notification;
 
 import org.sonar.api.config.EmailSettings;
 import org.sonar.core.platform.Module;
+import org.sonar.server.email.EmailSmtpConfiguration;
 import org.sonar.server.notification.email.EmailNotificationChannel;
 
 public class NotificationModule extends Module {
@@ -28,6 +29,7 @@ public class NotificationModule extends Module {
   protected void configureModule() {
     add(
       EmailSettings.class,
+      EmailSmtpConfiguration.class,
       NotificationService.class,
       DefaultNotificationManager.class,
       NotificationDaemon.class,
diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/NotificationModuleTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/NotificationModuleTest.java
index fa040dc7bd5..94fadfc4d61 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/NotificationModuleTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/notification/NotificationModuleTest.java
@@ -29,6 +29,6 @@ public class NotificationModuleTest {
   public void verify_count_of_added_components() {
     ListContainer container = new ListContainer();
     new NotificationModule().configure(container);
-    assertThat(container.getAddedObjects()).hasSize(5);
+    assertThat(container.getAddedObjects()).hasSize(6);
   }
 }