hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 15:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8124 from atmire/javax-mail-update

Browse Source 
Javax mail update
This commit is contained in:
Tim Donohue
2022-01-20 10:44:00 -06:00
committed by GitHub
parent d49721a41b f6d94f199b
commit c89c43e3da
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-api/pom.xml
View File

@@ -481,8 +481,8 @@
<artifactId>commons-validator</artifactId> <artifactId>commons-validator</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.mail</groupId> <groupId>com.sun.mail</groupId>
<artifactId>mail</artifactId> <artifactId>javax.mail</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>

6
dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java
View File

@@ -681,7 +681,7 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
} }
} catch (MessagingException e) { } catch (MessagingException e) {
log.warn(LogHelper.getHeader(context, "notifyOfArchive", log.warn(LogHelper.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) { } catch (MessagingException e) {
log.warn(LogHelper.getHeader(c, "notifyOfCuration", log.warn(LogHelper.getHeader(c, "notifyOfCuration",
"cannot email users of workflow_item_id " + wi.getID() "cannot email users of workflow_item_id " + wi.getID()
+ ": " + e.getMessage())); + ": " + e.getMessage()), e);
} }
} }
@@ -1196,7 +1196,7 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
log.warn(LogHelper.getHeader(c, "notify_of_reject", log.warn(LogHelper.getHeader(c, "notify_of_reject",
"cannot email user" + " eperson_id" + e.getID() "cannot email user" + " eperson_id" + e.getID()
+ " eperson_email" + e.getEmail() + " eperson_email" + e.getEmail()
+ " workflow_item_id" + wi.getID())); + " workflow_item_id" + wi.getID()), ex);
} }
} }

4
dspace-services/pom.xml
View File

@@ -104,8 +104,8 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.mail</groupId> <groupId>com.sun.mail</groupId>
<artifactId>mail</artifactId> <artifactId>javax.mail</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>

6
pom.xml
View File

@@ -1439,9 +1439,9 @@
<version>2.9.2</version> <version>2.9.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.mail</groupId> <groupId>com.sun.mail</groupId>
<artifactId>mail</artifactId> <artifactId>javax.mail</artifactId>
<version>1.4.7</version> <version>1.6.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>