inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ACS-9199 Bump subethasmtp version to 7.1.3 (#3207)" (#3225)

Browse Source
This commit is contained in:
Damian Ujma
2025-02-26 17:00:04 +01:00
committed by GitHub
parent 7a7fbf37a2
commit cc86d9e9ed
8 changed files with 62 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.secrets.baseline
View File

@@ -1868,5 +1868,5 @@
}
]
},
"generated_at": "2025-02-18T15:50:35Z"
"generated_at": "2025-02-26T15:13:52Z"
}

4
amps/ags/rm-community/rm-community-repo/pom.xml
View File

@@ -63,6 +63,10 @@
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
</dependency>
<dependency>
<groupId>org.alfresco.surf</groupId>
<artifactId>spring-webscripts</artifactId>

2
packaging/distribution/src/main/resources/licenses/notice.txt
View File

@@ -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/

4
packaging/tests/tas-integration/pom.xml
View File

@@ -57,8 +57,8 @@
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-mail</artifactId>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
</dependency>
<dependency>

10
pom.xml
View File

@@ -97,7 +97,6 @@
<dependency.jdom2.version>2.0.6.1</dependency.jdom2.version>
<dependency.pooled-jms.version>3.1.6</dependency.pooled-jms.version>
<dependency.kxml2.version>2.3.0</dependency.kxml2.version>
<dependency.angus-mail.version>2.0.3</dependency.angus-mail.version>
<dependency.jakarta-ee-jaxb-api.version>4.0.2</dependency.jakarta-ee-jaxb-api.version>
<dependency.jakarta-ee-jaxb-impl.version>4.0.5</dependency.jakarta-ee-jaxb-impl.version>
@@ -106,7 +105,7 @@
<dependency.jakarta-annotation-api.version>3.0.0</dependency.jakarta-annotation-api.version>
<dependency.jakarta-transaction-api.version>2.0.1</dependency.jakarta-transaction-api.version>
<dependency.jakarta-jws-api.version>3.0.0</dependency.jakarta-jws-api.version>
<dependency.jakarta-ee-mail.version>2.1.3</dependency.jakarta-ee-mail.version>
<dependency.jakarta-ee-mail.version>2.0.1</dependency.jakarta-ee-mail.version>
<dependency.jakarta-ee-activation.version>2.0.1</dependency.jakarta-ee-activation.version>
<dependency.jakarta-ee-jms.version>3.1.0</dependency.jakarta-ee-jms.version>
<dependency.java-ee-activation.version>1.2.0</dependency.java-ee-activation.version>
@@ -220,14 +219,15 @@
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-mail</artifactId>
<version>${dependency.angus-mail.version}</version>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<version>${dependency.jakarta-ee-mail.version}</version>
</dependency>
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<version>${dependency.jakarta-ee-mail.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>

6
repository/pom.xml
View File

@@ -56,8 +56,8 @@
<artifactId>jakarta.mail-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-mail</artifactId>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
</dependency>
<dependency>
@@ -190,7 +190,7 @@
<dependency>
<groupId>com.github.davidmoten</groupId>
<artifactId>subethasmtp</artifactId>
<version>7.1.3</version>
<version>6.0.6</version>
<exclusions>
<!-- Duplicate classes from com.sun.mail:jakarta.mail -->
<exclusion>

46
repository/src/test/java/org/alfresco/email/server/EmailServiceImplTest.java
View File

@@ -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 <http://www.gnu.org/licenses/>.
* #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 <TEST_EMAIL> 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 <TEST_EMAIL> 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

46
repository/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java
View File

@@ -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 <http://www.gnu.org/licenses/>.
* #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
*/