From f034c22d9ebc11250b9ef24dc675b713d8c2ab3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9da=20Housni=20Alaoui?= Date: Sat, 21 Jan 2023 22:31:03 +0100 Subject: [PATCH] Bump to commons-email2 --- conf/spotbugs-exclude-filter.xml | 6 +-- pom.xml | 31 +++++++------ .../{mail => mail2}/ByteArrayDataSource.java | 8 ++-- .../{mail => mail2}/DataSourceResolver.java | 4 +- .../{mail => mail2}/DefaultAuthenticator.java | 6 +-- .../apache/commons/{mail => mail2}/Email.java | 38 +++++++-------- .../{mail => mail2}/EmailAttachment.java | 6 +-- .../{mail => mail2}/EmailConstants.java | 2 +- .../{mail => mail2}/EmailException.java | 2 +- .../commons/{mail => mail2}/EmailUtils.java | 8 ++-- .../commons/{mail => mail2}/HtmlEmail.java | 32 ++++++------- .../{mail => mail2}/ImageHtmlEmail.java | 6 +-- .../{mail => mail2}/MultiPartEmail.java | 40 ++++++++-------- .../commons/{mail => mail2}/SimpleEmail.java | 4 +- .../commons/{mail => mail2}/package-info.java | 2 +- .../resolver/DataSourceBaseResolver.java | 4 +- .../resolver/DataSourceClassPathResolver.java | 8 ++-- .../resolver/DataSourceCompositeResolver.java | 6 +-- .../resolver/DataSourceFileResolver.java | 6 +-- .../resolver/DataSourceUrlResolver.java | 6 +-- .../resolver/package-info.java | 2 +- .../util/IDNEmailAddressConverter.java | 4 +- .../util/MimeMessageParser.java | 46 +++++++++---------- .../util/MimeMessageUtils.java | 8 ++-- .../{mail => mail2}/util/package-info.java | 2 +- src/site/xdoc/release_1_1.xml | 4 +- src/site/xdoc/userguide.xml | 16 +++---- .../{mail => mail2}/AbstractEmailTest.java | 19 ++++---- .../DefaultAuthenticatorTest.java | 4 +- .../{mail => mail2}/EmailAttachmentTest.java | 2 +- .../{mail => mail2}/EmailLiveTest.java | 18 ++++---- .../commons/{mail => mail2}/EmailTest.java | 16 +++---- .../{mail => mail2}/EmailUtilsTest.java | 2 +- .../{mail => mail2}/HtmlEmailTest.java | 14 +++--- .../{mail => mail2}/ImageHtmlEmailTest.java | 22 ++++----- .../{mail => mail2}/InvalidAddressTest.java | 4 +- .../InvalidInternetAddressTest.java | 4 +- .../{mail => mail2}/MultiPartEmailTest.java | 10 ++-- .../SendWithAttachmentsTest.java | 8 ++-- .../{mail => mail2}/SimpleEmailTest.java | 4 +- .../mocks/MockEmailConcrete.java | 14 +++--- .../mocks/MockHtmlEmailConcrete.java | 8 ++-- .../mocks/MockImageHtmlEmailConcrete.java | 6 +-- .../mocks/MockMultiPartEmailConcrete.java | 8 ++-- .../mocks/MockSimpleEmail.java | 6 +-- .../{mail => mail2}/mocks/package.html | 0 .../commons/{mail => mail2}/package.html | 0 .../AbstractDataSourceResolverTest.java | 4 +- .../DataSourceClassPathResolverTest.java | 5 +- .../DataSourceCompositeResolverTest.java | 5 +- .../resolver/DataSourceFileResolverTest.java | 5 +- .../resolver/DataSourceUrlResolverTest.java | 4 +- .../settings/EmailConfiguration.java | 4 +- .../{mail => mail2}/settings/package.html | 0 .../util/IDNEmailAddressConverterTest.java | 4 +- .../util/MimeMessageParserTest.java | 10 ++-- 56 files changed, 259 insertions(+), 258 deletions(-) rename src/main/java/org/apache/commons/{mail => mail2}/ByteArrayDataSource.java (95%) rename src/main/java/org/apache/commons/{mail => mail2}/DataSourceResolver.java (96%) rename src/main/java/org/apache/commons/{mail => mail2}/DefaultAuthenticator.java (94%) rename src/main/java/org/apache/commons/{mail => mail2}/Email.java (98%) rename src/main/java/org/apache/commons/{mail => mail2}/EmailAttachment.java (95%) rename src/main/java/org/apache/commons/{mail => mail2}/EmailConstants.java (99%) rename src/main/java/org/apache/commons/{mail => mail2}/EmailException.java (99%) rename src/main/java/org/apache/commons/{mail => mail2}/EmailUtils.java (98%) rename src/main/java/org/apache/commons/{mail => mail2}/HtmlEmail.java (96%) rename src/main/java/org/apache/commons/{mail => mail2}/ImageHtmlEmail.java (98%) rename src/main/java/org/apache/commons/{mail => mail2}/MultiPartEmail.java (93%) rename src/main/java/org/apache/commons/{mail => mail2}/SimpleEmail.java (93%) rename src/main/java/org/apache/commons/{mail => mail2}/package-info.java (96%) rename src/main/java/org/apache/commons/{mail => mail2}/resolver/DataSourceBaseResolver.java (96%) rename src/main/java/org/apache/commons/{mail => mail2}/resolver/DataSourceClassPathResolver.java (96%) rename src/main/java/org/apache/commons/{mail => mail2}/resolver/DataSourceCompositeResolver.java (96%) rename src/main/java/org/apache/commons/{mail => mail2}/resolver/DataSourceFileResolver.java (96%) rename src/main/java/org/apache/commons/{mail => mail2}/resolver/DataSourceUrlResolver.java (96%) rename src/main/java/org/apache/commons/{mail => mail2}/resolver/package-info.java (95%) rename src/main/java/org/apache/commons/{mail => mail2}/util/IDNEmailAddressConverter.java (97%) rename src/main/java/org/apache/commons/{mail => mail2}/util/MimeMessageParser.java (91%) rename src/main/java/org/apache/commons/{mail => mail2}/util/MimeMessageUtils.java (96%) rename src/main/java/org/apache/commons/{mail => mail2}/util/package-info.java (95%) rename src/test/java/org/apache/commons/{mail => mail2}/AbstractEmailTest.java (97%) rename src/test/java/org/apache/commons/{mail => mail2}/DefaultAuthenticatorTest.java (95%) rename src/test/java/org/apache/commons/{mail => mail2}/EmailAttachmentTest.java (98%) rename src/test/java/org/apache/commons/{mail => mail2}/EmailLiveTest.java (96%) rename src/test/java/org/apache/commons/{mail => mail2}/EmailTest.java (99%) rename src/test/java/org/apache/commons/{mail => mail2}/EmailUtilsTest.java (98%) rename src/test/java/org/apache/commons/{mail => mail2}/HtmlEmailTest.java (98%) rename src/test/java/org/apache/commons/{mail => mail2}/ImageHtmlEmailTest.java (96%) rename src/test/java/org/apache/commons/{mail => mail2}/InvalidAddressTest.java (98%) rename src/test/java/org/apache/commons/{mail => mail2}/InvalidInternetAddressTest.java (99%) rename src/test/java/org/apache/commons/{mail => mail2}/MultiPartEmailTest.java (98%) rename src/test/java/org/apache/commons/{mail => mail2}/SendWithAttachmentsTest.java (96%) rename src/test/java/org/apache/commons/{mail => mail2}/SimpleEmailTest.java (98%) rename src/test/java/org/apache/commons/{mail => mail2}/mocks/MockEmailConcrete.java (92%) rename src/test/java/org/apache/commons/{mail => mail2}/mocks/MockHtmlEmailConcrete.java (91%) rename src/test/java/org/apache/commons/{mail => mail2}/mocks/MockImageHtmlEmailConcrete.java (91%) rename src/test/java/org/apache/commons/{mail => mail2}/mocks/MockMultiPartEmailConcrete.java (89%) rename src/test/java/org/apache/commons/{mail => mail2}/mocks/MockSimpleEmail.java (90%) rename src/test/java/org/apache/commons/{mail => mail2}/mocks/package.html (100%) rename src/test/java/org/apache/commons/{mail => mail2}/package.html (100%) rename src/test/java/org/apache/commons/{mail => mail2}/resolver/AbstractDataSourceResolverTest.java (94%) rename src/test/java/org/apache/commons/{mail => mail2}/resolver/DataSourceClassPathResolverTest.java (94%) rename src/test/java/org/apache/commons/{mail => mail2}/resolver/DataSourceCompositeResolverTest.java (95%) rename src/test/java/org/apache/commons/{mail => mail2}/resolver/DataSourceFileResolverTest.java (93%) rename src/test/java/org/apache/commons/{mail => mail2}/resolver/DataSourceUrlResolverTest.java (97%) rename src/test/java/org/apache/commons/{mail => mail2}/settings/EmailConfiguration.java (96%) rename src/test/java/org/apache/commons/{mail => mail2}/settings/package.html (100%) rename src/test/java/org/apache/commons/{mail => mail2}/util/IDNEmailAddressConverterTest.java (97%) rename src/test/java/org/apache/commons/{mail => mail2}/util/MimeMessageParserTest.java (99%) diff --git a/conf/spotbugs-exclude-filter.xml b/conf/spotbugs-exclude-filter.xml index eba9cdcf3..b52105bfa 100644 --- a/conf/spotbugs-exclude-filter.xml +++ b/conf/spotbugs-exclude-filter.xml @@ -29,14 +29,14 @@ - - + + - + diff --git a/pom.xml b/pom.xml index 9fb05e862..acd7a6011 100644 --- a/pom.xml +++ b/pom.xml @@ -22,14 +22,14 @@ 56 4.0.0 - commons-email - 1.6.0-SNAPSHOT + commons-email2 + 2.0.0-SNAPSHOT Apache Commons Email 2001 Apache Commons Email aims to provide an API for sending email. It is built on top of - the JavaMail API, which it aims to simplify. + the JakartaMail API, which it aims to simplify. https://commons.apache.org/proper/commons-email/ @@ -239,13 +239,17 @@ Vegard Stuen vegard.stuen@gmail.com + + Réda Housni Alaoui + reda-alaoui@hey.com + - com.sun.mail - jakarta.mail - 1.6.7 + org.eclipse.angus + angus-mail + 2.0.1 org.junit.jupiter @@ -271,9 +275,9 @@ test - org.subethamail + com.github.davidmoten subethasmtp - 3.1.7 + 6.0.5 test @@ -308,13 +312,13 @@ 1.8 1.8 email - org.apache.commons.mail + org.apache.commons.mail2 EMAIL 12310474 1.6.0 (Java 8) RC1 - 1.5 + 2.0.0-SNAPSHOT UTF-8 @@ -324,7 +328,7 @@ - clean verify apache-rat:check japicmp:cmp pmd:check pmd:cpd-check spotbugs:check javadoc:javadoc + clean verify apache-rat:check pmd:check pmd:cpd-check spotbugs:check javadoc:javadoc org.apache.maven.plugins @@ -332,8 +336,8 @@ - org/apache/commons/mail/mocks/* - org/apache/commons/mail/settings/* + org/apache/commons/mail2/mocks/* + org/apache/commons/mail2/settings/* **/Abstract*Test.java @@ -536,6 +540,7 @@ --add-opens java.base/java.util.regex=ALL-UNNAMED --add-opens java.base/java.nio.charset=ALL-UNNAMED --add-opens java.base/sun.nio.cs=ALL-UNNAMED + --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.logging/java.util.logging=ALL-UNNAMED diff --git a/src/main/java/org/apache/commons/mail/ByteArrayDataSource.java b/src/main/java/org/apache/commons/mail2/ByteArrayDataSource.java similarity index 95% rename from src/main/java/org/apache/commons/mail/ByteArrayDataSource.java rename to src/main/java/org/apache/commons/mail2/ByteArrayDataSource.java index e489abbcc..47ce997cb 100644 --- a/src/main/java/org/apache/commons/mail/ByteArrayDataSource.java +++ b/src/main/java/org/apache/commons/mail2/ByteArrayDataSource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -25,7 +25,7 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; -import javax.activation.DataSource; +import jakarta.activation.DataSource; /** * This class implements a typed DataSource from:
@@ -39,7 +39,7 @@ * and it is recommended to do so. * * @since 1.0 - * @deprecated since 1.4, use {@link javax.mail.util.ByteArrayDataSource} instead + * @deprecated since 1.4, use {@link jakarta.mail.util.ByteArrayDataSource} instead */ @Deprecated public class ByteArrayDataSource implements DataSource @@ -55,7 +55,7 @@ public class ByteArrayDataSource implements DataSource /** * The name associated with this data source. - * By default, the name is an empty string, similar to javax.mail.util.ByteArrayDataSource. + * By default, the name is an empty string, similar to jakarta.mail.util.ByteArrayDataSource. * @since 1.3.1 */ private String name = ""; diff --git a/src/main/java/org/apache/commons/mail/DataSourceResolver.java b/src/main/java/org/apache/commons/mail2/DataSourceResolver.java similarity index 96% rename from src/main/java/org/apache/commons/mail/DataSourceResolver.java rename to src/main/java/org/apache/commons/mail2/DataSourceResolver.java index ebcb85c70..3f91542e9 100644 --- a/src/main/java/org/apache/commons/mail/DataSourceResolver.java +++ b/src/main/java/org/apache/commons/mail2/DataSourceResolver.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; -import javax.activation.DataSource; +import jakarta.activation.DataSource; import java.io.IOException; /** diff --git a/src/main/java/org/apache/commons/mail/DefaultAuthenticator.java b/src/main/java/org/apache/commons/mail2/DefaultAuthenticator.java similarity index 94% rename from src/main/java/org/apache/commons/mail/DefaultAuthenticator.java rename to src/main/java/org/apache/commons/mail2/DefaultAuthenticator.java index 9802c1be2..d6c9a7ffd 100644 --- a/src/main/java/org/apache/commons/mail/DefaultAuthenticator.java +++ b/src/main/java/org/apache/commons/mail2/DefaultAuthenticator.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; -import javax.mail.Authenticator; -import javax.mail.PasswordAuthentication; +import jakarta.mail.Authenticator; +import jakarta.mail.PasswordAuthentication; /** * This is a very simple authentication object that can be used for any diff --git a/src/main/java/org/apache/commons/mail/Email.java b/src/main/java/org/apache/commons/mail2/Email.java similarity index 98% rename from src/main/java/org/apache/commons/mail/Email.java rename to src/main/java/org/apache/commons/mail2/Email.java index bc3bec59a..771267a47 100644 --- a/src/main/java/org/apache/commons/mail/Email.java +++ b/src/main/java/org/apache/commons/mail2/Email.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; @@ -26,22 +26,22 @@ import java.util.Map; import java.util.Properties; -import javax.mail.Authenticator; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.Store; -import javax.mail.Transport; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; -import javax.mail.internet.MimeUtility; +import jakarta.mail.Authenticator; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.Session; +import jakarta.mail.Store; +import jakarta.mail.Transport; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; +import jakarta.mail.internet.MimeUtility; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.apache.commons.mail.util.IDNEmailAddressConverter; +import org.apache.commons.mail2.util.IDNEmailAddressConverter; /** * The base class for all email messages. This class sets the @@ -597,7 +597,7 @@ public void setMailSession(final Session aSession) /** * Supply a mail Session object from a JNDI directory. * - * @param jndiName name of JNDI resource (javax.mail.Session type), resource + * @param jndiName name of JNDI resource (jakarta.mail.Session type), resource * if searched in java:comp/env if name does not start with "java:" * @throws IllegalArgumentException if the JNDI name is null or empty * @throws NamingException if the resource cannot be retrieved from JNDI directory @@ -857,7 +857,7 @@ public Email addTo(final String email, final String name, final String charset) * @param aCollection collection of {@code InternetAddress} objects. * @return An Email. * @throws EmailException Indicates an invalid email address. - * @see javax.mail.internet.InternetAddress + * @see jakarta.mail.internet.InternetAddress * @since 1.0 */ public Email setTo(final Collection aCollection) throws EmailException @@ -966,7 +966,7 @@ public Email addCc(final String email, final String name, final String charset) * @param aCollection collection of {@code InternetAddress} objects. * @return An Email. * @throws EmailException Indicates an invalid email address. - * @see javax.mail.internet.InternetAddress + * @see jakarta.mail.internet.InternetAddress * @since 1.0 */ public Email setCc(final Collection aCollection) throws EmailException @@ -1075,7 +1075,7 @@ public Email addBcc(final String email, final String name, final String charset) * @param aCollection collection of {@code InternetAddress} objects * @return An Email. * @throws EmailException Indicates an invalid email address - * @see javax.mail.internet.InternetAddress + * @see jakarta.mail.internet.InternetAddress * @since 1.0 */ public Email setBcc(final Collection aCollection) throws EmailException @@ -1154,7 +1154,7 @@ public Email addReplyTo(final String email, final String name, final String char * @param aCollection collection of {@code InternetAddress} objects * @return An Email. * @throws EmailException Indicates an invalid email address - * @see javax.mail.internet.InternetAddress + * @see jakarta.mail.internet.InternetAddress * @since 1.1 */ public Email setReplyTo(final Collection aCollection) throws EmailException @@ -1785,7 +1785,7 @@ public boolean isSendPartial() * Sets whether the email is partially send in case of invalid addresses. *

* In case the mail server rejects an address as invalid, the call to {@link #send()} - * may throw a {@link javax.mail.SendFailedException}, even if partial send mode is enabled (emails + * may throw a {@link jakarta.mail.SendFailedException}, even if partial send mode is enabled (emails * to valid addresses will be transmitted). In case the email server does not reject * invalid addresses immediately, but return a bounce message, no exception will be thrown * by the {@link #send()} method. diff --git a/src/main/java/org/apache/commons/mail/EmailAttachment.java b/src/main/java/org/apache/commons/mail2/EmailAttachment.java similarity index 95% rename from src/main/java/org/apache/commons/mail/EmailAttachment.java rename to src/main/java/org/apache/commons/mail2/EmailAttachment.java index cbe5733de..94cf20873 100644 --- a/src/main/java/org/apache/commons/mail/EmailAttachment.java +++ b/src/main/java/org/apache/commons/mail2/EmailAttachment.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import java.net.URL; @@ -26,10 +26,10 @@ public class EmailAttachment { /** Definition of the part being an attachment. */ - public static final String ATTACHMENT = javax.mail.Part.ATTACHMENT; + public static final String ATTACHMENT = jakarta.mail.Part.ATTACHMENT; /** Definition of the part being inline. */ - public static final String INLINE = javax.mail.Part.INLINE; + public static final String INLINE = jakarta.mail.Part.INLINE; /** The name of this attachment. */ private String name = ""; diff --git a/src/main/java/org/apache/commons/mail/EmailConstants.java b/src/main/java/org/apache/commons/mail2/EmailConstants.java similarity index 99% rename from src/main/java/org/apache/commons/mail/EmailConstants.java rename to src/main/java/org/apache/commons/mail2/EmailConstants.java index ad776a017..507ba21bc 100644 --- a/src/main/java/org/apache/commons/mail/EmailConstants.java +++ b/src/main/java/org/apache/commons/mail2/EmailConstants.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; /** * Constants used by Email classes. diff --git a/src/main/java/org/apache/commons/mail/EmailException.java b/src/main/java/org/apache/commons/mail2/EmailException.java similarity index 99% rename from src/main/java/org/apache/commons/mail/EmailException.java rename to src/main/java/org/apache/commons/mail2/EmailException.java index c70239046..5bbf72576 100644 --- a/src/main/java/org/apache/commons/mail/EmailException.java +++ b/src/main/java/org/apache/commons/mail2/EmailException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import java.io.OutputStreamWriter; import java.io.PrintStream; diff --git a/src/main/java/org/apache/commons/mail/EmailUtils.java b/src/main/java/org/apache/commons/mail2/EmailUtils.java similarity index 98% rename from src/main/java/org/apache/commons/mail/EmailUtils.java rename to src/main/java/org/apache/commons/mail2/EmailUtils.java index a9fb1fe98..c45e061d2 100644 --- a/src/main/java/org/apache/commons/mail/EmailUtils.java +++ b/src/main/java/org/apache/commons/mail2/EmailUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import java.io.File; import java.io.IOException; @@ -23,10 +23,10 @@ import java.util.BitSet; import java.util.Random; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; -import org.apache.commons.mail.util.MimeMessageUtils; +import org.apache.commons.mail2.util.MimeMessageUtils; /** * Utility methods used by commons-email. diff --git a/src/main/java/org/apache/commons/mail/HtmlEmail.java b/src/main/java/org/apache/commons/mail2/HtmlEmail.java similarity index 96% rename from src/main/java/org/apache/commons/mail/HtmlEmail.java rename to src/main/java/org/apache/commons/mail2/HtmlEmail.java index 98fdffdce..9394cf8a9 100644 --- a/src/main/java/org/apache/commons/mail/HtmlEmail.java +++ b/src/main/java/org/apache/commons/mail2/HtmlEmail.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import java.io.File; import java.io.IOException; @@ -27,14 +27,14 @@ import java.util.Locale; import java.util.Map; -import javax.activation.DataHandler; -import javax.activation.DataSource; -import javax.activation.FileDataSource; -import javax.activation.URLDataSource; -import javax.mail.BodyPart; -import javax.mail.MessagingException; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMultipart; +import jakarta.activation.DataHandler; +import jakarta.activation.DataSource; +import jakarta.activation.FileDataSource; +import jakarta.activation.URLDataSource; +import jakarta.mail.BodyPart; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeBodyPart; +import jakarta.mail.internet.MimeMultipart; /** * An HTML multipart email. @@ -119,7 +119,7 @@ public class HtmlEmail extends MultiPartEmail * * @param aText A String. * @return An HtmlEmail. - * @throws EmailException see javax.mail.internet.MimeBodyPart + * @throws EmailException see jakarta.mail.internet.MimeBodyPart * for definitions * @since 1.0 */ @@ -139,7 +139,7 @@ public HtmlEmail setTextMsg(final String aText) throws EmailException * * @param aHtml A String. * @return An HtmlEmail. - * @throws EmailException see javax.mail.internet.MimeBodyPart + * @throws EmailException see jakarta.mail.internet.MimeBodyPart * for definitions * @since 1.0 */ @@ -166,7 +166,7 @@ public HtmlEmail setHtmlMsg(final String aHtml) throws EmailException * @param msg the message text to use * @return this {@code HtmlEmail} * @throws EmailException if msg is null or empty; - * see javax.mail.internet.MimeBodyPart for definitions + * see jakarta.mail.internet.MimeBodyPart for definitions * @since 1.0 */ @Override @@ -202,7 +202,7 @@ public Email setMsg(final String msg) throws EmailException * @param name The name that will be set in the file name header field. * @return A String with the Content-ID of the URL. * @throws EmailException when URL supplied is invalid or if {@code name} is null - * or empty; also see {@link javax.mail.internet.MimeBodyPart} for definitions + * or empty; also see {@link jakarta.mail.internet.MimeBodyPart} for definitions * * @see #embed(URL, String) * @since 1.1 @@ -248,7 +248,7 @@ public String embed(final String urlString, final String name) throws EmailExcep * field. * @return A String with the Content-ID of the file. * @throws EmailException when URL supplied is invalid or if {@code name} is null - * or empty; also see {@link javax.mail.internet.MimeBodyPart} for definitions + * or empty; also see {@link jakarta.mail.internet.MimeBodyPart} for definitions * @since 1.0 */ public String embed(final URL url, final String name) throws EmailException @@ -311,7 +311,7 @@ public String embed(final URL url, final String name) throws EmailException * @param file The {@code File} object to embed * @return A String with the Content-ID of the file. * @throws EmailException when the supplied {@code File} cannot be - * used; also see {@link javax.mail.internet.MimeBodyPart} for definitions + * used; also see {@link jakarta.mail.internet.MimeBodyPart} for definitions * * @see #embed(File, String) * @since 1.1 @@ -344,7 +344,7 @@ public String embed(final File file) throws EmailException * @return A String with the Content-ID of the file. * @throws EmailException when the supplied {@code File} cannot be used * or if the file has already been embedded; - * also see {@link javax.mail.internet.MimeBodyPart} for definitions + * also see {@link jakarta.mail.internet.MimeBodyPart} for definitions * @since 1.1 */ public String embed(final File file, final String cid) throws EmailException diff --git a/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java b/src/main/java/org/apache/commons/mail2/ImageHtmlEmail.java similarity index 98% rename from src/main/java/org/apache/commons/mail/ImageHtmlEmail.java rename to src/main/java/org/apache/commons/mail2/ImageHtmlEmail.java index df36462a7..60bd94d6f 100644 --- a/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java +++ b/src/main/java/org/apache/commons/mail2/ImageHtmlEmail.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; -import javax.activation.DataSource; +import jakarta.activation.DataSource; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -92,7 +92,7 @@ public void setDataSourceResolver(final DataSourceResolver dataSourceResolver) /** * Does the work of actually building the MimeMessage. * - * @see org.apache.commons.mail.HtmlEmail#buildMimeMessage() + * @see org.apache.commons.mail2.HtmlEmail#buildMimeMessage() * @throws EmailException building the MimeMessage failed */ @Override diff --git a/src/main/java/org/apache/commons/mail/MultiPartEmail.java b/src/main/java/org/apache/commons/mail2/MultiPartEmail.java similarity index 93% rename from src/main/java/org/apache/commons/mail/MultiPartEmail.java rename to src/main/java/org/apache/commons/mail2/MultiPartEmail.java index 9a22e99f0..ea90dafb0 100644 --- a/src/main/java/org/apache/commons/mail/MultiPartEmail.java +++ b/src/main/java/org/apache/commons/mail2/MultiPartEmail.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import java.io.File; import java.io.IOException; @@ -22,16 +22,16 @@ import java.io.UnsupportedEncodingException; import java.net.URL; -import javax.activation.DataHandler; -import javax.activation.DataSource; -import javax.activation.FileDataSource; -import javax.activation.URLDataSource; -import javax.mail.BodyPart; -import javax.mail.MessagingException; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMultipart; -import javax.mail.internet.MimePart; -import javax.mail.internet.MimeUtility; +import jakarta.activation.DataHandler; +import jakarta.activation.DataSource; +import jakarta.activation.FileDataSource; +import jakarta.activation.URLDataSource; +import jakarta.mail.BodyPart; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeBodyPart; +import jakarta.mail.internet.MimeMultipart; +import jakarta.mail.internet.MimePart; +import jakarta.mail.internet.MimeUtility; /** * A multipart email. @@ -90,7 +90,7 @@ public String getSubType() * @param partContent The content. * @param partContentType The content type. * @return An Email. - * @throws EmailException see javax.mail.internet.MimeBodyPart + * @throws EmailException see jakarta.mail.internet.MimeBodyPart * for definitions * @since 1.0 */ @@ -116,7 +116,7 @@ public Email addPart(final String partContent, final String partContentType) * * @param multipart The MimeMultipart. * @return An Email. - * @throws EmailException see javax.mail.internet.MimeBodyPart + * @throws EmailException see jakarta.mail.internet.MimeBodyPart * for definitions * @since 1.0 */ @@ -179,7 +179,7 @@ protected void init() * * @param msg A String. * @return An Email. - * @throws EmailException see javax.mail.internet.MimeBodyPart + * @throws EmailException see jakarta.mail.internet.MimeBodyPart * for definitions * @since 1.0 */ @@ -263,7 +263,7 @@ public void buildMimeMessage() throws EmailException * * @param file A file attachment * @return A MultiPartEmail. - * @throws EmailException see javax.mail.internet.MimeBodyPart + * @throws EmailException see jakarta.mail.internet.MimeBodyPart * for definitions * @since 1.3 */ @@ -294,7 +294,7 @@ public MultiPartEmail attach(final File file) * * @param attachment An EmailAttachment. * @return A MultiPartEmail. - * @throws EmailException see javax.mail.internet.MimeBodyPart + * @throws EmailException see jakarta.mail.internet.MimeBodyPart * for definitions * @since 1.0 */ @@ -354,7 +354,7 @@ public MultiPartEmail attach(final EmailAttachment attachment) * @param name The name field for the attachment. * @param description A description for the attachment. * @return A MultiPartEmail. - * @throws EmailException see javax.mail.internet.MimeBodyPart + * @throws EmailException see jakarta.mail.internet.MimeBodyPart * for definitions * @since 1.0 */ @@ -372,7 +372,7 @@ public MultiPartEmail attach(final URL url, final String name, final String desc * @param description A description for the attachment. * @param disposition Either mixed or inline. * @return A MultiPartEmail. - * @throws EmailException see javax.mail.internet.MimeBodyPart + * @throws EmailException see jakarta.mail.internet.MimeBodyPart * for definitions * @since 1.0 */ @@ -403,7 +403,7 @@ public MultiPartEmail attach( * @param name The name field for the attachment. * @param description A description for the attachment. * @return A MultiPartEmail. - * @throws EmailException see javax.mail.internet.MimeBodyPart + * @throws EmailException see jakarta.mail.internet.MimeBodyPart * for definitions * @since 1.0 */ @@ -440,7 +440,7 @@ public MultiPartEmail attach( * @param description A description for the attachment. * @param disposition Either mixed or inline. * @return A MultiPartEmail. - * @throws EmailException see javax.mail.internet.MimeBodyPart + * @throws EmailException see jakarta.mail.internet.MimeBodyPart * for definitions * @since 1.0 */ diff --git a/src/main/java/org/apache/commons/mail/SimpleEmail.java b/src/main/java/org/apache/commons/mail2/SimpleEmail.java similarity index 93% rename from src/main/java/org/apache/commons/mail/SimpleEmail.java rename to src/main/java/org/apache/commons/mail2/SimpleEmail.java index ed4bd3f1a..62b857cd2 100644 --- a/src/main/java/org/apache/commons/mail/SimpleEmail.java +++ b/src/main/java/org/apache/commons/mail2/SimpleEmail.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; /** * This class is used to send simple internet email messages without @@ -29,7 +29,7 @@ public class SimpleEmail extends Email * * @param msg A String. * @return An Email. - * @throws EmailException see javax.mail.internet.MimeBodyPart + * @throws EmailException see jakarta.mail.internet.MimeBodyPart * for definitions * @since 1.0 */ diff --git a/src/main/java/org/apache/commons/mail/package-info.java b/src/main/java/org/apache/commons/mail2/package-info.java similarity index 96% rename from src/main/java/org/apache/commons/mail/package-info.java rename to src/main/java/org/apache/commons/mail2/package-info.java index dba8f4087..0954b4960 100644 --- a/src/main/java/org/apache/commons/mail/package-info.java +++ b/src/main/java/org/apache/commons/mail2/package-info.java @@ -19,4 +19,4 @@ * It is built on top of the Java Mail API, which it aims to simplify. * All help is gratefully received. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; diff --git a/src/main/java/org/apache/commons/mail/resolver/DataSourceBaseResolver.java b/src/main/java/org/apache/commons/mail2/resolver/DataSourceBaseResolver.java similarity index 96% rename from src/main/java/org/apache/commons/mail/resolver/DataSourceBaseResolver.java rename to src/main/java/org/apache/commons/mail2/resolver/DataSourceBaseResolver.java index 7d8e2b115..6bc527396 100644 --- a/src/main/java/org/apache/commons/mail/resolver/DataSourceBaseResolver.java +++ b/src/main/java/org/apache/commons/mail2/resolver/DataSourceBaseResolver.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.resolver; +package org.apache.commons.mail2.resolver; -import org.apache.commons.mail.DataSourceResolver; +import org.apache.commons.mail2.DataSourceResolver; /** * Base class for various resolvers. diff --git a/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java b/src/main/java/org/apache/commons/mail2/resolver/DataSourceClassPathResolver.java similarity index 96% rename from src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java rename to src/main/java/org/apache/commons/mail2/resolver/DataSourceClassPathResolver.java index c52c90f45..73268117b 100644 --- a/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java +++ b/src/main/java/org/apache/commons/mail2/resolver/DataSourceClassPathResolver.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.resolver; +package org.apache.commons.mail2.resolver; -import javax.activation.DataSource; -import javax.activation.FileTypeMap; -import javax.mail.util.ByteArrayDataSource; +import jakarta.activation.DataSource; +import jakarta.activation.FileTypeMap; +import jakarta.mail.util.ByteArrayDataSource; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/apache/commons/mail/resolver/DataSourceCompositeResolver.java b/src/main/java/org/apache/commons/mail2/resolver/DataSourceCompositeResolver.java similarity index 96% rename from src/main/java/org/apache/commons/mail/resolver/DataSourceCompositeResolver.java rename to src/main/java/org/apache/commons/mail2/resolver/DataSourceCompositeResolver.java index ae6882a2a..3ba684936 100644 --- a/src/main/java/org/apache/commons/mail/resolver/DataSourceCompositeResolver.java +++ b/src/main/java/org/apache/commons/mail2/resolver/DataSourceCompositeResolver.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.resolver; +package org.apache.commons.mail2.resolver; -import org.apache.commons.mail.DataSourceResolver; +import org.apache.commons.mail2.DataSourceResolver; -import javax.activation.DataSource; +import jakarta.activation.DataSource; import java.io.IOException; /** diff --git a/src/main/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java b/src/main/java/org/apache/commons/mail2/resolver/DataSourceFileResolver.java similarity index 96% rename from src/main/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java rename to src/main/java/org/apache/commons/mail2/resolver/DataSourceFileResolver.java index 0aeafc86a..bfc06f4f9 100644 --- a/src/main/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java +++ b/src/main/java/org/apache/commons/mail2/resolver/DataSourceFileResolver.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.resolver; +package org.apache.commons.mail2.resolver; -import javax.activation.DataSource; -import javax.activation.FileDataSource; +import jakarta.activation.DataSource; +import jakarta.activation.FileDataSource; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java b/src/main/java/org/apache/commons/mail2/resolver/DataSourceUrlResolver.java similarity index 96% rename from src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java rename to src/main/java/org/apache/commons/mail2/resolver/DataSourceUrlResolver.java index c832fc8b1..ecded8781 100644 --- a/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java +++ b/src/main/java/org/apache/commons/mail2/resolver/DataSourceUrlResolver.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.resolver; +package org.apache.commons.mail2.resolver; -import javax.activation.DataSource; -import javax.activation.URLDataSource; +import jakarta.activation.DataSource; +import jakarta.activation.URLDataSource; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; diff --git a/src/main/java/org/apache/commons/mail/resolver/package-info.java b/src/main/java/org/apache/commons/mail2/resolver/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/mail/resolver/package-info.java rename to src/main/java/org/apache/commons/mail2/resolver/package-info.java index 683edc600..e4eccab27 100644 --- a/src/main/java/org/apache/commons/mail/resolver/package-info.java +++ b/src/main/java/org/apache/commons/mail2/resolver/package-info.java @@ -22,4 +22,4 @@ *

  • URL
    • * */ -package org.apache.commons.mail.resolver; +package org.apache.commons.mail2.resolver; diff --git a/src/main/java/org/apache/commons/mail/util/IDNEmailAddressConverter.java b/src/main/java/org/apache/commons/mail2/util/IDNEmailAddressConverter.java similarity index 97% rename from src/main/java/org/apache/commons/mail/util/IDNEmailAddressConverter.java rename to src/main/java/org/apache/commons/mail2/util/IDNEmailAddressConverter.java index 407859879..17f609ab7 100644 --- a/src/main/java/org/apache/commons/mail/util/IDNEmailAddressConverter.java +++ b/src/main/java/org/apache/commons/mail2/util/IDNEmailAddressConverter.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.util; +package org.apache.commons.mail2.util; -import javax.mail.internet.InternetAddress; +import jakarta.mail.internet.InternetAddress; import java.net.IDN; /** diff --git a/src/main/java/org/apache/commons/mail/util/MimeMessageParser.java b/src/main/java/org/apache/commons/mail2/util/MimeMessageParser.java similarity index 91% rename from src/main/java/org/apache/commons/mail/util/MimeMessageParser.java rename to src/main/java/org/apache/commons/mail2/util/MimeMessageParser.java index e29269eeb..8214a9f4a 100644 --- a/src/main/java/org/apache/commons/mail/util/MimeMessageParser.java +++ b/src/main/java/org/apache/commons/mail2/util/MimeMessageParser.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.util; +package org.apache.commons.mail2.util; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -30,20 +30,20 @@ import java.util.List; import java.util.Map; -import javax.activation.DataHandler; -import javax.activation.DataSource; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.Multipart; -import javax.mail.Part; -import javax.mail.internet.ContentType; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimePart; -import javax.mail.internet.MimeUtility; -import javax.mail.internet.ParseException; -import javax.mail.util.ByteArrayDataSource; +import jakarta.activation.DataHandler; +import jakarta.activation.DataSource; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.Multipart; +import jakarta.mail.Part; +import jakarta.mail.internet.ContentType; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeBodyPart; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimePart; +import jakarta.mail.internet.MimeUtility; +import jakarta.mail.internet.ParseException; +import jakarta.mail.util.ByteArrayDataSource; /** * Parses a MimeMessage and stores the individual parts such a plain text, @@ -100,9 +100,9 @@ public MimeMessageParser parse() throws Exception * @return the 'to' recipients of the message * @throws Exception determining the recipients failed */ - public List getTo() throws Exception + public List getTo() throws Exception { - final javax.mail.Address[] recipients = this.mimeMessage.getRecipients(Message.RecipientType.TO); + final jakarta.mail.Address[] recipients = this.mimeMessage.getRecipients(Message.RecipientType.TO); return recipients != null ? Arrays.asList(recipients) : new ArrayList<>(); } @@ -110,9 +110,9 @@ public List getTo() throws Exception * @return the 'cc' recipients of the message * @throws Exception determining the recipients failed */ - public List getCc() throws Exception + public List getCc() throws Exception { - final javax.mail.Address[] recipients = this.mimeMessage.getRecipients(Message.RecipientType.CC); + final jakarta.mail.Address[] recipients = this.mimeMessage.getRecipients(Message.RecipientType.CC); return recipients != null ? Arrays.asList(recipients) : new ArrayList<>(); } @@ -120,9 +120,9 @@ public List getCc() throws Exception * @return the 'bcc' recipients of the message * @throws Exception determining the recipients failed */ - public List getBcc() throws Exception + public List getBcc() throws Exception { - final javax.mail.Address[] recipients = this.mimeMessage.getRecipients(Message.RecipientType.BCC); + final jakarta.mail.Address[] recipients = this.mimeMessage.getRecipients(Message.RecipientType.BCC); return recipients != null ? Arrays.asList(recipients) : new ArrayList<>(); } @@ -132,7 +132,7 @@ public List getBcc() throws Exception */ public String getFrom() throws Exception { - final javax.mail.Address[] addresses = this.mimeMessage.getFrom(); + final jakarta.mail.Address[] addresses = this.mimeMessage.getFrom(); if (addresses == null || addresses.length == 0) { return null; @@ -146,7 +146,7 @@ public String getFrom() throws Exception */ public String getReplyTo() throws Exception { - final javax.mail.Address[] addresses = this.mimeMessage.getReplyTo(); + final jakarta.mail.Address[] addresses = this.mimeMessage.getReplyTo(); if (addresses == null || addresses.length == 0) { return null; diff --git a/src/main/java/org/apache/commons/mail/util/MimeMessageUtils.java b/src/main/java/org/apache/commons/mail2/util/MimeMessageUtils.java similarity index 96% rename from src/main/java/org/apache/commons/mail/util/MimeMessageUtils.java rename to src/main/java/org/apache/commons/mail2/util/MimeMessageUtils.java index 1cfa4c01d..1bd4be406 100644 --- a/src/main/java/org/apache/commons/mail/util/MimeMessageUtils.java +++ b/src/main/java/org/apache/commons/mail2/util/MimeMessageUtils.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.util; +package org.apache.commons.mail2.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; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/org/apache/commons/mail/util/package-info.java b/src/main/java/org/apache/commons/mail2/util/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/mail/util/package-info.java rename to src/main/java/org/apache/commons/mail2/util/package-info.java index becfac1bb..ec687b156 100644 --- a/src/main/java/org/apache/commons/mail/util/package-info.java +++ b/src/main/java/org/apache/commons/mail2/util/package-info.java @@ -17,4 +17,4 @@ /** * This package provides some utility classes. */ -package org.apache.commons.mail.util; +package org.apache.commons.mail2.util; diff --git a/src/site/xdoc/release_1_1.xml b/src/site/xdoc/release_1_1.xml index d775eafc0..49edb71a7 100644 --- a/src/site/xdoc/release_1_1.xml +++ b/src/site/xdoc/release_1_1.xml @@ -58,9 +58,9 @@ required.
  • - The protected field org.apache.commons.mail.HtmlEmail.inlineImages + The protected field org.apache.commons.mail2.HtmlEmail.inlineImages is now deprecated. Its function is now performed by the - org.apache.commons.mail.HtmlEmail.inlineEmbeds field; the new field + org.apache.commons.mail2.HtmlEmail.inlineEmbeds field; the new field is a Map instead of a List. The change was made as a part of EMAIL-50. Clients that have subclassed HtmlEmail should change their implementations diff --git a/src/site/xdoc/userguide.xml b/src/site/xdoc/userguide.xml index bceaf794c..fa61fe0d2 100644 --- a/src/site/xdoc/userguide.xml +++ b/src/site/xdoc/userguide.xml @@ -65,8 +65,8 @@ email.send(); We will then attach the picture to the email and send it.

    - - - You can perform a more complex authentication method such as displaying a dialog box to the user by creating a subclass of the - javax.mail.Authenticator object. You will need to + jakarta.mail.Authenticator object. You will need to override the getPasswordAuthentication() method where you will handle collecting the user's information. To make use of your new Authenticator class, use the diff --git a/src/test/java/org/apache/commons/mail/AbstractEmailTest.java b/src/test/java/org/apache/commons/mail2/AbstractEmailTest.java similarity index 97% rename from src/test/java/org/apache/commons/mail/AbstractEmailTest.java rename to src/test/java/org/apache/commons/mail2/AbstractEmailTest.java index afe04d90c..9dbdc52cb 100644 --- a/src/test/java/org/apache/commons/mail/AbstractEmailTest.java +++ b/src/test/java/org/apache/commons/mail2/AbstractEmailTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import static org.easymock.EasyMock.expect; import static org.hamcrest.CoreMatchers.containsString; @@ -31,14 +31,14 @@ import java.util.Enumeration; import java.util.List; -import javax.activation.DataHandler; -import javax.mail.Header; -import javax.mail.MessagingException; -import javax.mail.Multipart; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; +import jakarta.activation.DataHandler; +import jakarta.mail.Header; +import jakarta.mail.MessagingException; +import jakarta.mail.Multipart; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; -import org.apache.commons.mail.settings.EmailConfiguration; +import org.apache.commons.mail2.settings.EmailConfiguration; import org.junit.After; import org.junit.Before; import org.subethamail.wiser.Wiser; @@ -197,8 +197,7 @@ public void getMailServer() { mailServerPort++; - this.fakeMailServer = new Wiser(); - this.fakeMailServer.setPort(getMailServerPort()); + this.fakeMailServer = Wiser.port(getMailServerPort()); this.fakeMailServer.start(); assertFalse("fake mail server didn't start", isMailServerStopped(fakeMailServer)); diff --git a/src/test/java/org/apache/commons/mail/DefaultAuthenticatorTest.java b/src/test/java/org/apache/commons/mail2/DefaultAuthenticatorTest.java similarity index 95% rename from src/test/java/org/apache/commons/mail/DefaultAuthenticatorTest.java rename to src/test/java/org/apache/commons/mail2/DefaultAuthenticatorTest.java index a03cd97e8..810206b3f 100644 --- a/src/test/java/org/apache/commons/mail/DefaultAuthenticatorTest.java +++ b/src/test/java/org/apache/commons/mail2/DefaultAuthenticatorTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import static org.junit.Assert.*; -import javax.mail.PasswordAuthentication; +import jakarta.mail.PasswordAuthentication; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java b/src/test/java/org/apache/commons/mail2/EmailAttachmentTest.java similarity index 98% rename from src/test/java/org/apache/commons/mail/EmailAttachmentTest.java rename to src/test/java/org/apache/commons/mail2/EmailAttachmentTest.java index b7a36d4d2..9196da3b4 100644 --- a/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java +++ b/src/test/java/org/apache/commons/mail2/EmailAttachmentTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import static org.junit.Assert.*; diff --git a/src/test/java/org/apache/commons/mail/EmailLiveTest.java b/src/test/java/org/apache/commons/mail2/EmailLiveTest.java similarity index 96% rename from src/test/java/org/apache/commons/mail/EmailLiveTest.java rename to src/test/java/org/apache/commons/mail2/EmailLiveTest.java index ed685733c..1708af325 100644 --- a/src/test/java/org/apache/commons/mail/EmailLiveTest.java +++ b/src/test/java/org/apache/commons/mail2/EmailLiveTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import java.io.ByteArrayOutputStream; import java.io.File; @@ -22,16 +22,16 @@ import java.util.ArrayList; import java.util.List; -import javax.activation.DataSource; -import javax.activation.URLDataSource; -import javax.mail.Session; -import javax.mail.Transport; -import javax.mail.internet.MimeMessage; +import jakarta.activation.DataSource; +import jakarta.activation.URLDataSource; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.MimeMessage; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.mail.resolver.DataSourceUrlResolver; -import org.apache.commons.mail.settings.EmailConfiguration; +import org.apache.commons.mail2.resolver.DataSourceUrlResolver; +import org.apache.commons.mail2.settings.EmailConfiguration; import org.junit.Before; import org.junit.Test; @@ -263,7 +263,7 @@ public void testCorrectCharacterEncoding() throws Exception email.setMsg(textMsg); // create a proper UTF-8 sequence for the text attachment (matching our default charset) - final DataSource attachment = new javax.mail.util.ByteArrayDataSource(textMsg.getBytes("utf-8"), "text/plain"); + final DataSource attachment = new jakarta.mail.util.ByteArrayDataSource(textMsg.getBytes("utf-8"), "text/plain"); email.attach(attachment, attachmentName, "Attachment in Greek"); EmailUtils.writeMimeMessage( new File("./target/test-emails/correct-encoding.eml"), send(email).getMimeMessage()); diff --git a/src/test/java/org/apache/commons/mail/EmailTest.java b/src/test/java/org/apache/commons/mail2/EmailTest.java similarity index 99% rename from src/test/java/org/apache/commons/mail/EmailTest.java rename to src/test/java/org/apache/commons/mail2/EmailTest.java index 67ed15383..a3099aac6 100644 --- a/src/test/java/org/apache/commons/mail/EmailTest.java +++ b/src/test/java/org/apache/commons/mail2/EmailTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.Assert.*; @@ -32,14 +32,14 @@ import java.util.Map; import java.util.Properties; -import javax.mail.Message; -import javax.mail.Session; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; -import javax.mail.internet.ParseException; +import jakarta.mail.Message; +import jakarta.mail.Session; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; +import jakarta.mail.internet.ParseException; -import org.apache.commons.mail.mocks.MockEmailConcrete; +import org.apache.commons.mail2.mocks.MockEmailConcrete; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/mail/EmailUtilsTest.java b/src/test/java/org/apache/commons/mail2/EmailUtilsTest.java similarity index 98% rename from src/test/java/org/apache/commons/mail/EmailUtilsTest.java rename to src/test/java/org/apache/commons/mail2/EmailUtilsTest.java index 15fd0fb44..515594ea6 100644 --- a/src/test/java/org/apache/commons/mail/EmailUtilsTest.java +++ b/src/test/java/org/apache/commons/mail2/EmailUtilsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/org/apache/commons/mail/HtmlEmailTest.java b/src/test/java/org/apache/commons/mail2/HtmlEmailTest.java similarity index 98% rename from src/test/java/org/apache/commons/mail/HtmlEmailTest.java rename to src/test/java/org/apache/commons/mail2/HtmlEmailTest.java index 3e26ff7df..95a4840ad 100644 --- a/src/test/java/org/apache/commons/mail/HtmlEmailTest.java +++ b/src/test/java/org/apache/commons/mail2/HtmlEmailTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -27,13 +27,13 @@ import java.net.URL; import java.util.List; -import javax.activation.DataSource; -import javax.activation.FileDataSource; -import javax.mail.internet.MimeMessage; +import jakarta.activation.DataSource; +import jakarta.activation.FileDataSource; +import jakarta.mail.internet.MimeMessage; -import org.apache.commons.mail.mocks.MockHtmlEmailConcrete; -import org.apache.commons.mail.settings.EmailConfiguration; -import org.apache.commons.mail.util.MimeMessageParser; +import org.apache.commons.mail2.mocks.MockHtmlEmailConcrete; +import org.apache.commons.mail2.settings.EmailConfiguration; +import org.apache.commons.mail2.util.MimeMessageParser; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java b/src/test/java/org/apache/commons/mail2/ImageHtmlEmailTest.java similarity index 96% rename from src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java rename to src/test/java/org/apache/commons/mail2/ImageHtmlEmailTest.java index cee837897..6c927f81f 100644 --- a/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java +++ b/src/test/java/org/apache/commons/mail2/ImageHtmlEmailTest.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import static org.junit.Assert.*; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.mail.resolver.DataSourceClassPathResolver; -import org.apache.commons.mail.resolver.DataSourceCompositeResolver; -import org.apache.commons.mail.resolver.DataSourceUrlResolver; -import org.apache.commons.mail.mocks.MockImageHtmlEmailConcrete; -import org.apache.commons.mail.util.MimeMessageParser; -import org.apache.commons.mail.util.MimeMessageUtils; +import org.apache.commons.mail2.resolver.DataSourceClassPathResolver; +import org.apache.commons.mail2.resolver.DataSourceCompositeResolver; +import org.apache.commons.mail2.resolver.DataSourceUrlResolver; +import org.apache.commons.mail2.mocks.MockImageHtmlEmailConcrete; +import org.apache.commons.mail2.util.MimeMessageParser; +import org.apache.commons.mail2.util.MimeMessageUtils; import org.junit.Before; import org.junit.Test; -import javax.activation.DataSource; -import javax.mail.internet.MimeMessage; +import jakarta.activation.DataSource; +import jakarta.mail.internet.MimeMessage; import java.io.File; import java.io.IOException; @@ -500,8 +500,8 @@ public MockDataSourceClassPathResolver(final String classPathBase, final boolean @Override public DataSource resolve(final String resourceLocation, final boolean isLenient) throws IOException { - final javax.mail.util.ByteArrayDataSource ds = - (javax.mail.util.ByteArrayDataSource) super.resolve(resourceLocation, isLenient); + final jakarta.mail.util.ByteArrayDataSource ds = + (jakarta.mail.util.ByteArrayDataSource) super.resolve(resourceLocation, isLenient); ds.setName(null); return ds; } diff --git a/src/test/java/org/apache/commons/mail/InvalidAddressTest.java b/src/test/java/org/apache/commons/mail2/InvalidAddressTest.java similarity index 98% rename from src/test/java/org/apache/commons/mail/InvalidAddressTest.java rename to src/test/java/org/apache/commons/mail2/InvalidAddressTest.java index 9162965c0..9953363a5 100644 --- a/src/test/java/org/apache/commons/mail/InvalidAddressTest.java +++ b/src/test/java/org/apache/commons/mail2/InvalidAddressTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import static org.junit.Assert.fail; -import org.apache.commons.mail.mocks.MockEmailConcrete; +import org.apache.commons.mail2.mocks.MockEmailConcrete; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java b/src/test/java/org/apache/commons/mail2/InvalidInternetAddressTest.java similarity index 99% rename from src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java rename to src/test/java/org/apache/commons/mail2/InvalidInternetAddressTest.java index 3c609de7b..0df83142e 100644 --- a/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java +++ b/src/test/java/org/apache/commons/mail2/InvalidInternetAddressTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import java.lang.reflect.Method; -import javax.mail.internet.InternetAddress; +import jakarta.mail.internet.InternetAddress; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java b/src/test/java/org/apache/commons/mail2/MultiPartEmailTest.java similarity index 98% rename from src/test/java/org/apache/commons/mail/MultiPartEmailTest.java rename to src/test/java/org/apache/commons/mail2/MultiPartEmailTest.java index 612b1fb6d..cf5bcce14 100644 --- a/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java +++ b/src/test/java/org/apache/commons/mail2/MultiPartEmailTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import static org.junit.Assert.*; @@ -25,11 +25,11 @@ import java.util.HashMap; import java.util.Map; -import javax.activation.FileDataSource; -import javax.activation.URLDataSource; -import javax.mail.internet.MimeMultipart; +import jakarta.activation.FileDataSource; +import jakarta.activation.URLDataSource; +import jakarta.mail.internet.MimeMultipart; -import org.apache.commons.mail.mocks.MockMultiPartEmailConcrete; +import org.apache.commons.mail2.mocks.MockMultiPartEmailConcrete; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/org/apache/commons/mail/SendWithAttachmentsTest.java b/src/test/java/org/apache/commons/mail2/SendWithAttachmentsTest.java similarity index 96% rename from src/test/java/org/apache/commons/mail/SendWithAttachmentsTest.java rename to src/test/java/org/apache/commons/mail2/SendWithAttachmentsTest.java index 17e9be581..ac7b5d971 100644 --- a/src/test/java/org/apache/commons/mail/SendWithAttachmentsTest.java +++ b/src/test/java/org/apache/commons/mail2/SendWithAttachmentsTest.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import java.io.File; import java.io.IOException; import java.net.URL; -import javax.mail.internet.MimeUtility; +import jakarta.mail.internet.MimeUtility; -import org.apache.commons.mail.mocks.MockHtmlEmailConcrete; -import org.apache.commons.mail.settings.EmailConfiguration; +import org.apache.commons.mail2.mocks.MockHtmlEmailConcrete; +import org.apache.commons.mail2.settings.EmailConfiguration; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/mail/SimpleEmailTest.java b/src/test/java/org/apache/commons/mail2/SimpleEmailTest.java similarity index 98% rename from src/test/java/org/apache/commons/mail/SimpleEmailTest.java rename to src/test/java/org/apache/commons/mail2/SimpleEmailTest.java index 54f70805d..8902138af 100644 --- a/src/test/java/org/apache/commons/mail/SimpleEmailTest.java +++ b/src/test/java/org/apache/commons/mail2/SimpleEmailTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail; +package org.apache.commons.mail2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -22,7 +22,7 @@ import java.io.IOException; -import org.apache.commons.mail.mocks.MockSimpleEmail; +import org.apache.commons.mail2.mocks.MockSimpleEmail; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/mail/mocks/MockEmailConcrete.java b/src/test/java/org/apache/commons/mail2/mocks/MockEmailConcrete.java similarity index 92% rename from src/test/java/org/apache/commons/mail/mocks/MockEmailConcrete.java rename to src/test/java/org/apache/commons/mail2/mocks/MockEmailConcrete.java index 63e6fe639..55e6197bc 100644 --- a/src/test/java/org/apache/commons/mail/mocks/MockEmailConcrete.java +++ b/src/test/java/org/apache/commons/mail2/mocks/MockEmailConcrete.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.mocks; +package org.apache.commons.mail2.mocks; -import javax.mail.Authenticator; -import javax.mail.Session; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; +import jakarta.mail.Authenticator; +import jakarta.mail.Session; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; -import org.apache.commons.mail.Email; -import org.apache.commons.mail.EmailException; +import org.apache.commons.mail2.Email; +import org.apache.commons.mail2.EmailException; /** * Concrete Implementation on the Abstract Email Class (used to allow testing only). diff --git a/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java b/src/test/java/org/apache/commons/mail2/mocks/MockHtmlEmailConcrete.java similarity index 91% rename from src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java rename to src/test/java/org/apache/commons/mail2/mocks/MockHtmlEmailConcrete.java index fc0d15794..66fff04b5 100644 --- a/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java +++ b/src/test/java/org/apache/commons/mail2/mocks/MockHtmlEmailConcrete.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.mocks; +package org.apache.commons.mail2.mocks; import java.io.IOException; -import javax.mail.MessagingException; -import javax.mail.internet.InternetAddress; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.InternetAddress; -import org.apache.commons.mail.HtmlEmail; +import org.apache.commons.mail2.HtmlEmail; /** * Extension of the HtmlEmail Class diff --git a/src/test/java/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java b/src/test/java/org/apache/commons/mail2/mocks/MockImageHtmlEmailConcrete.java similarity index 91% rename from src/test/java/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java rename to src/test/java/org/apache/commons/mail2/mocks/MockImageHtmlEmailConcrete.java index 40d62d941..b67286679 100644 --- a/src/test/java/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java +++ b/src/test/java/org/apache/commons/mail2/mocks/MockImageHtmlEmailConcrete.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.mocks; +package org.apache.commons.mail2.mocks; -import org.apache.commons.mail.ImageHtmlEmail; +import org.apache.commons.mail2.ImageHtmlEmail; import java.io.IOException; -import javax.mail.MessagingException; +import jakarta.mail.MessagingException; /** * Extension of the ImageHtmlEmail Class diff --git a/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java b/src/test/java/org/apache/commons/mail2/mocks/MockMultiPartEmailConcrete.java similarity index 89% rename from src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java rename to src/test/java/org/apache/commons/mail2/mocks/MockMultiPartEmailConcrete.java index f6b3aed93..d7478917a 100644 --- a/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java +++ b/src/test/java/org/apache/commons/mail2/mocks/MockMultiPartEmailConcrete.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.mocks; +package org.apache.commons.mail2.mocks; import java.io.IOException; -import javax.mail.MessagingException; -import javax.mail.internet.InternetAddress; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.InternetAddress; -import org.apache.commons.mail.MultiPartEmail; +import org.apache.commons.mail2.MultiPartEmail; /** * Extension of MultiPartEmail Class diff --git a/src/test/java/org/apache/commons/mail/mocks/MockSimpleEmail.java b/src/test/java/org/apache/commons/mail2/mocks/MockSimpleEmail.java similarity index 90% rename from src/test/java/org/apache/commons/mail/mocks/MockSimpleEmail.java rename to src/test/java/org/apache/commons/mail2/mocks/MockSimpleEmail.java index bdb92abc6..cfd6fd294 100644 --- a/src/test/java/org/apache/commons/mail/mocks/MockSimpleEmail.java +++ b/src/test/java/org/apache/commons/mail2/mocks/MockSimpleEmail.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.mocks; +package org.apache.commons.mail2.mocks; -import javax.mail.internet.InternetAddress; +import jakarta.mail.internet.InternetAddress; -import org.apache.commons.mail.SimpleEmail; +import org.apache.commons.mail2.SimpleEmail; /** * Extension of SimpleEmail Class diff --git a/src/test/java/org/apache/commons/mail/mocks/package.html b/src/test/java/org/apache/commons/mail2/mocks/package.html similarity index 100% rename from src/test/java/org/apache/commons/mail/mocks/package.html rename to src/test/java/org/apache/commons/mail2/mocks/package.html diff --git a/src/test/java/org/apache/commons/mail/package.html b/src/test/java/org/apache/commons/mail2/package.html similarity index 100% rename from src/test/java/org/apache/commons/mail/package.html rename to src/test/java/org/apache/commons/mail2/package.html diff --git a/src/test/java/org/apache/commons/mail/resolver/AbstractDataSourceResolverTest.java b/src/test/java/org/apache/commons/mail2/resolver/AbstractDataSourceResolverTest.java similarity index 94% rename from src/test/java/org/apache/commons/mail/resolver/AbstractDataSourceResolverTest.java rename to src/test/java/org/apache/commons/mail2/resolver/AbstractDataSourceResolverTest.java index 59f01034c..67cbeacee 100644 --- a/src/test/java/org/apache/commons/mail/resolver/AbstractDataSourceResolverTest.java +++ b/src/test/java/org/apache/commons/mail2/resolver/AbstractDataSourceResolverTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.resolver; +package org.apache.commons.mail2.resolver; import java.io.IOException; import java.io.InputStream; -import javax.activation.DataSource; +import jakarta.activation.DataSource; import org.apache.commons.io.IOUtils; diff --git a/src/test/java/org/apache/commons/mail/resolver/DataSourceClassPathResolverTest.java b/src/test/java/org/apache/commons/mail2/resolver/DataSourceClassPathResolverTest.java similarity index 94% rename from src/test/java/org/apache/commons/mail/resolver/DataSourceClassPathResolverTest.java rename to src/test/java/org/apache/commons/mail2/resolver/DataSourceClassPathResolverTest.java index 24c2407d5..c3c4d8167 100644 --- a/src/test/java/org/apache/commons/mail/resolver/DataSourceClassPathResolverTest.java +++ b/src/test/java/org/apache/commons/mail2/resolver/DataSourceClassPathResolverTest.java @@ -14,14 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.resolver; +package org.apache.commons.mail2.resolver; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.Assert.*; -import org.apache.commons.mail.DataSourceResolver; +import org.apache.commons.mail2.DataSourceResolver; import org.junit.Test; -import org.junit.jupiter.api.function.Executable; import java.io.IOException; diff --git a/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java b/src/test/java/org/apache/commons/mail2/resolver/DataSourceCompositeResolverTest.java similarity index 95% rename from src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java rename to src/test/java/org/apache/commons/mail2/resolver/DataSourceCompositeResolverTest.java index d59cfe1e2..54d8e5eb6 100644 --- a/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java +++ b/src/test/java/org/apache/commons/mail2/resolver/DataSourceCompositeResolverTest.java @@ -14,15 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.resolver; +package org.apache.commons.mail2.resolver; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.Assert.*; -import org.apache.commons.mail.DataSourceResolver; +import org.apache.commons.mail2.DataSourceResolver; import org.junit.Before; import org.junit.Test; -import org.junit.jupiter.api.function.Executable; import java.io.IOException; import java.net.URL; diff --git a/src/test/java/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java b/src/test/java/org/apache/commons/mail2/resolver/DataSourceFileResolverTest.java similarity index 93% rename from src/test/java/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java rename to src/test/java/org/apache/commons/mail2/resolver/DataSourceFileResolverTest.java index 012d3554e..b40d0ad91 100644 --- a/src/test/java/org/apache/commons/mail/resolver/DataSourceFileResolverTest.java +++ b/src/test/java/org/apache/commons/mail2/resolver/DataSourceFileResolverTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.resolver; +package org.apache.commons.mail2.resolver; import static org.junit.Assert.*; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -22,9 +22,8 @@ import java.io.File; import java.io.IOException; -import org.apache.commons.mail.DataSourceResolver; +import org.apache.commons.mail2.DataSourceResolver; import org.junit.Test; -import org.junit.jupiter.api.function.Executable; /** * JUnit test case for DateSourceResolver. diff --git a/src/test/java/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java b/src/test/java/org/apache/commons/mail2/resolver/DataSourceUrlResolverTest.java similarity index 97% rename from src/test/java/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java rename to src/test/java/org/apache/commons/mail2/resolver/DataSourceUrlResolverTest.java index 873305b0d..9493cc8b1 100644 --- a/src/test/java/org/apache/commons/mail/resolver/DataSourceUrlResolverTest.java +++ b/src/test/java/org/apache/commons/mail2/resolver/DataSourceUrlResolverTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.resolver; +package org.apache.commons.mail2.resolver; import static org.junit.Assert.*; -import org.apache.commons.mail.DataSourceResolver; +import org.apache.commons.mail2.DataSourceResolver; import org.junit.Test; import java.io.File; diff --git a/src/test/java/org/apache/commons/mail/settings/EmailConfiguration.java b/src/test/java/org/apache/commons/mail2/settings/EmailConfiguration.java similarity index 96% rename from src/test/java/org/apache/commons/mail/settings/EmailConfiguration.java rename to src/test/java/org/apache/commons/mail2/settings/EmailConfiguration.java index 0bd2cdb06..ec60cb8dd 100644 --- a/src/test/java/org/apache/commons/mail/settings/EmailConfiguration.java +++ b/src/test/java/org/apache/commons/mail2/settings/EmailConfiguration.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.settings; +package org.apache.commons.mail2.settings; -import org.apache.commons.mail.EmailConstants; +import org.apache.commons.mail2.EmailConstants; /** * This class contains hard-coded configuration settings diff --git a/src/test/java/org/apache/commons/mail/settings/package.html b/src/test/java/org/apache/commons/mail2/settings/package.html similarity index 100% rename from src/test/java/org/apache/commons/mail/settings/package.html rename to src/test/java/org/apache/commons/mail2/settings/package.html diff --git a/src/test/java/org/apache/commons/mail/util/IDNEmailAddressConverterTest.java b/src/test/java/org/apache/commons/mail2/util/IDNEmailAddressConverterTest.java similarity index 97% rename from src/test/java/org/apache/commons/mail/util/IDNEmailAddressConverterTest.java rename to src/test/java/org/apache/commons/mail2/util/IDNEmailAddressConverterTest.java index d05a7544f..61f5c5b95 100644 --- a/src/test/java/org/apache/commons/mail/util/IDNEmailAddressConverterTest.java +++ b/src/test/java/org/apache/commons/mail2/util/IDNEmailAddressConverterTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.util; +package org.apache.commons.mail2.util; import static org.junit.Assert.assertEquals; -import javax.mail.internet.InternetAddress; +import jakarta.mail.internet.InternetAddress; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/mail/util/MimeMessageParserTest.java b/src/test/java/org/apache/commons/mail2/util/MimeMessageParserTest.java similarity index 99% rename from src/test/java/org/apache/commons/mail/util/MimeMessageParserTest.java rename to src/test/java/org/apache/commons/mail2/util/MimeMessageParserTest.java index 5b507d439..c7082e50d 100644 --- a/src/test/java/org/apache/commons/mail/util/MimeMessageParserTest.java +++ b/src/test/java/org/apache/commons/mail2/util/MimeMessageParserTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.mail.util; +package org.apache.commons.mail2.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -26,11 +26,11 @@ import java.util.List; import java.util.Properties; -import javax.activation.DataSource; -import javax.mail.Session; -import javax.mail.internet.MimeMessage; +import jakarta.activation.DataSource; +import jakarta.mail.Session; +import jakarta.mail.internet.MimeMessage; -import org.apache.commons.mail.HtmlEmail; +import org.apache.commons.mail2.HtmlEmail; import org.junit.Test; /**