From 0492853f3832517cdef61ec80d50e8e233fd359f Mon Sep 17 00:00:00 2001 From: Mike Andrasak Date: Tue, 28 Jul 2020 16:51:30 -0400 Subject: [PATCH] Add support for jakarta mail 2.0 (issue #317) - Pulled from https://github.com/uberskigeek/greenmail/commits/317_jakarta_mail_2.0 - Rebased on master - Updated to latest JakartaMail 2.0 - Update GreenMail version to 2.0.0-SNAPSHOT --- greenmail-core/pom.xml | 4 +- .../greenmail/base/GreenMailOperations.java | 2 +- .../icegreen/greenmail/imap/ImapResponse.java | 2 +- .../icegreen/greenmail/imap/ImapServer.java | 4 +- .../greenmail/imap/ImapSessionFolder.java | 12 ++--- .../greenmail/imap/ImapSessionImpl.java | 2 +- .../imap/commands/AppendCommand.java | 4 +- .../imap/commands/CommandParser.java | 2 +- .../greenmail/imap/commands/FetchCommand.java | 12 ++--- .../greenmail/imap/commands/QuotaCommand.java | 4 +- .../imap/commands/QuotaRootCommand.java | 4 +- .../imap/commands/SearchCommand.java | 2 +- .../imap/commands/SearchCommandParser.java | 8 +-- .../imap/commands/SearchTermBuilder.java | 54 +++++++++---------- .../imap/commands/SetQuotaCommand.java | 2 +- .../greenmail/imap/commands/SortTerm.java | 2 +- .../greenmail/imap/commands/StoreCommand.java | 2 +- .../imap/commands/StoredMessageSorter.java | 6 +-- .../icegreen/greenmail/mail/MailAddress.java | 6 +-- .../greenmail/mail/MovingMessage.java | 2 +- .../icegreen/greenmail/pop3/Pop3Server.java | 4 +- .../greenmail/pop3/commands/DeleCommand.java | 4 +- .../greenmail/pop3/commands/RetrCommand.java | 4 +- .../greenmail/pop3/commands/RsetCommand.java | 2 +- .../greenmail/pop3/commands/StatCommand.java | 4 +- .../greenmail/server/AbstractServer.java | 6 +-- .../icegreen/greenmail/smtp/SmtpServer.java | 2 +- .../greenmail/smtp/commands/DataCommand.java | 1 - .../greenmail/store/FolderListener.java | 4 +- .../greenmail/store/HierarchicalFolder.java | 25 ++++----- .../greenmail/store/InMemoryStore.java | 4 +- .../ListBasedStoredMessageCollection.java | 2 +- .../icegreen/greenmail/store/MailFolder.java | 6 +-- .../MapBasedStoredMessageCollection.java | 2 +- .../greenmail/store/MessageFlags.java | 4 +- .../store/SimpleMessageAttributes.java | 6 +-- .../com/icegreen/greenmail/store/Store.java | 4 +- .../greenmail/store/StoredMessage.java | 6 +-- .../greenmail/user/GreenMailUser.java | 4 +- .../com/icegreen/greenmail/user/UserImpl.java | 3 +- .../greenmail/util/DummySSLSocketFactory.java | 2 +- .../icegreen/greenmail/util/GreenMail.java | 4 +- .../greenmail/util/GreenMailProxy.java | 2 +- .../greenmail/util/GreenMailUtil.java | 12 ++--- .../icegreen/greenmail/util/Retriever.java | 2 +- .../com/icegreen/greenmail/util/UserUtil.java | 2 +- .../GreenMailConfigurationTestBase.java | 2 +- .../ExampleDisableAuthenticationTest.java | 2 +- .../examples/ExampleJavaMailTest.java | 6 +-- .../examples/ExamplePurgeAllEmailsTest.java | 2 +- .../examples/ExampleReceiveNoRuleTest.java | 2 +- .../examples/ExampleReceiveTest.java | 2 +- .../greenmail/examples/ExampleRuleTest.java | 4 +- .../examples/ExampleSendNoRuleAdvTest.java | 8 +-- ...eceiveMessageWithInlineAttachmentTest.java | 10 ++-- .../imap/commands/ImapProtocolTest.java | 4 +- .../commands/SearchCommandParserTest.java | 10 ++-- .../server/AllocateAvailablePortTest.java | 2 +- .../test/AuthenticationDisabledTest.java | 6 +-- .../greenmail/test/ConcurrentCloseIT.java | 2 +- .../greenmail/test/GreenMailUtilTest.java | 6 +-- .../greenmail/test/ImapServerTest.java | 13 ++--- .../greenmail/test/Pop3ServerTest.java | 10 ++-- ...ndReceiveWithInternationalAddressTest.java | 12 ++--- .../greenmail/test/SmtpSecureServerTest.java | 2 +- .../greenmail/test/SmtpServerTest.java | 20 +++---- .../test/commands/ImapSearchTest.java | 8 +-- .../greenmail/test/commands/ImapSortTest.java | 8 +-- .../test/commands/ImapSubjectLineTest.java | 16 +++--- .../test/commands/SMTPCommandTest.java | 6 +-- .../test/specificmessages/DateTest.java | 6 +-- .../test/specificmessages/EncodingTest.java | 4 +- .../test/specificmessages/EscapingTest.java | 6 +-- .../specificmessages/LargeMessageTest.java | 8 +-- .../test/specificmessages/ReplyToTest.java | 12 ++--- .../specificmessages/Rfc822MessageTest.java | 10 ++-- .../specificmessages/SenderRecipientTest.java | 12 ++--- .../test/util/GreenMailMimeMessage.java | 6 +-- .../greenmail/user/UserManagerTest.java | 2 +- .../greenmail/util/GreenMailTest.java | 2 +- greenmail-docker/standalone/pom.xml | 4 +- .../greenmail/docker/DockerServiceIT.java | 10 ++-- greenmail-junit4/pom.xml | 4 +- .../greenmail/junit4/GreenMailRuleTest.java | 2 +- greenmail-junit5/pom.xml | 4 +- .../greenmail/junit5/CustomSetupTests.java | 2 +- .../greenmail/junit5/DefaultSetupTests.java | 4 +- .../greenmail/junit5/MultipleSetupsTests.java | 2 +- .../junit5/WithConfigurationTests.java | 4 +- greenmail-spring/pom.xml | 4 +- .../greenmail/spring/GreenMailBean.java | 2 +- .../spring/GreenMailNamespaceHandlerTest.java | 2 +- greenmail-standalone/pom.xml | 4 +- .../GreenMailStandaloneRunnerTest.java | 2 +- greenmail-webapp/pom.xml | 4 +- pom.xml | 31 +++++++---- 96 files changed, 288 insertions(+), 285 deletions(-) diff --git a/greenmail-core/pom.xml b/greenmail-core/pom.xml index ded7040f7a..5982f21c5c 100644 --- a/greenmail-core/pom.xml +++ b/greenmail-core/pom.xml @@ -8,12 +8,12 @@ greenmail jar - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT com.icegreen greenmail-parent - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT ../pom.xml diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/base/GreenMailOperations.java b/greenmail-core/src/main/java/com/icegreen/greenmail/base/GreenMailOperations.java index 5d980e9881..522588da24 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/base/GreenMailOperations.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/base/GreenMailOperations.java @@ -8,7 +8,7 @@ import com.icegreen.greenmail.store.FolderException; import com.icegreen.greenmail.user.GreenMailUser; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import java.util.Properties; /** diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapResponse.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapResponse.java index 73ccd76fbe..dd1b7d5ce7 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapResponse.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapResponse.java @@ -11,7 +11,7 @@ import com.icegreen.greenmail.util.EncodingUtil; import com.icegreen.greenmail.util.InternetPrintWriter; -import javax.mail.Flags; +import jakarta.mail.Flags; import java.io.OutputStream; /** diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapServer.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapServer.java index a6856de0b2..889c8beb86 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapServer.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapServer.java @@ -12,7 +12,7 @@ import com.icegreen.greenmail.util.ServerSetup; import com.sun.mail.imap.IMAPStore; // NOSONAR -import javax.mail.NoSuchProviderException; +import jakarta.mail.NoSuchProviderException; import java.net.Socket; public final class ImapServer extends AbstractServer { @@ -30,4 +30,4 @@ protected ProtocolHandler createProtocolHandler(Socket clientSocket) { public IMAPStore createStore() throws NoSuchProviderException { return (IMAPStore) super.createStore(); } -} \ No newline at end of file +} diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapSessionFolder.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapSessionFolder.java index 55dfc03391..b2bdab6bfc 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapSessionFolder.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapSessionFolder.java @@ -7,12 +7,12 @@ package com.icegreen.greenmail.imap; import java.util.*; -import javax.mail.Flags; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.UIDFolder; -import javax.mail.internet.MimeMessage; -import javax.mail.search.SearchTerm; +import jakarta.mail.Flags; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.UIDFolder; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.search.SearchTerm; import com.icegreen.greenmail.foedus.util.MsgRangeFilter; import com.icegreen.greenmail.imap.commands.IdRange; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapSessionImpl.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapSessionImpl.java index b24ebf0993..0c73951098 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapSessionImpl.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapSessionImpl.java @@ -12,7 +12,7 @@ import com.icegreen.greenmail.user.GreenMailUser; import com.icegreen.greenmail.user.UserManager; -import javax.mail.Flags; +import jakarta.mail.Flags; import java.util.List; /** diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/AppendCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/AppendCommand.java index 692544593a..698d9f5cfc 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/AppendCommand.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/AppendCommand.java @@ -14,8 +14,8 @@ import com.icegreen.greenmail.store.MailFolder; import com.icegreen.greenmail.util.GreenMailUtil; -import javax.mail.Flags; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Flags; +import jakarta.mail.internet.MimeMessage; import java.io.ByteArrayInputStream; import java.util.Date; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/CommandParser.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/CommandParser.java index 4fd07f567e..0ab509425c 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/CommandParser.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/CommandParser.java @@ -13,7 +13,7 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import javax.mail.Flags; +import jakarta.mail.Flags; import com.icegreen.greenmail.imap.ImapConstants; import com.icegreen.greenmail.imap.ImapRequestLineReader; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/FetchCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/FetchCommand.java index 4230e718cd..ea11d13ab2 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/FetchCommand.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/FetchCommand.java @@ -12,12 +12,12 @@ import com.icegreen.greenmail.store.StoredMessage; import com.icegreen.greenmail.util.GreenMailUtil; -import javax.mail.BodyPart; -import javax.mail.Flags; -import javax.mail.MessagingException; -import javax.mail.Multipart; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.BodyPart; +import jakarta.mail.Flags; +import jakarta.mail.MessagingException; +import jakarta.mail.Multipart; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.*; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/QuotaCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/QuotaCommand.java index 2b62b9ca58..4f9d9017ba 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/QuotaCommand.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/QuotaCommand.java @@ -1,6 +1,6 @@ package com.icegreen.greenmail.imap.commands; -import javax.mail.Quota; +import jakarta.mail.Quota; import com.icegreen.greenmail.imap.AuthorizationException; import com.icegreen.greenmail.imap.ImapRequestLineReader; @@ -106,4 +106,4 @@ protected void appendQuotaRootName(Quota quota, StringBuilder buf) { Example: S: * NAME "" (STORAGE 10 512) -*/ \ No newline at end of file +*/ diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/QuotaRootCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/QuotaRootCommand.java index 9592e8e9ce..991a3d8af3 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/QuotaRootCommand.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/QuotaRootCommand.java @@ -1,6 +1,6 @@ package com.icegreen.greenmail.imap.commands; -import javax.mail.Quota; +import jakarta.mail.Quota; import com.icegreen.greenmail.imap.AuthorizationException; import com.icegreen.greenmail.imap.ImapRequestLineReader; @@ -78,4 +78,4 @@ protected void doProcess(final ImapRequestLineReader request, final ImapResponse Example: S: * QUOTAROOT INBOX "" S: * QUOTAROOT comp.mail.mime -*/ \ No newline at end of file +*/ diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SearchCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SearchCommand.java index b5c722332a..81ffaee4f9 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SearchCommand.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SearchCommand.java @@ -7,7 +7,7 @@ package com.icegreen.greenmail.imap.commands; import java.nio.charset.UnsupportedCharsetException; -import javax.mail.search.SearchTerm; +import jakarta.mail.search.SearchTerm; import com.icegreen.greenmail.imap.ImapRequestLineReader; import com.icegreen.greenmail.imap.ImapResponse; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SearchCommandParser.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SearchCommandParser.java index 08e065d2a0..0535e191a5 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SearchCommandParser.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SearchCommandParser.java @@ -10,10 +10,10 @@ import java.nio.charset.StandardCharsets; import java.nio.charset.UnsupportedCharsetException; import java.util.*; -import javax.mail.search.AndTerm; -import javax.mail.search.NotTerm; -import javax.mail.search.OrTerm; -import javax.mail.search.SearchTerm; +import jakarta.mail.search.AndTerm; +import jakarta.mail.search.NotTerm; +import jakarta.mail.search.OrTerm; +import jakarta.mail.search.SearchTerm; import com.icegreen.greenmail.imap.ImapRequestLineReader; import com.icegreen.greenmail.imap.ProtocolException; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SearchTermBuilder.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SearchTermBuilder.java index 38933de12b..3dbe38630b 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SearchTermBuilder.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SearchTermBuilder.java @@ -9,25 +9,25 @@ import java.util.List; import java.util.Locale; -import javax.mail.Flags; -import javax.mail.Message; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; -import javax.mail.search.AndTerm; -import javax.mail.search.BodyTerm; -import javax.mail.search.ComparisonTerm; -import javax.mail.search.FlagTerm; -import javax.mail.search.FromStringTerm; -import javax.mail.search.FromTerm; -import javax.mail.search.HeaderTerm; -import javax.mail.search.OrTerm; -import javax.mail.search.ReceivedDateTerm; -import javax.mail.search.RecipientStringTerm; -import javax.mail.search.RecipientTerm; -import javax.mail.search.SearchTerm; -import javax.mail.search.SentDateTerm; -import javax.mail.search.SizeTerm; -import javax.mail.search.SubjectTerm; +import jakarta.mail.Flags; +import jakarta.mail.Message; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.search.AndTerm; +import jakarta.mail.search.BodyTerm; +import jakarta.mail.search.ComparisonTerm; +import jakarta.mail.search.FlagTerm; +import jakarta.mail.search.FromStringTerm; +import jakarta.mail.search.FromTerm; +import jakarta.mail.search.HeaderTerm; +import jakarta.mail.search.OrTerm; +import jakarta.mail.search.ReceivedDateTerm; +import jakarta.mail.search.RecipientStringTerm; +import jakarta.mail.search.RecipientTerm; +import jakarta.mail.search.SearchTerm; +import jakarta.mail.search.SentDateTerm; +import jakarta.mail.search.SizeTerm; +import jakarta.mail.search.SubjectTerm; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -355,7 +355,7 @@ public SearchTerm build() { private static SearchTerm createFlagSearchTerm(String flagName, boolean value) { Flags.Flag flag = toFlag(flagName); - Flags flags = new javax.mail.Flags(); + Flags flags = new jakarta.mail.Flags(); if (null == flag) { // user flags flags.add(flagName); } else { @@ -384,28 +384,28 @@ public SearchTerm build() { }; } - private static javax.mail.Flags.Flag toFlag(String flagValue) { + private static jakarta.mail.Flags.Flag toFlag(String flagValue) { if (flagValue == null || flagValue.trim().length() < 1) { throw new IllegalArgumentException("Can not convert empty string to mail flag"); } String flag = flagValue.trim().toUpperCase(); if ("ANSWERED".equals(flag)) { - return javax.mail.Flags.Flag.ANSWERED; + return jakarta.mail.Flags.Flag.ANSWERED; } if ("DELETED".equals(flag)) { - return javax.mail.Flags.Flag.DELETED; + return jakarta.mail.Flags.Flag.DELETED; } if ("DRAFT".equals(flag)) { - return javax.mail.Flags.Flag.DRAFT; + return jakarta.mail.Flags.Flag.DRAFT; } if ("FLAGGED".equals(flag)) { - return javax.mail.Flags.Flag.FLAGGED; + return jakarta.mail.Flags.Flag.FLAGGED; } if ("RECENT".equals(flag)) { - return javax.mail.Flags.Flag.RECENT; + return jakarta.mail.Flags.Flag.RECENT; } if ("SEEN".equals(flag)) { - return javax.mail.Flags.Flag.SEEN; + return jakarta.mail.Flags.Flag.SEEN; } return null; } diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SetQuotaCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SetQuotaCommand.java index f8e361d32d..334bf518ed 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SetQuotaCommand.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SetQuotaCommand.java @@ -1,6 +1,6 @@ package com.icegreen.greenmail.imap.commands; -import javax.mail.Quota; +import jakarta.mail.Quota; import com.icegreen.greenmail.imap.ImapRequestLineReader; import com.icegreen.greenmail.imap.ImapResponse; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SortTerm.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SortTerm.java index f0e5cf4408..358e2cf544 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SortTerm.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SortTerm.java @@ -1,6 +1,6 @@ package com.icegreen.greenmail.imap.commands; -import javax.mail.search.SearchTerm; +import jakarta.mail.search.SearchTerm; import java.util.ArrayList; import java.util.List; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/StoreCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/StoreCommand.java index fd9777cd8f..63a1c1d7d5 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/StoreCommand.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/StoreCommand.java @@ -10,7 +10,7 @@ import com.icegreen.greenmail.store.FolderException; import com.icegreen.greenmail.store.FolderListener; -import javax.mail.Flags; +import jakarta.mail.Flags; /** diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/StoredMessageSorter.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/StoredMessageSorter.java index 9341024a6f..babf9fc3f2 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/StoredMessageSorter.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/StoredMessageSorter.java @@ -2,9 +2,9 @@ import com.icegreen.greenmail.store.StoredMessage; -import javax.mail.Address; -import javax.mail.Message; -import javax.mail.MessagingException; +import jakarta.mail.Address; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; import java.util.Comparator; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/mail/MailAddress.java b/greenmail-core/src/main/java/com/icegreen/greenmail/mail/MailAddress.java index af68d45ae6..b7fe9622e0 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/mail/MailAddress.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/mail/MailAddress.java @@ -7,8 +7,8 @@ package com.icegreen.greenmail.mail; import java.io.UnsupportedEncodingException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeUtility; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeUtility; public class MailAddress { String host; @@ -73,4 +73,4 @@ private String decodeStr(String str) { return str; } } -} \ No newline at end of file +} diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/mail/MovingMessage.java b/greenmail-core/src/main/java/com/icegreen/greenmail/mail/MovingMessage.java index 538bb9fdfc..9d89b62dc7 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/mail/MovingMessage.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/mail/MovingMessage.java @@ -6,7 +6,7 @@ */ package com.icegreen.greenmail.mail; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import java.io.Reader; import java.io.StringReader; import java.util.LinkedList; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/Pop3Server.java b/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/Pop3Server.java index 8237fd625c..a99d119c7e 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/Pop3Server.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/Pop3Server.java @@ -13,7 +13,7 @@ import com.icegreen.greenmail.util.ServerSetup; import com.sun.mail.pop3.POP3Store; // NOSONAR -import javax.mail.NoSuchProviderException; +import jakarta.mail.NoSuchProviderException; import java.net.Socket; public class Pop3Server extends AbstractServer { @@ -31,4 +31,4 @@ protected ProtocolHandler createProtocolHandler(final Socket clientSocket) { public POP3Store createStore() throws NoSuchProviderException { return (POP3Store) super.createStore(); } -} \ No newline at end of file +} diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/DeleCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/DeleCommand.java index cfc2a1c5b4..4c735577c0 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/DeleCommand.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/DeleCommand.java @@ -12,7 +12,7 @@ import com.icegreen.greenmail.store.MailFolder; import com.icegreen.greenmail.store.StoredMessage; -import javax.mail.Flags; +import jakarta.mail.Flags; import java.util.List; @@ -52,4 +52,4 @@ public void execute(Pop3Connection conn, Pop3State state, conn.println("-ERR " + e); } } -} \ No newline at end of file +} diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/RetrCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/RetrCommand.java index 67ca0a7a48..cf50b23f6b 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/RetrCommand.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/RetrCommand.java @@ -13,7 +13,7 @@ import com.icegreen.greenmail.store.StoredMessage; import com.icegreen.greenmail.util.GreenMailUtil; -import javax.mail.Flags; +import jakarta.mail.Flags; import java.io.StringReader; import java.util.List; @@ -52,4 +52,4 @@ public void execute(Pop3Connection conn, Pop3State state, conn.println("-ERR " + e); } } -} \ No newline at end of file +} diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/RsetCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/RsetCommand.java index 4c96244192..d97479deb3 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/RsetCommand.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/RsetCommand.java @@ -5,7 +5,7 @@ import com.icegreen.greenmail.store.MailFolder; import com.icegreen.greenmail.store.StoredMessage; -import javax.mail.Flags; +import jakarta.mail.Flags; import java.util.List; /** diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/StatCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/StatCommand.java index cf0b46f0a7..230e05762a 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/StatCommand.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/pop3/commands/StatCommand.java @@ -11,7 +11,7 @@ import com.icegreen.greenmail.store.MailFolder; import com.icegreen.greenmail.store.StoredMessage; -import javax.mail.MessagingException; +import jakarta.mail.MessagingException; import java.util.List; @@ -48,4 +48,4 @@ long sumMessageSizes(List messages) { return total; } -} \ No newline at end of file +} diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/server/AbstractServer.java b/greenmail-core/src/main/java/com/icegreen/greenmail/server/AbstractServer.java index 3aa173ea23..8afe14b43d 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/server/AbstractServer.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/server/AbstractServer.java @@ -9,9 +9,9 @@ import java.util.*; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.mail.NoSuchProviderException; -import javax.mail.Session; -import javax.mail.Store; +import jakarta.mail.NoSuchProviderException; +import jakarta.mail.Session; +import jakarta.mail.Store; import com.icegreen.greenmail.Managers; import com.icegreen.greenmail.util.DummySSLServerSocketFactory; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/smtp/SmtpServer.java b/greenmail-core/src/main/java/com/icegreen/greenmail/smtp/SmtpServer.java index ba50ea9e58..1feba9391f 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/smtp/SmtpServer.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/smtp/SmtpServer.java @@ -23,4 +23,4 @@ public SmtpServer(ServerSetup setup, Managers managers) { protected ProtocolHandler createProtocolHandler(final Socket clientSocket) { return new SmtpHandler(new SmtpCommandRegistry(), managers.getSmtpManager(), clientSocket); } -} \ No newline at end of file +} diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/smtp/commands/DataCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/smtp/commands/DataCommand.java index 9457966e32..75ae387ea8 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/smtp/commands/DataCommand.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/smtp/commands/DataCommand.java @@ -19,7 +19,6 @@ /** * DATA command. *

- *

* The spec is at * https://tools.ietf.org/html/rfc2821.html#section-4.1.1.4. diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/store/FolderListener.java b/greenmail-core/src/main/java/com/icegreen/greenmail/store/FolderListener.java index 526b6833c1..9de1db4048 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/store/FolderListener.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/store/FolderListener.java @@ -6,7 +6,7 @@ */ package com.icegreen.greenmail.store; -import javax.mail.Flags; +import jakarta.mail.Flags; public interface FolderListener { @@ -17,4 +17,4 @@ public interface FolderListener { void flagsUpdated(int msn, Flags flags, Long uid); void mailboxDeleted(); -} \ No newline at end of file +} diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/store/HierarchicalFolder.java b/greenmail-core/src/main/java/com/icegreen/greenmail/store/HierarchicalFolder.java index 740aca9b1a..66d0a73927 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/store/HierarchicalFolder.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/store/HierarchicalFolder.java @@ -7,12 +7,12 @@ import java.util.*; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicLong; -import javax.mail.Flags; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.UIDFolder; -import javax.mail.internet.MimeMessage; -import javax.mail.search.SearchTerm; +import jakarta.mail.Flags; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.UIDFolder; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.search.SearchTerm; import com.icegreen.greenmail.foedus.util.MsgRangeFilter; import com.icegreen.greenmail.imap.ImapConstants; @@ -137,6 +137,11 @@ public long getUidNext() { // TODO: Remove in 1.7 return getUIDNext(); } + @Override + public long getUIDNext() { + return nextUid.get(); + } + @Override public int getUnseenCount() { int count = 0; @@ -448,6 +453,7 @@ public Message[] getMessagesByUID(long[] uids) { } } + @Override public long getUID(Message message) { // Check if we have a message with same object reference ... otherwise, not supported. @@ -460,10 +466,5 @@ public long getUID(Message message) { } throw new IllegalStateException("No match found for " + message); } - - @Override - public long getUIDNext() { - return nextUid.get(); - } - + } diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/store/InMemoryStore.java b/greenmail-core/src/main/java/com/icegreen/greenmail/store/InMemoryStore.java index bfe60904db..030fba4831 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/store/InMemoryStore.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/store/InMemoryStore.java @@ -7,8 +7,8 @@ package com.icegreen.greenmail.store; import java.util.*; -import javax.mail.MessagingException; -import javax.mail.Quota; +import jakarta.mail.MessagingException; +import jakarta.mail.Quota; import com.icegreen.greenmail.imap.ImapConstants; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/store/ListBasedStoredMessageCollection.java b/greenmail-core/src/main/java/com/icegreen/greenmail/store/ListBasedStoredMessageCollection.java index a04c4808dd..3095690d89 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/store/ListBasedStoredMessageCollection.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/store/ListBasedStoredMessageCollection.java @@ -7,7 +7,7 @@ import com.icegreen.greenmail.foedus.util.MsgRangeFilter; import com.icegreen.greenmail.imap.commands.IdRange; -import javax.mail.Flags; +import jakarta.mail.Flags; import java.util.*; /** diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/store/MailFolder.java b/greenmail-core/src/main/java/com/icegreen/greenmail/store/MailFolder.java index 71f13654f8..2d9b1c5209 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/store/MailFolder.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/store/MailFolder.java @@ -10,9 +10,9 @@ import com.icegreen.greenmail.imap.commands.IdRange; import com.icegreen.greenmail.mail.MovingMessage; -import javax.mail.Flags; -import javax.mail.internet.MimeMessage; -import javax.mail.search.SearchTerm; +import jakarta.mail.Flags; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.search.SearchTerm; import java.util.Date; import java.util.List; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/store/MapBasedStoredMessageCollection.java b/greenmail-core/src/main/java/com/icegreen/greenmail/store/MapBasedStoredMessageCollection.java index b0f493ad4f..cfd995e36e 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/store/MapBasedStoredMessageCollection.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/store/MapBasedStoredMessageCollection.java @@ -8,7 +8,7 @@ import com.icegreen.greenmail.imap.commands.IdRange; import com.icegreen.greenmail.util.MaxSizeLinkedHashMap; -import javax.mail.Flags; +import jakarta.mail.Flags; import java.util.*; import static java.lang.String.format; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/store/MessageFlags.java b/greenmail-core/src/main/java/com/icegreen/greenmail/store/MessageFlags.java index 8e70c03e0a..edb1759bd7 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/store/MessageFlags.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/store/MessageFlags.java @@ -6,12 +6,12 @@ */ package com.icegreen.greenmail.store; -import javax.mail.Flags; +import jakarta.mail.Flags; /** * The set of flags associated with a message. - * TODO - why not use javax.mail.Flags instead of having our own. + * TODO - why not use jakarta.mail.Flags instead of having our own. *

Reference: RFC 2060 - para 2.3 * * @author Charles Benett diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/store/SimpleMessageAttributes.java b/greenmail-core/src/main/java/com/icegreen/greenmail/store/SimpleMessageAttributes.java index 3815c648e9..8f76d676c6 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/store/SimpleMessageAttributes.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/store/SimpleMessageAttributes.java @@ -8,9 +8,9 @@ import java.util.*; -import javax.mail.BodyPart; -import javax.mail.MessagingException; -import javax.mail.internet.*; +import jakarta.mail.BodyPart; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.*; import com.icegreen.greenmail.mail.MailAddress; import com.icegreen.greenmail.util.GreenMailUtil; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/store/Store.java b/greenmail-core/src/main/java/com/icegreen/greenmail/store/Store.java index 8838d0c647..e497d717cd 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/store/Store.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/store/Store.java @@ -6,7 +6,7 @@ */ package com.icegreen.greenmail.store; -import javax.mail.Quota; +import jakarta.mail.Quota; import java.util.Collection; /** @@ -115,7 +115,7 @@ void renameMailbox(MailFolder existingFolder, String newName) * Sets the quota. * * @link http://www.ietf.org/rfc/rfc2087.txt - * @see com.sun.mail.imap.IMAPStore#setQuota(javax.mail.Quota) + * @see com.sun.mail.imap.IMAPStore#setQuota(jakarta.mail.Quota) * @param quota the quota. * @param qualifiedRootPrefix the user specific prefix */ diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/store/StoredMessage.java b/greenmail-core/src/main/java/com/icegreen/greenmail/store/StoredMessage.java index ac2798912b..52957c98d9 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/store/StoredMessage.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/store/StoredMessage.java @@ -8,9 +8,9 @@ import java.util.Date; -import javax.mail.Flags; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Flags; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; /** * A mail message with all of the extra stuff that IMAP requires. diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/user/GreenMailUser.java b/greenmail-core/src/main/java/com/icegreen/greenmail/user/GreenMailUser.java index d6c51e7869..3e15053805 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/user/GreenMailUser.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/user/GreenMailUser.java @@ -6,7 +6,7 @@ import com.icegreen.greenmail.mail.MovingMessage; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; public interface GreenMailUser { @@ -28,4 +28,4 @@ public interface GreenMailUser { String getQualifiedMailboxName(); -} \ No newline at end of file +} diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/user/UserImpl.java b/greenmail-core/src/main/java/com/icegreen/greenmail/user/UserImpl.java index b6d0dec18b..478d2ada04 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/user/UserImpl.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/user/UserImpl.java @@ -7,7 +7,7 @@ package com.icegreen.greenmail.user; import java.util.Collection; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import com.icegreen.greenmail.imap.AuthorizationException; import com.icegreen.greenmail.imap.ImapHostManager; @@ -16,7 +16,6 @@ import com.icegreen.greenmail.store.MailFolder; - public class UserImpl implements GreenMailUser { String email; private final int cachedHashCode; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/util/DummySSLSocketFactory.java b/greenmail-core/src/main/java/com/icegreen/greenmail/util/DummySSLSocketFactory.java index f65c0f0050..ea12f0b5e0 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/util/DummySSLSocketFactory.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/util/DummySSLSocketFactory.java @@ -125,4 +125,4 @@ private static void trySetFakeRemoteHost(Socket socket) { log.debug("Could not set fake remote host. SSL connection setup may be slow."); } } -} \ No newline at end of file +} diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/util/GreenMail.java b/greenmail-core/src/main/java/com/icegreen/greenmail/util/GreenMail.java index af56500124..8e3d51f2c6 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/util/GreenMail.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/util/GreenMail.java @@ -22,8 +22,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import java.util.*; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/util/GreenMailProxy.java b/greenmail-core/src/main/java/com/icegreen/greenmail/util/GreenMailProxy.java index 755cb5585d..3fdc98f62e 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/util/GreenMailProxy.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/util/GreenMailProxy.java @@ -8,7 +8,7 @@ import com.icegreen.greenmail.store.FolderException; import com.icegreen.greenmail.user.GreenMailUser; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import java.util.Properties; /** diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/util/GreenMailUtil.java b/greenmail-core/src/main/java/com/icegreen/greenmail/util/GreenMailUtil.java index 2285736121..dd9beb3ff1 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/util/GreenMailUtil.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/util/GreenMailUtil.java @@ -8,12 +8,12 @@ import java.util.Date; import java.util.Properties; import java.util.Random; -import javax.activation.DataHandler; -import javax.activation.DataSource; -import javax.mail.*; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; +import jakarta.activation.DataHandler; +import jakarta.activation.DataSource; +import jakarta.mail.*; +import jakarta.mail.internet.MimeBodyPart; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; import com.icegreen.greenmail.user.GreenMailUser; import org.slf4j.Logger; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/util/Retriever.java b/greenmail-core/src/main/java/com/icegreen/greenmail/util/Retriever.java index ba55a43d44..68406cd52c 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/util/Retriever.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/util/Retriever.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.mail.*; +import jakarta.mail.*; import com.icegreen.greenmail.server.AbstractServer; diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/util/UserUtil.java b/greenmail-core/src/main/java/com/icegreen/greenmail/util/UserUtil.java index 3bad146fbe..355c8770ee 100644 --- a/greenmail-core/src/main/java/com/icegreen/greenmail/util/UserUtil.java +++ b/greenmail-core/src/main/java/com/icegreen/greenmail/util/UserUtil.java @@ -2,7 +2,7 @@ import com.icegreen.greenmail.base.GreenMailOperations; -import javax.mail.internet.InternetAddress; +import jakarta.mail.internet.InternetAddress; /** * Utility for managing users diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/configuration/GreenMailConfigurationTestBase.java b/greenmail-core/src/test/java/com/icegreen/greenmail/configuration/GreenMailConfigurationTestBase.java index f5d712193b..fbfb6ab195 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/configuration/GreenMailConfigurationTestBase.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/configuration/GreenMailConfigurationTestBase.java @@ -3,7 +3,7 @@ import com.icegreen.greenmail.base.GreenMailOperations; import com.icegreen.greenmail.util.Retriever; -import javax.mail.Message; +import jakarta.mail.Message; import static com.icegreen.greenmail.configuration.GreenMailConfiguration.aConfig; import static org.junit.Assert.assertEquals; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleDisableAuthenticationTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleDisableAuthenticationTest.java index 74c925583a..e124b26e45 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleDisableAuthenticationTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleDisableAuthenticationTest.java @@ -7,7 +7,7 @@ import org.junit.Rule; import org.junit.Test; -import javax.mail.Message; +import jakarta.mail.Message; import static org.assertj.core.api.Assertions.assertThat; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleJavaMailTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleJavaMailTest.java index bffbdfee6e..a39f748c8e 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleJavaMailTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleJavaMailTest.java @@ -6,9 +6,9 @@ import org.junit.Rule; import org.junit.Test; -import javax.mail.*; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; +import jakarta.mail.*; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; import static org.assertj.core.api.Assertions.assertThat; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExamplePurgeAllEmailsTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExamplePurgeAllEmailsTest.java index 3a3e5af5a4..97d9d89908 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExamplePurgeAllEmailsTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExamplePurgeAllEmailsTest.java @@ -8,7 +8,7 @@ import org.junit.Rule; import org.junit.Test; -import javax.mail.Message; +import jakarta.mail.Message; import static org.assertj.core.api.Assertions.assertThat; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleReceiveNoRuleTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleReceiveNoRuleTest.java index 60032545ae..c7aa5297c5 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleReceiveNoRuleTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleReceiveNoRuleTest.java @@ -6,7 +6,7 @@ import com.icegreen.greenmail.util.ServerSetupTest; import org.junit.Test; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import static org.assertj.core.api.Assertions.assertThat; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleReceiveTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleReceiveTest.java index 9e2dd7841e..bf1c2ed630 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleReceiveTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleReceiveTest.java @@ -7,7 +7,7 @@ import org.junit.Rule; import org.junit.Test; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import static org.assertj.core.api.Assertions.assertThat; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleRuleTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleRuleTest.java index 5a3368ee6b..7001e7845e 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleRuleTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleRuleTest.java @@ -6,8 +6,8 @@ import org.junit.Rule; import org.junit.Test; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import static org.assertj.core.api.Assertions.assertThat; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleSendNoRuleAdvTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleSendNoRuleAdvTest.java index 9128a0e897..b2f5dd37ca 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleSendNoRuleAdvTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleSendNoRuleAdvTest.java @@ -5,10 +5,10 @@ import com.icegreen.greenmail.util.ServerSetupTest; import org.junit.Test; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeBodyPart; +import jakarta.mail.internet.MimeMultipart; import java.io.IOException; import static org.assertj.core.api.Assertions.assertThat; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleSendReceiveMessageWithInlineAttachmentTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleSendReceiveMessageWithInlineAttachmentTest.java index b3289f7f8d..a81f7aa8f6 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleSendReceiveMessageWithInlineAttachmentTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/examples/ExampleSendReceiveMessageWithInlineAttachmentTest.java @@ -5,11 +5,11 @@ import org.junit.Rule; import org.junit.Test; -import javax.mail.*; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.*; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeBodyPart; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; import java.io.IOException; import java.security.GeneralSecurityException; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/imap/commands/ImapProtocolTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/imap/commands/ImapProtocolTest.java index 7a793b6c02..b4c09ebdc0 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/imap/commands/ImapProtocolTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/imap/commands/ImapProtocolTest.java @@ -15,8 +15,8 @@ import org.junit.Rule; import org.junit.Test; -import javax.mail.*; -import javax.mail.internet.MimeMessage; +import jakarta.mail.*; +import jakarta.mail.internet.MimeMessage; import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/imap/commands/SearchCommandParserTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/imap/commands/SearchCommandParserTest.java index bae8c39431..09972bc410 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/imap/commands/SearchCommandParserTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/imap/commands/SearchCommandParserTest.java @@ -1,11 +1,11 @@ package com.icegreen.greenmail.imap.commands; import java.io.ByteArrayInputStream; -import javax.mail.Flags; -import javax.mail.Message; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; -import javax.mail.search.*; +import jakarta.mail.Flags; +import jakarta.mail.Message; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.search.*; import com.icegreen.greenmail.imap.ImapRequestLineReader; import com.icegreen.greenmail.imap.ProtocolException; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/server/AllocateAvailablePortTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/server/AllocateAvailablePortTest.java index be84658adf..9cb3a04cb4 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/server/AllocateAvailablePortTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/server/AllocateAvailablePortTest.java @@ -6,7 +6,7 @@ import org.junit.Rule; import org.junit.Test; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import static org.assertj.core.api.Assertions.assertThat; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/AuthenticationDisabledTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/AuthenticationDisabledTest.java index 492e788af8..d93205a11b 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/AuthenticationDisabledTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/AuthenticationDisabledTest.java @@ -4,9 +4,9 @@ import java.io.IOException; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import org.junit.Rule; import org.junit.Test; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/ConcurrentCloseIT.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/ConcurrentCloseIT.java index a709caa4b8..9e513f8325 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/ConcurrentCloseIT.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/ConcurrentCloseIT.java @@ -1,7 +1,7 @@ package com.icegreen.greenmail.test; import java.util.concurrent.TimeUnit; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import com.icegreen.greenmail.util.GreenMail; import com.icegreen.greenmail.util.GreenMailUtil; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/GreenMailUtilTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/GreenMailUtilTest.java index 93c1b7cc91..8621622bf8 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/GreenMailUtilTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/GreenMailUtilTest.java @@ -13,9 +13,9 @@ import com.icegreen.greenmail.util.ServerSetupTest; import org.junit.Test; -import javax.mail.*; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.*; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; import java.io.ByteArrayOutputStream; import static org.assertj.core.api.Assertions.assertThat; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/ImapServerTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/ImapServerTest.java index 6d41bc9aad..01925a276f 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/ImapServerTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/ImapServerTest.java @@ -15,20 +15,15 @@ import org.junit.Rule; import org.junit.Test; -import javax.mail.*; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.*; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; import java.io.ByteArrayOutputStream; import java.util.Date; -import static javax.mail.Flags.Flag.DELETED; +import static jakarta.mail.Flags.Flag.DELETED; import static org.assertj.core.api.Assertions.*; -/**a - * @author Wael Chatila - * @version $Id: $ - * @since Jan 28, 2006 - */ public class ImapServerTest { private static final String UMLAUTS = "öäü \u00c4 \u00e4"; @Rule diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/Pop3ServerTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/Pop3ServerTest.java index 4e04e3e78c..0791d78325 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/Pop3ServerTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/Pop3ServerTest.java @@ -5,11 +5,11 @@ package com.icegreen.greenmail.test; import java.io.ByteArrayOutputStream; -import javax.mail.AuthenticationFailedException; -import javax.mail.BodyPart; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.AuthenticationFailedException; +import jakarta.mail.BodyPart; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMultipart; import com.icegreen.greenmail.junit.GreenMailRule; import com.icegreen.greenmail.user.UserException; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/SendReceiveWithInternationalAddressTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/SendReceiveWithInternationalAddressTest.java index e575d93944..2609a83690 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/SendReceiveWithInternationalAddressTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/SendReceiveWithInternationalAddressTest.java @@ -6,12 +6,12 @@ import org.junit.Rule; import org.junit.Test; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeUtility; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.Session; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeUtility; import java.io.UnsupportedEncodingException; import java.util.Date; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/SmtpSecureServerTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/SmtpSecureServerTest.java index b80f73c4dd..254c5487ba 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/SmtpSecureServerTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/SmtpSecureServerTest.java @@ -7,7 +7,7 @@ import org.junit.Rule; import org.junit.Test; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import static org.assertj.core.api.Assertions.assertThat; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/SmtpServerTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/SmtpServerTest.java index e4dd97013b..e52c5441c4 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/SmtpServerTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/SmtpServerTest.java @@ -10,16 +10,16 @@ import java.io.ByteArrayOutputStream; import java.util.Properties; -import javax.mail.AuthenticationFailedException; -import javax.mail.BodyPart; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.Transport; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMessage.RecipientType; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.AuthenticationFailedException; +import jakarta.mail.BodyPart; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage.RecipientType; +import jakarta.mail.internet.MimeMultipart; import org.junit.Rule; import org.junit.Test; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/commands/ImapSearchTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/commands/ImapSearchTest.java index 46acea2354..054d515b01 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/commands/ImapSearchTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/commands/ImapSearchTest.java @@ -7,10 +7,10 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import javax.mail.*; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; -import javax.mail.search.*; +import jakarta.mail.*; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.search.*; import com.icegreen.greenmail.imap.commands.SearchKey; import com.icegreen.greenmail.junit.GreenMailRule; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/commands/ImapSortTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/commands/ImapSortTest.java index e6c01f870e..25be431b21 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/commands/ImapSortTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/commands/ImapSortTest.java @@ -9,10 +9,10 @@ import org.junit.Rule; import org.junit.Test; -import javax.mail.*; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; -import javax.mail.search.*; +import jakarta.mail.*; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.search.*; import static org.assertj.core.api.Assertions.*; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/commands/ImapSubjectLineTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/commands/ImapSubjectLineTest.java index 3cf8eebb9d..09e8976b3e 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/commands/ImapSubjectLineTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/commands/ImapSubjectLineTest.java @@ -11,14 +11,14 @@ import org.junit.Rule; import org.junit.Test; -import javax.mail.Address; -import javax.mail.Folder; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.Store; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Address; +import jakarta.mail.Folder; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.Session; +import jakarta.mail.Store; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; import static org.assertj.core.api.Assertions.assertThat; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/commands/SMTPCommandTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/commands/SMTPCommandTest.java index 27c447b0ab..c9e7486b02 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/commands/SMTPCommandTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/commands/SMTPCommandTest.java @@ -4,9 +4,9 @@ import java.net.Socket; import java.nio.charset.StandardCharsets; import java.util.Base64; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.URLName; +import jakarta.mail.MessagingException; +import jakarta.mail.Session; +import jakarta.mail.URLName; import com.icegreen.greenmail.junit.GreenMailRule; import com.icegreen.greenmail.smtp.commands.AuthCommand; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/DateTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/DateTest.java index 112204f325..24c3a0f9c5 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/DateTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/DateTest.java @@ -8,9 +8,9 @@ import org.junit.Rule; import org.junit.Test; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/EncodingTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/EncodingTest.java index 24df4a752d..dc557cef8f 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/EncodingTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/EncodingTest.java @@ -4,8 +4,8 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; -import javax.mail.*; -import javax.mail.internet.*; +import jakarta.mail.*; +import jakarta.mail.internet.*; import com.icegreen.greenmail.junit.GreenMailRule; import com.icegreen.greenmail.util.EncodingUtil; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/EscapingTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/EscapingTest.java index 909be75140..d3ae3502d3 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/EscapingTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/EscapingTest.java @@ -9,9 +9,9 @@ import org.junit.Rule; import org.junit.Test; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.Session; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.Session; import static org.assertj.core.api.Assertions.assertThat; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/LargeMessageTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/LargeMessageTest.java index dd60aeddde..d7dd83c4cc 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/LargeMessageTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/LargeMessageTest.java @@ -8,10 +8,10 @@ import org.junit.Rule; import org.junit.Test; -import javax.mail.BodyPart; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.BodyPart; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMultipart; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/ReplyToTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/ReplyToTest.java index 9627061264..2e772ea0b5 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/ReplyToTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/ReplyToTest.java @@ -1,11 +1,11 @@ package com.icegreen.greenmail.test.specificmessages; import java.io.UnsupportedEncodingException; -import javax.mail.Address; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Address; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; import com.icegreen.greenmail.junit.GreenMailRule; import com.icegreen.greenmail.server.AbstractServer; @@ -158,4 +158,4 @@ private InternetAddress[] toInetAddr(Address[] addrs) { } return out; } -} \ No newline at end of file +} diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/Rfc822MessageTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/Rfc822MessageTest.java index 6c013026ae..7c707b1114 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/Rfc822MessageTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/Rfc822MessageTest.java @@ -7,11 +7,11 @@ import org.junit.Rule; import org.junit.Test; -import javax.mail.*; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.*; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeBodyPart; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; import java.io.IOException; import static org.assertj.core.api.Assertions.assertThat; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/SenderRecipientTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/SenderRecipientTest.java index dc7646ddcd..49e4353ef8 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/SenderRecipientTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/specificmessages/SenderRecipientTest.java @@ -2,12 +2,12 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; -import javax.mail.Address; -import javax.mail.Folder; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Address; +import jakarta.mail.Folder; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; import com.icegreen.greenmail.junit.GreenMailRule; import com.icegreen.greenmail.server.AbstractServer; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/test/util/GreenMailMimeMessage.java b/greenmail-core/src/test/java/com/icegreen/greenmail/test/util/GreenMailMimeMessage.java index bf9f4b3f4a..3ab8dcb3ab 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/test/util/GreenMailMimeMessage.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/test/util/GreenMailMimeMessage.java @@ -1,8 +1,8 @@ package com.icegreen.greenmail.test.util; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.Session; +import jakarta.mail.internet.MimeMessage; /* Utility class that extends MimeMessage forcing every message-id to contain characters that need to be properly escaped * Javamail by default will set the message-id when the MimeMessage is being processed. diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/user/UserManagerTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/user/UserManagerTest.java index 231aaf228a..94e724dde8 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/user/UserManagerTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/user/UserManagerTest.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import com.icegreen.greenmail.imap.ImapConstants; import com.icegreen.greenmail.imap.ImapHostManager; diff --git a/greenmail-core/src/test/java/com/icegreen/greenmail/util/GreenMailTest.java b/greenmail-core/src/test/java/com/icegreen/greenmail/util/GreenMailTest.java index 38342a2240..3cad03e1e8 100644 --- a/greenmail-core/src/test/java/com/icegreen/greenmail/util/GreenMailTest.java +++ b/greenmail-core/src/test/java/com/icegreen/greenmail/util/GreenMailTest.java @@ -4,7 +4,7 @@ import org.junit.Rule; import org.junit.Test; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import static org.assertj.core.api.Assertions.assertThat; diff --git a/greenmail-docker/standalone/pom.xml b/greenmail-docker/standalone/pom.xml index 17b727ea0b..19775014a4 100644 --- a/greenmail-docker/standalone/pom.xml +++ b/greenmail-docker/standalone/pom.xml @@ -4,7 +4,7 @@ Docker image running GreenMail Standalone greenmail-docker-standalone - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT jar @@ -16,7 +16,7 @@ com.icegreen greenmail-parent - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT ../../pom.xml diff --git a/greenmail-docker/standalone/src/test/java/com/icegreen/greenmail/docker/DockerServiceIT.java b/greenmail-docker/standalone/src/test/java/com/icegreen/greenmail/docker/DockerServiceIT.java index d6dce12c3a..72f6e7fd42 100644 --- a/greenmail-docker/standalone/src/test/java/com/icegreen/greenmail/docker/DockerServiceIT.java +++ b/greenmail-docker/standalone/src/test/java/com/icegreen/greenmail/docker/DockerServiceIT.java @@ -5,10 +5,10 @@ import com.icegreen.greenmail.util.ServerSetupTest; import org.junit.Test; -import javax.mail.Folder; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.Store; +import jakarta.mail.Folder; +import jakarta.mail.MessagingException; +import jakarta.mail.Session; +import jakarta.mail.Store; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -49,4 +49,4 @@ public void testAllServices() throws MessagingException, InterruptedException { } } } -} \ No newline at end of file +} diff --git a/greenmail-junit4/pom.xml b/greenmail-junit4/pom.xml index b2c1f49e55..442d68f881 100644 --- a/greenmail-junit4/pom.xml +++ b/greenmail-junit4/pom.xml @@ -8,12 +8,12 @@ greenmail-junit4 jar - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT com.icegreen greenmail-parent - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT ../pom.xml diff --git a/greenmail-junit4/src/test/java/com/icegreen/greenmail/junit4/GreenMailRuleTest.java b/greenmail-junit4/src/test/java/com/icegreen/greenmail/junit4/GreenMailRuleTest.java index 0c8d663107..95a2ed49ca 100644 --- a/greenmail-junit4/src/test/java/com/icegreen/greenmail/junit4/GreenMailRuleTest.java +++ b/greenmail-junit4/src/test/java/com/icegreen/greenmail/junit4/GreenMailRuleTest.java @@ -37,4 +37,4 @@ private void validateServicesRunning() { assertThat(greenMail.getPop3()).isNull(); assertThat(greenMail.getPop3s()).isNull(); } -} \ No newline at end of file +} diff --git a/greenmail-junit5/pom.xml b/greenmail-junit5/pom.xml index 37ed41379d..274e8ab11d 100644 --- a/greenmail-junit5/pom.xml +++ b/greenmail-junit5/pom.xml @@ -8,12 +8,12 @@ greenmail-junit5 jar - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT com.icegreen greenmail-parent - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT ../pom.xml diff --git a/greenmail-junit5/src/test/java/com/icegreen/greenmail/junit5/CustomSetupTests.java b/greenmail-junit5/src/test/java/com/icegreen/greenmail/junit5/CustomSetupTests.java index 7b47d72b96..a574c11f47 100644 --- a/greenmail-junit5/src/test/java/com/icegreen/greenmail/junit5/CustomSetupTests.java +++ b/greenmail-junit5/src/test/java/com/icegreen/greenmail/junit5/CustomSetupTests.java @@ -1,6 +1,6 @@ package com.icegreen.greenmail.junit5; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import com.icegreen.greenmail.util.GreenMailUtil; import com.icegreen.greenmail.util.ServerSetupTest; diff --git a/greenmail-junit5/src/test/java/com/icegreen/greenmail/junit5/DefaultSetupTests.java b/greenmail-junit5/src/test/java/com/icegreen/greenmail/junit5/DefaultSetupTests.java index 69a787e79b..f1e5187873 100644 --- a/greenmail-junit5/src/test/java/com/icegreen/greenmail/junit5/DefaultSetupTests.java +++ b/greenmail-junit5/src/test/java/com/icegreen/greenmail/junit5/DefaultSetupTests.java @@ -1,7 +1,7 @@ package com.icegreen.greenmail.junit5; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import com.icegreen.greenmail.util.GreenMailUtil; import org.junit.jupiter.api.DisplayName; diff --git a/greenmail-junit5/src/test/java/com/icegreen/greenmail/junit5/MultipleSetupsTests.java b/greenmail-junit5/src/test/java/com/icegreen/greenmail/junit5/MultipleSetupsTests.java index 94c1c89f9b..403a618c8a 100644 --- a/greenmail-junit5/src/test/java/com/icegreen/greenmail/junit5/MultipleSetupsTests.java +++ b/greenmail-junit5/src/test/java/com/icegreen/greenmail/junit5/MultipleSetupsTests.java @@ -1,6 +1,6 @@ package com.icegreen.greenmail.junit5; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import com.icegreen.greenmail.util.GreenMailUtil; import com.icegreen.greenmail.util.ServerSetupTest; diff --git a/greenmail-junit5/src/test/java/com/icegreen/greenmail/junit5/WithConfigurationTests.java b/greenmail-junit5/src/test/java/com/icegreen/greenmail/junit5/WithConfigurationTests.java index 3ab7b17b23..6022bb31a8 100644 --- a/greenmail-junit5/src/test/java/com/icegreen/greenmail/junit5/WithConfigurationTests.java +++ b/greenmail-junit5/src/test/java/com/icegreen/greenmail/junit5/WithConfigurationTests.java @@ -1,7 +1,7 @@ package com.icegreen.greenmail.junit5; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import com.icegreen.greenmail.configuration.GreenMailConfiguration; import com.icegreen.greenmail.util.GreenMailUtil; diff --git a/greenmail-spring/pom.xml b/greenmail-spring/pom.xml index 130777a8f3..6ee8168462 100644 --- a/greenmail-spring/pom.xml +++ b/greenmail-spring/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.icegreen greenmail-spring - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT jar == GreenMail Spring == GreenMail support for Spring @@ -10,7 +10,7 @@ com.icegreen greenmail-parent - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT ../pom.xml diff --git a/greenmail-spring/src/main/java/com/icegreen/greenmail/spring/GreenMailBean.java b/greenmail-spring/src/main/java/com/icegreen/greenmail/spring/GreenMailBean.java index d9768163de..b7b9e15638 100644 --- a/greenmail-spring/src/main/java/com/icegreen/greenmail/spring/GreenMailBean.java +++ b/greenmail-spring/src/main/java/com/icegreen/greenmail/spring/GreenMailBean.java @@ -2,7 +2,7 @@ import java.util.ArrayList; import java.util.List; -import javax.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMessage; import com.icegreen.greenmail.util.GreenMail; import com.icegreen.greenmail.util.GreenMailUtil; diff --git a/greenmail-spring/src/test/java/com/icegreen/greenmail/spring/GreenMailNamespaceHandlerTest.java b/greenmail-spring/src/test/java/com/icegreen/greenmail/spring/GreenMailNamespaceHandlerTest.java index c537e7fbcc..ae873c899b 100644 --- a/greenmail-spring/src/test/java/com/icegreen/greenmail/spring/GreenMailNamespaceHandlerTest.java +++ b/greenmail-spring/src/test/java/com/icegreen/greenmail/spring/GreenMailNamespaceHandlerTest.java @@ -26,4 +26,4 @@ public void testCreate() { assert greenMailBean.getPortOffset() == 5000; assert greenMailBean.getServerStartupTimeout() == DEFAULT_SERVER_STARTUP_TIMEOUT; } -} \ No newline at end of file +} diff --git a/greenmail-standalone/pom.xml b/greenmail-standalone/pom.xml index c574fbbc7b..517817b7c8 100644 --- a/greenmail-standalone/pom.xml +++ b/greenmail-standalone/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.icegreen greenmail-standalone - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT jar == Greenmail Standalone == Run GreenMail standalone @@ -10,7 +10,7 @@ com.icegreen greenmail-parent - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT ../pom.xml diff --git a/greenmail-standalone/src/test/java/com/icegreen/greenmail/standalone/GreenMailStandaloneRunnerTest.java b/greenmail-standalone/src/test/java/com/icegreen/greenmail/standalone/GreenMailStandaloneRunnerTest.java index 4dd87b8f9b..f7240c50f6 100644 --- a/greenmail-standalone/src/test/java/com/icegreen/greenmail/standalone/GreenMailStandaloneRunnerTest.java +++ b/greenmail-standalone/src/test/java/com/icegreen/greenmail/standalone/GreenMailStandaloneRunnerTest.java @@ -7,7 +7,7 @@ import org.junit.After; import org.junit.Test; -import javax.mail.*; +import jakarta.mail.*; import javax.ws.rs.ProcessingException; import javax.ws.rs.client.*; import javax.ws.rs.core.MediaType; diff --git a/greenmail-webapp/pom.xml b/greenmail-webapp/pom.xml index cb306c62b3..22c1b55f0c 100644 --- a/greenmail-webapp/pom.xml +++ b/greenmail-webapp/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.icegreen greenmail-webapp - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT war == Greenmail Webapp == Embedded GreenMail Webapp @@ -10,7 +10,7 @@ com.icegreen greenmail-parent - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 014f762023..a637a52b8d 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,11 @@ greenmail-parent pom - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT + + + 3.6 + @@ -375,44 +379,49 @@ com.icegreen greenmail - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT com.icegreen greenmail-standalone - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT com.icegreen greenmail-webapp - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT com.icegreen greenmail-spring - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT com.icegreen greenmail-junit4 - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT com.icegreen greenmail-junit5 - 1.6.4-SNAPSHOT + 2.0.0-SNAPSHOT com.sun.mail jakarta.mail - 1.6.6 + 2.0.0 + + + jakarta.activation + jakarta.activation-api + 2.0.0 - com.sun.activation - jakarta.activation - 1.2.1 + commons-io + commons-io + 2.7 org.slf4j