This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git


The following commit(s) were added to refs/heads/dev by this push:
     new e34b1a575 [hotfix] Fix dependency conflict of mail components (#1974)
e34b1a575 is described below

commit e34b1a5757a046cae97228a83ec33ff707afc832
Author: Dominik Riemer <[email protected]>
AuthorDate: Thu Sep 28 16:00:14 2023 +0200

    [hotfix] Fix dependency conflict of mail components (#1974)
---
 pom.xml                                                           | 4 ++--
 streampipes-rest/pom.xml                                          | 6 ------
 .../main/java/org/apache/streampipes/rest/impl/EmailResource.java | 8 ++++++--
 .../email-configuration/email-configuration.component.html        | 6 ++++--
 .../email-configuration/email-configuration.component.scss        | 8 ++++++++
 .../email-configuration/email-configuration.component.ts          | 2 +-
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index d0ac5fcd3..e5170b8dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
        <jackson.version>2.15.0</jackson.version>
        <jackson.databind.version>2.15.0</jackson.databind.version>
        <jakarta-annotation.version>2.1.1</jakarta-annotation.version>
-       <jakarta-activation-api.version>2.1.2</jakarta-activation-api.version>
+       <jakarta-activation-api.version>2.0.1</jakarta-activation-api.version>
        <jakarta-json-api.version>2.1.1</jakarta-json-api.version>
        <jakarta-inject-api.version>2.0.1</jakarta-inject-api.version>
        <jakarta-mail.version>2.0.1</jakarta-mail.version>
@@ -111,7 +111,7 @@
        <rendersnake.version>1.9.0</rendersnake.version>
        <roaster.version>2.29.0.Final</roaster.version>
        <siddhi.version>5.1.27</siddhi.version>
-       <simple-java-mail.version>7.8.0</simple-java-mail.version>
+       <simple-java-mail.version>8.1.3</simple-java-mail.version>
        <slf4j.version>2.0.6</slf4j.version>
        <snakeyaml.version>2.1</snakeyaml.version>
        <snappy-java.version>1.1.10.4</snappy-java.version>
diff --git a/streampipes-rest/pom.xml b/streampipes-rest/pom.xml
index 186845209..55b28d0ec 100644
--- a/streampipes-rest/pom.xml
+++ b/streampipes-rest/pom.xml
@@ -116,12 +116,6 @@
             <artifactId>influxdb-java</artifactId>
         </dependency>
 
-        <!-- dependency convergence -->
-        <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>jakarta.mail</artifactId>
-        </dependency>
-
         <!-- Test dependencies -->
         <dependency>
             <groupId>junit</groupId>
diff --git 
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/EmailResource.java
 
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/EmailResource.java
index 84d80ce88..31a187362 100644
--- 
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/EmailResource.java
+++ 
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/EmailResource.java
@@ -35,8 +35,12 @@ public class EmailResource extends 
AbstractAuthGuardedRestResource {
   @Consumes(MediaType.APPLICATION_JSON)
   public Response sendEmail(SpEmail email) {
     if 
(getSpCoreConfigurationStorage().get().getEmailConfig().isEmailConfigured()) {
-      new MailSender().sendEmail(email);
-      return ok();
+      try {
+        new MailSender().sendEmail(email);
+        return ok();
+      } catch (Exception e) {
+        return badRequest(e);
+      }
     } else {
       return serverError(
           "Could not send email - no valid mail configuration provided in 
StreamPipes (go to settings -> mail)");
diff --git 
a/ui/src/app/configuration/email-configuration/email-configuration.component.html
 
b/ui/src/app/configuration/email-configuration/email-configuration.component.html
index 9c305062c..fd2d87cb9 100644
--- 
a/ui/src/app/configuration/email-configuration/email-configuration.component.html
+++ 
b/ui/src/app/configuration/email-configuration/email-configuration.component.html
@@ -206,8 +206,10 @@
                                     !sendingTestMailSuccess
                                 "
                             >
-                                Failure
-                                <h5>{{ sendingEmailErrorMessage }}</h5>
+                                <div class="error-panel">
+                                    <h4>Could not send email</h4>
+                                    <h5>{{ sendingEmailErrorMessage }}</h5>
+                                </div>
                             </div>
                         </div>
                     </div>
diff --git 
a/ui/src/app/configuration/email-configuration/email-configuration.component.scss
 
b/ui/src/app/configuration/email-configuration/email-configuration.component.scss
index 13cbc4aac..1026aeaae 100644
--- 
a/ui/src/app/configuration/email-configuration/email-configuration.component.scss
+++ 
b/ui/src/app/configuration/email-configuration/email-configuration.component.scss
@@ -15,3 +15,11 @@
  * limitations under the License.
  *
  */
+
+.error-panel {
+    margin-top: 10px;
+    padding: 10px;
+    border: 1px solid var(--color-warn);
+    background: var(--color-bg-1);
+    border-radius: 5px;
+}
diff --git 
a/ui/src/app/configuration/email-configuration/email-configuration.component.ts 
b/ui/src/app/configuration/email-configuration/email-configuration.component.ts
index 1013d0d65..bc7732b7d 100644
--- 
a/ui/src/app/configuration/email-configuration/email-configuration.component.ts
+++ 
b/ui/src/app/configuration/email-configuration/email-configuration.component.ts
@@ -199,7 +199,7 @@ export class EmailConfigurationComponent implements OnInit {
             error => {
                 this.sendingTestMailInProgress = false;
                 this.sendingTestMailSuccess = false;
-                this.sendingEmailErrorMessage = error.error.localizedMessage;
+                this.sendingEmailErrorMessage = `Error: 
${error.error.localizedMessage} with cause 
${error.error.cause.localizedMessage}`;
             },
         );
     }

Reply via email to