Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

upgrade jakarta.mail to 2.0.0 (rename javax.mail -> jakarta.mail) #37

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 17 additions & 0 deletions RELEASE-NOTES.txt
Expand Up @@ -22,6 +22,23 @@ current users are encouraged to upgrade.
For the security bugfix see
https://commons.apache.org/proper/commons-email/security-reports.html#Fixed_in_Apache_Commons_Email_1.5

CHANGES FROM 2.0:
-----------------

== Compatibility ==

* JavaMail dependency has been upgraded to version 2.0.0,
as a consequence, all types javax.mail.* changed to jakarta.mail.* and
the maven dependency has changed to:

<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<version>2.0.0</version>
</dependency>

CHANGES FROM 1.6:

CHANGES FROM 1.5:

* Add Automatic-Module-Name MANIFEST entry for Java 9 compatibility.
Expand Down
2 changes: 1 addition & 1 deletion conf/findbugs-exclude-filter.xml
Expand Up @@ -27,7 +27,7 @@
<!-- when converting a string into a byte[] -->
<Match>
<Class name="org.apache.commons.mail.util.MimeMessageUtils" />
<Method name="createMimeMessage" params="javax.mail.Session, java.lang.String" returns="javax.mail.internet.MimeMessage" />
<Method name="createMimeMessage" params="jakarta.mail.Session, java.lang.String" returns="jakarta.mail.internet.MimeMessage" />
<Bug pattern="DM_DEFAULT_ENCODING" />
</Match>

Expand Down
30 changes: 13 additions & 17 deletions pom.xml
Expand Up @@ -23,7 +23,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>commons-email</artifactId>
<version>1.6-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<name>Apache Commons Email</name>

<inceptionYear>2001</inceptionYear>
Expand Down Expand Up @@ -237,37 +237,33 @@
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<version>1.6.5</version>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.7.7</version>
<version>1.7.30</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
<version>2.8.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.subethamail</groupId>
<artifactId>subethasmtp</artifactId>
<version>3.1.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</exclusion>
</exclusions>

<!-- https://mvnrepository.com/artifact/com.github.davidmoten/subethasmtp -->
<dependency>
<groupId>com.github.davidmoten</groupId>
<artifactId>subethasmtp</artifactId>
<version>6.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
Expand Down Expand Up @@ -313,7 +309,7 @@
</properties>

<build>
<defaultGoal>clean verify apache-rat:check clirr:check spotbugs:check javadoc:javadoc</defaultGoal>
<defaultGoal>clean verify spotbugs:check javadoc:javadoc</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
2 changes: 2 additions & 0 deletions src/changes/changes.xml
Expand Up @@ -22,6 +22,8 @@
</properties>

<body>
<release version="2.0.0" date="Not yet released, update from javax.mail to jakarta.mail.">
</release>
<release version="1.6.0" date="Not yet released, update from Java 6 to 7.">
<action issue="EMAIL-190" type="update" due-to="sgoeschl">
Fix broken JDK 9 build by updating "easymock" and other dependencies.
Expand Down
Expand Up @@ -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:<br>
Expand All @@ -39,11 +39,11 @@
* 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
{
{
/** Define the buffer size. */
public static final int BUFFER_SIZE = 512;

Expand All @@ -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 = "";
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
package org.apache.commons.mail;

import javax.activation.DataSource;
import jakarta.activation.DataSource;
import java.io.IOException;

/**
Expand Down
Expand Up @@ -16,8 +16,8 @@
*/
package org.apache.commons.mail;

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
Expand Down
34 changes: 17 additions & 17 deletions src/main/java/org/apache/commons/mail/Email.java
Expand Up @@ -26,21 +26,21 @@
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 javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;

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 org.apache.commons.mail.util.IDNEmailAddressConverter;

/**
Expand Down Expand Up @@ -595,7 +595,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
Expand Down Expand Up @@ -855,7 +855,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<InternetAddress> aCollection) throws EmailException
Expand Down Expand Up @@ -964,7 +964,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<InternetAddress> aCollection) throws EmailException
Expand Down Expand Up @@ -1073,7 +1073,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<InternetAddress> aCollection) throws EmailException
Expand Down Expand Up @@ -1152,7 +1152,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<InternetAddress> aCollection) throws EmailException
Expand Down Expand Up @@ -1782,7 +1782,7 @@ public boolean isSendPartial()
* Sets whether the email is partially send in case of invalid addresses.
* <p>
* 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.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/apache/commons/mail/EmailAttachment.java
Expand Up @@ -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 = "";
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/apache/commons/mail/EmailUtils.java
Expand Up @@ -23,8 +23,8 @@
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;

Expand Down
30 changes: 15 additions & 15 deletions src/main/java/org/apache/commons/mail/HtmlEmail.java
Expand Up @@ -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.
Expand Down Expand Up @@ -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
*/
Expand All @@ -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
*/
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/commons/mail/ImageHtmlEmail.java
Expand Up @@ -16,7 +16,7 @@
*/
package org.apache.commons.mail;

import javax.activation.DataSource;
import jakarta.activation.DataSource;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
Expand Down