This is an automated email from the ASF dual-hosted git repository.
mridulpathak pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new eb7018835f Improved: Migrate mail integration from javax.mail to
Jakarta Mail (OFBIZ-13465) (#1527)
eb7018835f is described below
commit eb7018835fa6e706fab1bfa6c60642332579e946
Author: Mridul Pathak <[email protected]>
AuthorDate: Fri Jul 31 12:29:39 2026 +0530
Improved: Migrate mail integration from javax.mail to Jakarta Mail
(OFBIZ-13465) (#1527)
Improved: Migrate mail integration from javax.mail to Jakarta Mail
(OFBIZ-13465)
Replace com.sun.mail:javax.mail:1.6.2 with jakarta.mail:jakarta.mail-api
+
org.eclipse.angus:angus-mail, updating imports across EmailServices,
CommonServices,
MimeMessageWrapper, ServiceMcaCondition, JavaMailContainer, and
CommunicationEventServices.
Note: a few public method signatures move from javax.mail.* to
jakarta.mail.*, and Angus
Mail defaults TLS server-identity checking to on (was off under the old
library).
---
.../communication/CommunicationEventServices.java | 8 +++----
dependencies.gradle | 4 +++-
.../org/apache/ofbiz/common/CommonServices.java | 2 +-
.../apache/ofbiz/common/email/EmailServices.java | 24 ++++++++++----------
.../ofbiz/service/mail/JavaMailContainer.java | 26 +++++++++++-----------
.../ofbiz/service/mail/MimeMessageWrapper.java | 16 ++++++-------
.../ofbiz/service/mail/ServiceMcaCondition.java | 12 +++++-----
7 files changed, 47 insertions(+), 45 deletions(-)
diff --git
a/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java
b/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java
index ebaf01693b..d2c108592e 100644
---
a/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java
+++
b/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java
@@ -35,10 +35,10 @@ import java.util.TreeSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.mail.Address;
-import javax.mail.BodyPart;
-import javax.mail.MessagingException;
-import javax.mail.internet.InternetAddress;
+import jakarta.mail.Address;
+import jakarta.mail.BodyPart;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.InternetAddress;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
diff --git a/dependencies.gradle b/dependencies.gradle
index 2dcb81c432..f4b3880aaf 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -27,12 +27,14 @@ dependencies {
implementation 'com.googlecode.libphonenumber:libphonenumber:8.13.55'
implementation 'com.ibm.icu:icu4j:76.1'
implementation 'com.github.librepdf:openpdf:1.4.2' // This is the last
version with com.lowagie.text that is used (only) by PdfSurveyServices class.
- implementation 'com.sun.mail:javax.mail:1.6.2'
+ implementation 'jakarta.mail:jakarta.mail-api:2.1.5'
+ implementation 'org.eclipse.angus:angus-mail:2.0.5'
implementation 'com.rometools:rome:2.1.0'
implementation 'com.thoughtworks.xstream:xstream:1.4.21'
implementation 'commons-cli:commons-cli:1.11.0'
implementation 'commons-net:commons-net:3.13.0'
implementation 'commons-validator:commons-validator:1.10.1'
+ implementation 'javax.activation:activation:1.1.1'
implementation 'javax.transaction:javax.transaction-api:1.3'
implementation 'net.fortuna.ical4j:ical4j:1.0-rc4-atlassian-12'
implementation 'net.lingala.zip4j:zip4j:2.11.6'
diff --git
a/framework/common/src/main/java/org/apache/ofbiz/common/CommonServices.java
b/framework/common/src/main/java/org/apache/ofbiz/common/CommonServices.java
index aa5e01135c..29cad0b7f2 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/CommonServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/CommonServices.java
@@ -38,7 +38,7 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMessage;
import org.apache.ofbiz.base.metrics.Metrics;
import org.apache.ofbiz.base.metrics.MetricsFactory;
diff --git
a/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
b/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
index 3f01063faa..59bf4f594c 100644
---
a/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
+++
b/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
@@ -38,17 +38,17 @@ import java.util.Locale;
import java.util.Map;
import java.util.Properties;
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.SendFailedException;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.SendFailedException;
+import jakarta.mail.Session;
+import jakarta.mail.Transport;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.stream.StreamSource;
@@ -80,7 +80,7 @@ import org.apache.ofbiz.widget.renderer.VisualTheme;
import org.apache.ofbiz.widget.renderer.macro.MacroScreenRenderer;
import org.xml.sax.SAXException;
-import com.sun.mail.smtp.SMTPAddressFailedException;
+import org.eclipse.angus.mail.smtp.SMTPAddressFailedException;
import freemarker.template.TemplateException;
diff --git
a/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java
b/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java
index 08f8be371a..e6f5627cb2 100644
---
a/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java
+++
b/framework/service/src/main/java/org/apache/ofbiz/service/mail/JavaMailContainer.java
@@ -27,19 +27,19 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import javax.mail.FetchProfile;
-import javax.mail.Flags;
-import javax.mail.Folder;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.NoSuchProviderException;
-import javax.mail.Session;
-import javax.mail.Store;
-import javax.mail.URLName;
-import javax.mail.event.StoreEvent;
-import javax.mail.event.StoreListener;
-import javax.mail.internet.MimeMessage;
-import javax.mail.search.FlagTerm;
+import jakarta.mail.FetchProfile;
+import jakarta.mail.Flags;
+import jakarta.mail.Folder;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.NoSuchProviderException;
+import jakarta.mail.Session;
+import jakarta.mail.Store;
+import jakarta.mail.URLName;
+import jakarta.mail.event.StoreEvent;
+import jakarta.mail.event.StoreListener;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.search.FlagTerm;
import org.apache.ofbiz.base.container.Container;
import org.apache.ofbiz.base.container.ContainerConfig;
diff --git
a/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java
b/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java
index 6d47d4d3e0..2a4ddf335c 100644
---
a/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java
+++
b/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java
@@ -29,14 +29,14 @@ import java.util.List;
import java.util.Locale;
import java.util.Properties;
-import javax.mail.Address;
-import javax.mail.BodyPart;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.Part;
-import javax.mail.Session;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.Address;
+import jakarta.mail.BodyPart;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Multipart;
+import jakarta.mail.Part;
+import jakarta.mail.Session;
+import jakarta.mail.internet.MimeMessage;
import org.apache.ofbiz.base.conversion.AbstractConverter;
import org.apache.ofbiz.base.conversion.ConversionException;
diff --git
a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaCondition.java
b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaCondition.java
index 4510bf76ed..6d10afea5e 100644
---
a/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaCondition.java
+++
b/framework/service/src/main/java/org/apache/ofbiz/service/mail/ServiceMcaCondition.java
@@ -23,12 +23,12 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import javax.mail.Address;
-import javax.mail.BodyPart;
-import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.Part;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.Address;
+import jakarta.mail.BodyPart;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Multipart;
+import jakarta.mail.Part;
+import jakarta.mail.internet.MimeMessage;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilMisc;
