From f6a0fcb64be44c9bf5e6c3d1c72255f1860a7046 Mon Sep 17 00:00:00 2001
From: Kevin Van de Velde <kevin@mire.be>
Date: Tue, 18 Jan 2022 10:25:46 +0100
Subject: [PATCH 1/2] [Ticket: 918] Email issues fix

---
 dspace-api/pom.xml      | 4 ++--
 dspace-services/pom.xml | 4 ++--
 pom.xml                 | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
index 03685d53bd..a0885aa57f 100644
--- a/dspace-api/pom.xml
+++ b/dspace-api/pom.xml
@@ -481,8 +481,8 @@
             <artifactId>commons-validator</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/dspace-services/pom.xml b/dspace-services/pom.xml
index 17ca993bef..e37e0d370d 100644
--- a/dspace-services/pom.xml
+++ b/dspace-services/pom.xml
@@ -104,8 +104,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
diff --git a/pom.xml b/pom.xml
index 13509777e9..1d989d2c89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1400,9 +1400,9 @@
                 <version>2.9.2</version>
             </dependency>
             <dependency>
-                <groupId>javax.mail</groupId>
-                <artifactId>mail</artifactId>
-                <version>1.4.7</version>
+                <groupId>com.sun.mail</groupId>
+                <artifactId>javax.mail</artifactId>
+                <version>1.6.2</version>
             </dependency>
             <dependency>
                 <groupId>javax.servlet</groupId>

From 5396216aa8ee488f465038e29312d3344b6bdb86 Mon Sep 17 00:00:00 2001
From: Kevin Van de Velde <kevin@mire.be>
Date: Thu, 20 Jan 2022 14:09:29 +0100
Subject: [PATCH 2/2] Logging exception when sending emails fails in the
 workflow

---
 .../java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java
index d77eb16ea7..8900222907 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java
@@ -681,7 +681,7 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
             }
         } catch (MessagingException e) {
             log.warn(LogManager.getHeader(context, "notifyOfArchive",
-                    "cannot email user" + " item_id=" + item.getID()));
+                    "cannot email user" + " item_id=" + item.getID()), e);
         }
     }
 
@@ -715,7 +715,7 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
         } catch (MessagingException e) {
             log.warn(LogManager.getHeader(c, "notifyOfCuration",
                     "cannot email users of workflow_item_id " + wi.getID()
-                            + ":  " + e.getMessage()));
+                            + ":  " + e.getMessage()), e);
         }
     }
 
@@ -1195,7 +1195,7 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
             log.warn(LogManager.getHeader(c, "notify_of_reject",
                     "cannot email user" + " eperson_id" + e.getID()
                     + " eperson_email" + e.getEmail()
-                    + " workflow_item_id" + wi.getID()));
+                    + " workflow_item_id" + wi.getID()), ex);
         }
     }