diff --git a/.secrets.baseline b/.secrets.baseline
index 78ef96fb85..b160381264 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -1868,5 +1868,5 @@
}
]
},
- "generated_at": "2025-02-18T15:50:35Z"
+ "generated_at": "2025-02-26T15:13:52Z"
}
diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml
index dcfea047d9..f620f3d63e 100644
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -63,6 +63,10 @@
jakarta.servlet
jakarta.servlet-api
+
+ jakarta.mail
+ jakarta.mail-api
+
org.alfresco.surf
spring-webscripts
diff --git a/packaging/distribution/src/main/resources/licenses/notice.txt b/packaging/distribution/src/main/resources/licenses/notice.txt
index 1bb810715f..3fa5e4c0a6 100644
--- a/packaging/distribution/src/main/resources/licenses/notice.txt
+++ b/packaging/distribution/src/main/resources/licenses/notice.txt
@@ -180,13 +180,13 @@ Lightbox JS http://lokeshdhakar.com/projects/lightbox/
=== Eclipse Public License 1.0 ===
-Angus Mail Provider https://eclipse-ee4j.github.io/angus-mail/
AspectJ http://eclipse.org/aspectj/
Bliki http://code.google.com/p/gwtwiki/
JUnit http://junit.org/
TrueLicense http://truelicense.java.net/
truezip http://truezip.java.net/
+
=== ICU License ===
icu4j http://icu-project.org/
diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml
index d17c352156..610051c43c 100644
--- a/packaging/tests/tas-integration/pom.xml
+++ b/packaging/tests/tas-integration/pom.xml
@@ -57,8 +57,8 @@
- org.eclipse.angus
- angus-mail
+ com.sun.mail
+ jakarta.mail
diff --git a/pom.xml b/pom.xml
index 8ac107b7a3..d7f1997e48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,6 @@
2.0.6.1
3.1.6
2.3.0
- 2.0.3
4.0.2
4.0.5
@@ -106,7 +105,7 @@
3.0.0
2.0.1
3.0.0
- 2.1.3
+ 2.0.1
2.0.1
3.1.0
1.2.0
@@ -220,14 +219,15 @@
- org.eclipse.angus
- angus-mail
- ${dependency.angus-mail.version}
+ com.sun.mail
+ jakarta.mail
+ ${dependency.jakarta-ee-mail.version}
jakarta.mail
jakarta.mail-api
${dependency.jakarta-ee-mail.version}
+ provided
com.sun.activation
diff --git a/repository/pom.xml b/repository/pom.xml
index 33ab9fe4fc..020b78ea7a 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -56,8 +56,8 @@
jakarta.mail-api
- org.eclipse.angus
- angus-mail
+ com.sun.mail
+ jakarta.mail
@@ -190,7 +190,7 @@
com.github.davidmoten
subethasmtp
- 7.1.3
+ 6.0.6
diff --git a/repository/src/test/java/org/alfresco/email/server/EmailServiceImplTest.java b/repository/src/test/java/org/alfresco/email/server/EmailServiceImplTest.java
index f5d7205486..916b78d325 100644
--- a/repository/src/test/java/org/alfresco/email/server/EmailServiceImplTest.java
+++ b/repository/src/test/java/org/alfresco/email/server/EmailServiceImplTest.java
@@ -4,21 +4,21 @@
* %%
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
- *
+ *
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see .
* #L%
@@ -39,11 +39,11 @@ import jakarta.mail.Message;
import jakarta.mail.Session;
import jakarta.mail.internet.InternetAddress;
+import com.sun.mail.smtp.SMTPMessage;
import junit.framework.TestCase;
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.eclipse.angus.mail.smtp.SMTPMessage;
import org.junit.experimental.categories.Category;
import org.springframework.context.ApplicationContext;
@@ -73,7 +73,7 @@ import org.alfresco.util.ApplicationContextHelper;
/**
* Unit test of EmailServiceImplTest
- *
+ *
* @author mrogers
*
*/
@@ -136,9 +136,9 @@ public class EmailServiceImplTest extends TestCase
/**
* Test the from name.
- *
+ *
* Step 1: User admin will map to the "unknownUser" which out of the box is "anonymous" Sending email From "admin" will fail.
- *
+ *
* Step 2: Send from the test user to the test' user's home folder.
*/
public void testFromName() throws Exception
@@ -222,7 +222,7 @@ public class EmailServiceImplTest extends TestCase
/**
* Step 2
- *
+ *
* Send From the test user TEST_EMAIL to the test user's home
*/
{
@@ -257,9 +257,9 @@ public class EmailServiceImplTest extends TestCase
/**
* Step 3
- *
+ *
* message.from From with "name" < name@ domain > format SMTP.FROM="dummy"
- *
+ *
* Send From the test user to the test user's home
*/
{
@@ -295,9 +295,9 @@ public class EmailServiceImplTest extends TestCase
/**
* Step 4
- *
+ *
* From with "name" < name@ domain > format
- *
+ *
* Send From the test user to the test user's home
*/
{
@@ -375,9 +375,9 @@ public class EmailServiceImplTest extends TestCase
/**
* ALF-9544 ALF-751
- *
+ *
* Inbound email to a folder restricts file name to 86 characters or less.
- *
+ *
* Also has tests for other variations of subject
*/
public void testFolderSubject() throws Exception
@@ -598,7 +598,7 @@ public class EmailServiceImplTest extends TestCase
/**
* ALF-1878
- *
+ *
* Duplicate incoming email Subjects over-write each other
*/
public void testMultipleMessagesToFolder() throws Exception
@@ -813,7 +813,7 @@ public class EmailServiceImplTest extends TestCase
/**
* MNT-9289
- *
+ *
* Change in case in email Subject causes DuplicateChildNodeNameException
*/
public void testCaseSensitivity() throws Exception
@@ -894,7 +894,7 @@ public class EmailServiceImplTest extends TestCase
/**
* ALF-12297
- *
+ *
* Test messages being sent to a cm:content node
*/
public void testMessagesToDocument() throws Exception
@@ -1090,7 +1090,7 @@ public class EmailServiceImplTest extends TestCase
/**
* The Email contributors authority controls who can add email.
- *
+ *
* This test switches between the EMAIL_CONTRIBUTORS group and EVERYONE
*/
public void testEmailContributorsAuthority() throws Exception
@@ -1137,7 +1137,7 @@ public class EmailServiceImplTest extends TestCase
/**
* Step 1 Set the email contributors authority to EVERYONE
- *
+ *
* Test that TEST_USER is allowed to send email - so even though TEST_USER is not a contributor
*/
emailServiceImpl.setEmailContributorsAuthority("EVERYONE");
@@ -1170,7 +1170,7 @@ public class EmailServiceImplTest extends TestCase
/**
* Step 2 Negative test
- *
+ *
* Send From the test user TEST_EMAIL to the test user's home
*/
try
diff --git a/repository/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java b/repository/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java
index 2ae7b74e6a..50a3a3cd23 100644
--- a/repository/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java
+++ b/repository/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java
@@ -4,21 +4,21 @@
* %%
* Copyright (C) 2005 - 2025 Alfresco Software Limited
* %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
- *
+ *
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see .
* #L%
@@ -51,19 +51,19 @@ import jakarta.mail.internet.MimeMultipart;
import jakarta.mail.internet.MimeUtility;
import jakarta.transaction.UserTransaction;
+import com.sun.mail.iap.ProtocolException;
+import com.sun.mail.iap.Response;
+import com.sun.mail.imap.IMAPFolder;
+import com.sun.mail.imap.protocol.BODY;
+import com.sun.mail.imap.protocol.FetchResponse;
+import com.sun.mail.imap.protocol.IMAPProtocol;
+import com.sun.mail.imap.protocol.IMAPResponse;
+import com.sun.mail.imap.protocol.RFC822DATA;
+import com.sun.mail.imap.protocol.UID;
+import com.sun.mail.util.ASCIIUtility;
import junit.framework.TestCase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.eclipse.angus.mail.iap.ProtocolException;
-import org.eclipse.angus.mail.iap.Response;
-import org.eclipse.angus.mail.imap.IMAPFolder;
-import org.eclipse.angus.mail.imap.protocol.BODY;
-import org.eclipse.angus.mail.imap.protocol.FetchResponse;
-import org.eclipse.angus.mail.imap.protocol.IMAPProtocol;
-import org.eclipse.angus.mail.imap.protocol.IMAPResponse;
-import org.eclipse.angus.mail.imap.protocol.RFC822DATA;
-import org.eclipse.angus.mail.imap.protocol.UID;
-import org.eclipse.angus.mail.util.ASCIIUtility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.springframework.context.ApplicationContext;
@@ -667,7 +667,7 @@ public class ImapMessageTest extends TestCase
/**
* Returns BODY object containing desired message fragment
- *
+ *
* @param folder
* Folder containing the message
* @param uid
@@ -695,7 +695,7 @@ public class ImapMessageTest extends TestCase
}
FetchResponse fetchResponse = (FetchResponse) r[0];
- BODY body = (BODY) fetchResponse.getItem(BODY.class);
+ BODY body = (BODY) fetchResponse.getItem(com.sun.mail.imap.protocol.BODY.class);
return body;
}
});
@@ -704,7 +704,7 @@ public class ImapMessageTest extends TestCase
/**
* Finds node by its path
- *
+ *
* @param path
* String
* @return NodeRef
@@ -717,7 +717,7 @@ public class ImapMessageTest extends TestCase
/**
* Returns the UID of the first message in folder
- *
+ *
* @param folder
* Folder containing the message
* @param msn
@@ -778,7 +778,7 @@ public class ImapMessageTest extends TestCase
/**
* Returns size of the message
- *
+ *
* @param folder
* Folder containing the message
* @param uid
@@ -793,7 +793,7 @@ public class ImapMessageTest extends TestCase
/**
* Returns a full message body
- *
+ *
* @param folder
* Folder containing the message
* @param uid
@@ -824,7 +824,7 @@ public class ImapMessageTest extends TestCase
/**
* Simple util for logging response
- *
+ *
* @param r
* response
*/