Skip to content

Upgrade greenmail to 2.1.12 #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DavidWhitlock merged 3 commits into from
Aug 23, 2026
Merged

Upgrade greenmail to 2.1.12 #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
100f5fc
Attempt to update to Greenmail 2.1.1. It's not working yet because t…
DavidWhitlock Nov 28, 2024
6b30f6c
GreenMail now uses Angus Mail, so the legacy com.sun.mail SSL socket …
DavidWhitlock Aug 15, 2026
ae190f4
Merge branch 'Winter2027-SNAPSHOT' into issue-490/upgrade-greenmail-t…
DavidWhitlock Aug 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion grader/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail</artifactId>
<version>2.0.1</version>
<version>2.1.12</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
10 changes: 3 additions & 7 deletions grader/src/it/java/edu/pdx/cs/joy/grader/GreenmailIntegrationTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@
import com.icegreen.greenmail.user.GreenMailUser;
import com.icegreen.greenmail.util.GreenMail;
import com.icegreen.greenmail.util.ServerSetup;
import com.sun.mail.util.MailSSLSocketFactory;
import jakarta.mail.*;
import jakarta.mail.internet.InternetAddress;
import jakarta.mail.internet.MimeMessage;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;

import java.security.GeneralSecurityException;
import java.util.Properties;

public class GreenmailIntegrationTestCase {
Expand Down Expand Up @@ -78,12 +76,10 @@ protected Folder openFolder(Store store, String folderName) throws MessagingExce
return folder;
}

protected Store connectToIMAPServer() throws GeneralSecurityException, MessagingException {
protected Store connectToIMAPServer() throws MessagingException {
Properties props = new Properties();

MailSSLSocketFactory socketFactory = new MailSSLSocketFactory();
socketFactory.setTrustedHosts(new String[]{"127.0.0.1", "localhost"});
props.put("mail.imaps.ssl.socketFactory", socketFactory);
props.put("mail.imaps.ssl.trust", emailServerHost);
props.put("mail.imaps.ssl.checkserveridentity", "false");

Session session = Session.getInstance(props, null);
Store store = session.getStore("imaps");
Expand Down
3 changes: 2 additions & 1 deletion grader/src/it/java/edu/pdx/cs/joy/grader/poa/POASubmissionsDownloaderIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalToIgnoringCase;
import static org.mockito.Mockito.*;

public class POASubmissionsDownloaderIT extends GreenmailIntegrationTestCase {
Expand Down Expand Up @@ -88,7 +89,7 @@ private void assertEmailIsProperlyProcessed(String subject, String poa, String s
POASubmission submission = captor.getValue();
assertThat(submission.getSubject(), equalTo(subject));
assertThat(submission.getContent(), equalTo(poa));
assertThat(submission.getContentType(), equalTo(contentType));
assertThat(submission.getContentType(), equalToIgnoringCase(contentType));
assertThat(submission.getSubmitter(), equalTo(sender));

ArgumentCaptor<StatusMessage> statusCaptor = ArgumentCaptor.forClass(StatusMessage.class);
Expand Down
9 changes: 3 additions & 6 deletions grader/src/main/java/edu/pdx/cs/joy/grader/GraderEmailAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package edu.pdx.cs.joy.grader;

import com.google.common.annotations.VisibleForTesting;
import com.sun.mail.util.MailSSLSocketFactory;
import jakarta.mail.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.security.GeneralSecurityException;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
Expand Down Expand Up @@ -280,17 +278,16 @@ private Store connectToIMAPServer() {
Properties props = new Properties();

if (this.trustLocalhostSSL) {
MailSSLSocketFactory socketFactory= new MailSSLSocketFactory();
socketFactory.setTrustedHosts("127.0.0.1", "localhost");
props.put("mail.imaps.ssl.socketFactory", socketFactory);
props.put("mail.imaps.ssl.trust", "127.0.0.1 localhost");
props.put("mail.imaps.ssl.checkserveridentity", "false");
}

Session session = Session.getInstance(props, null);
Store store = session.getStore("imaps");
store.connect(this.emailServerHostName, this.emailServerPort, this.userName, this.password);
return store;

} catch (MessagingException | GeneralSecurityException ex) {
} catch (MessagingException ex) {
throw new IllegalStateException("While connecting to " + this.emailServerHostName + ":" + this.emailServerPort, ex);
}
}
Expand Down
Loading