Use jakarta mail instead of javax mail and use Jakarta mail API witho…

…ut apache commons email
flowable · Aug 2, 2023 · 5b14cb4 · 5b14cb4
1 parent 95580fe
commit 5b14cb4
Show file tree

Hide file tree

Showing 51 changed files with 535 additions and 434 deletions.
diff --git a/distro/src/notice.txt b/distro/src/notice.txt
@@ -77,7 +77,6 @@ com.fasterxml.jackson.datatype  jackson-datatype-joda       2.15.2          The
 com.google.guava                guava                       31.0.1-jre      The Apache Software License, Version 2.0
 com.h2database                  h2                          2.1.214         The H2 License, Version 1.0
 com.fasterxml.uuid              java-uuid-generator         3.3.0           The Apache Software License, Version 2.0
-com.sun.mail                    javax.mail                  1.6.2           CDDL/GPLv2+CE
 commons-beanutils               commons-beanutils           1.8.3           The Apache Software License, Version 2.0
 commons-codec                   commons-codec               1.15            Apache License, Version 2.0
 commons-digester                commons-digester            1.8             The Apache Software License, Version 2.0
@@ -91,17 +90,18 @@ de.odysseus.juel                juel-impl                   2.2.7           The
 de.odysseus.juel                juel-spi                    2.2.7           The Apache Software License, Version 2.0
 io.swagger                      swagger-annotations         1.6.2           Apache License 2.0
 io.swagger                      swagger-models              1.6.2           Apache License 2.0
-javax.activation                activation                  1.1.1           COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+jakarta.activation              jakarta.activation-api      2.1.2           EDL 1.0
+jakarta.mail                    jakarta.mail.api            2.1.2           EDL 1.0
 joda-time                       joda-time                   2.10.13         Apache 2
 log4j                           log4j                       1.2.17          The Apache Software License, Version 2.0
-org.apache.commons              commons-email               1.5             Apache License, Version 2.0
 org.apache.commons              commons-lang3               3.12.0          The Apache Software License, Version 2.0
 org.apache.httpcomponents       httpclient                  4.5.13          Apache License, Version 2.0
 org.apache.httpcomponents       httpcore                    4.4.15          Apache License, Version 2.0
 org.apache.httpcomponents       httpmime                    4.5.13          Apache License, Version 2.0
 org.apache.geronimo.bundles     json                        20090211_1      The Apache Software License, Version 2.0
 org.apache.groovy               groovy                      4.0.13          The Apache Software License, Version 2.0
 org.apache.groovy               groovy-jsr223               4.0.13          The Apache Software License, Version 2.0
+org.eclipse.angus               angus-mail                  2.0.2           EDL 1.0 / EPL 2.0
 org.liquibase                   liquibase-core              4.5.0           Apache License, Version 2.0
 org.mybatis                     mybatis                     3.5.11          The Apache Software License, Version 2.0
 org.mybatis                     mybatis-spring              3.0.0           The Apache Software License, Version 2.0

diff --git a/modules/flowable-app-engine/pom.xml b/modules/flowable-app-engine/pom.xml
@@ -154,9 +154,9 @@
             junit*;resolution:=optional,
             org.junit*;resolution:=optional,
             com.sun*;resolution:=optional,
-            javax.activation*;resolution:=optional,
+            jakarta.activation*;resolution:=optional,
             jakarta.persistence*;resolution:=optional,
-            org.apache.commons.mail*;resolution:=optional,
+            jakarta.mail*;resolution:=optional,
             org.apache.xerces*;resolution:=optional,
             org.springframework*;resolution:=optional,
             com.fasterxml*;resolution:=optional,

diff --git a/modules/flowable-app-engine/src/test/resources/log4j.properties b/modules/flowable-app-engine/src/test/resources/log4j.properties
@@ -7,6 +7,5 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
 
 
 log4j.logger.org.apache.ibatis=INFO
-log4j.logger.javax.activation=INFO
 
 log4j.logger.org.flowable.cmmn.engine.impl.agenda=DEBUG
diff --git a/modules/flowable-batch-service/src/test/resources/log4j.properties b/modules/flowable-batch-service/src/test/resources/log4j.properties
@@ -7,6 +7,5 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
 
 
 log4j.logger.org.apache.ibatis=INFO
-log4j.logger.javax.activation=INFO
 
 log4j.logger.org.flowable.engine.impl.agenda=DEBUG
diff --git a/modules/flowable-cmmn-engine-configurator/src/test/resources/log4j.properties b/modules/flowable-cmmn-engine-configurator/src/test/resources/log4j.properties
@@ -7,6 +7,6 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
 
 
 log4j.logger.org.apache.ibatis=INFO
-log4j.logger.javax.activation=INFO
+log4j.logger.jakarta.activation=INFO
 
 log4j.logger.org.flowable.engine.impl.agenda=DEBUG
diff --git a/modules/flowable-cmmn-engine/pom.xml b/modules/flowable-cmmn-engine/pom.xml
@@ -190,8 +190,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.subethamail</groupId>
-            <artifactId>subethasmtp-wiser</artifactId>
+            <groupId>com.github.davidmoten</groupId>
+            <artifactId>subethasmtp</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -222,9 +222,9 @@
             junit*;resolution:=optional,
             org.junit*;resolution:=optional,
             com.sun*;resolution:=optional,
-            javax.activation*;resolution:=optional,
+            jakarta.activation*;resolution:=optional,
             jakarta.persistence*;resolution:=optional,
-            org.apache.commons.mail*;resolution:=optional,
+            jakarta.mail*;resolution:=optional,
             org.apache.xerces*;resolution:=optional,
             org.springframework*;resolution:=optional,
             com.fasterxml*;resolution:=optional,

diff --git a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/task/CmmnMailTaskTest.java b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/task/CmmnMailTaskTest.java
@@ -26,17 +26,16 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.activation.DataHandler;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
+import jakarta.activation.DataHandler;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
 
 import org.apache.commons.lang3.Validate;
 import org.flowable.cmmn.engine.test.CmmnDeployment;
 import org.flowable.cmmn.engine.test.FlowableCmmnTestCase;
 import org.flowable.common.engine.impl.cfg.mail.FlowableMailClientCreator;
 import org.flowable.common.engine.impl.cfg.mail.MailServerInfo;
-import org.flowable.mail.common.api.client.FlowableMailClient;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -58,15 +57,13 @@ public class CmmnMailTaskTest extends FlowableCmmnTestCase {
 
     @BeforeClass
     public static void setupWiser() throws Exception {
-        wiser = new Wiser();
-        wiser.setPort(5025);
+        wiser = Wiser.port(5025);
 
         int counter = 0;
         boolean serverUpAndRunning = false;
         while (!serverUpAndRunning && counter++ < 11) {
 
-            wiser = new Wiser();
-            wiser.setPort(5025);
+            wiser = Wiser.port(5025);
 
             try {
                 wiser.start();

diff --git a/modules/flowable-cmmn-engine/src/test/resources/log4j.properties b/modules/flowable-cmmn-engine/src/test/resources/log4j.properties
@@ -7,7 +7,7 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
 
 
 log4j.logger.org.apache.ibatis=DEBUG
-log4j.logger.javax.activation=INFO
+log4j.logger.jakarta.activation=INFO
 log4j.logger.org.springframework=INFO
 log4j.logger.liquibase=INFO
 

diff --git a/...mon/src/main/java/org/flowable/common/engine/impl/cfg/mail/FlowableMailClientCreator.java b/...mon/src/main/java/org/flowable/common/engine/impl/cfg/mail/FlowableMailClientCreator.java
@@ -25,7 +25,7 @@
 import org.flowable.mail.common.impl.MailHostServerConfiguration;
 import org.flowable.mail.common.impl.MailJndiServerConfiguration;
 import org.flowable.mail.common.impl.MailServerConfiguration;
-import org.flowable.mail.common.impl.apache.commons.ApacheCommonsEmailFlowableMailClient;
+import org.flowable.mail.common.impl.jakarta.mail.JakartaMailFlowableMailClient;
 
 /**
  * @author Filip Hrisafov
@@ -53,7 +53,7 @@ public static FlowableMailClient createHostClient(String host, MailServerInfo se
     protected static FlowableMailClient createMailClient(MailServerConfiguration serverConfiguration, MailServerInfo serverInfo,
             MailServerInfo fallbackServerInfo) {
         MailDefaultsConfiguration defaultsConfiguration = createMailDefaultsConfiguration(serverInfo, fallbackServerInfo);
-        return new ApacheCommonsEmailFlowableMailClient(serverConfiguration, defaultsConfiguration);
+        return new JakartaMailFlowableMailClient(serverConfiguration, defaultsConfiguration);
     }
 
     protected static MailHostServerConfiguration createMailHostServerConfiguration(String host, MailServerInfo mailServer) {

diff --git a/modules/flowable-engine-configurator/src/test/resources/log4j.properties b/modules/flowable-engine-configurator/src/test/resources/log4j.properties
@@ -7,6 +7,6 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
 
 
 log4j.logger.org.apache.ibatis=INFO
-log4j.logger.javax.activation=INFO
+log4j.logger.jakarta.activation=INFO
 
 log4j.logger.org.flowable.engine.impl.agenda=DEBUG
diff --git a/modules/flowable-engine/pom.xml b/modules/flowable-engine/pom.xml
@@ -208,8 +208,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.subethamail</groupId>
-            <artifactId>subethasmtp-wiser</artifactId>
+            <groupId>com.github.davidmoten</groupId>
+            <artifactId>subethasmtp</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -308,9 +308,9 @@
             junit*;resolution:=optional,
             org.junit*;resolution:=optional,
             com.sun*;resolution:=optional,
-            javax.activation*;resolution:=optional,
+            jakarta.activation*;resolution:=optional,
             jakarta.persistence*;resolution:=optional,
-            org.apache.commons.mail*;resolution:=optional,
+            jakarta.mail*;resolution:=optional,
             org.apache.xerces*;resolution:=optional,
             org.flowable.camel;resolution:=optional,
             org.flowable.camel.impl;resolution:=optional,

diff --git a/...les/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/mail/AttachmentsBean.java b/...les/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/mail/AttachmentsBean.java
@@ -20,7 +20,7 @@
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
 
-import javax.activation.DataSource;
+import jakarta.activation.DataSource;
 
 import org.apache.commons.lang3.Validate;
 

diff --git a/...s/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/mail/EmailSendTaskTest.java b/...s/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/mail/EmailSendTaskTest.java
@@ -26,10 +26,10 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.activation.DataHandler;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
+import jakarta.activation.DataHandler;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
 
 import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.impl.history.HistoryLevel;

diff --git a/...e/src/test/java/org/flowable/engine/test/bpmn/mail/EmailSendTaskWithContentItemsTest.java b/...e/src/test/java/org/flowable/engine/test/bpmn/mail/EmailSendTaskWithContentItemsTest.java
@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.mail.internet.MimeMultipart;
+import jakarta.mail.internet.MimeMultipart;
 
 import org.flowable.common.engine.impl.interceptor.EngineConfigurationConstants;
 import org.flowable.content.api.ContentEngineConfigurationApi;

diff --git a/...lowable-engine/src/test/java/org/flowable/engine/test/bpmn/mail/EmailServiceTaskTest.java b/...lowable-engine/src/test/java/org/flowable/engine/test/bpmn/mail/EmailServiceTaskTest.java
@@ -30,10 +30,10 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
-import javax.activation.DataHandler;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
+import jakarta.activation.DataHandler;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
 
 import org.flowable.common.engine.api.FlowableException;
 import org.flowable.common.engine.impl.cfg.mail.FlowableMailClientCreator;

diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/mail/EmailTestCase.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/mail/EmailTestCase.java
@@ -41,8 +41,7 @@ protected void setUp() throws Exception {
         initialMailServers = mailServers == null ? null : new HashMap<>(mailServers);
         boolean serverUpAndRunning = false;
         while (!serverUpAndRunning) {
-            wiser = new Wiser();
-            wiser.setPort(5025);
+            wiser = Wiser.port(5025);
 
             try {
                 wiser.start();

diff --git a/modules/flowable-engine/src/test/java/org/flowable/examples/bpmn/mail/EmailSendTaskTest.java b/modules/flowable-engine/src/test/java/org/flowable/examples/bpmn/mail/EmailSendTaskTest.java
@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMessage;
 
 import org.flowable.engine.impl.test.PluggableFlowableTestCase;
 import org.flowable.engine.test.Deployment;
@@ -46,8 +46,7 @@ public class EmailSendTaskTest extends PluggableFlowableTestCase {
     protected void setUp() throws Exception {
         boolean serverUpAndRunning = false;
         while (!serverUpAndRunning) {
-            wiser = new Wiser();
-            wiser.setPort(5025);
+            wiser = Wiser.port(5025);
 
             try {
                 wiser.start();

diff --git a/...s/flowable-engine/src/test/java/org/flowable/examples/bpmn/mail/EmailServiceTaskTest.java b/...s/flowable-engine/src/test/java/org/flowable/examples/bpmn/mail/EmailServiceTaskTest.java
@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMessage;
 
 import org.flowable.engine.impl.test.PluggableFlowableTestCase;
 import org.flowable.engine.test.Deployment;
@@ -43,8 +43,7 @@ public class EmailServiceTaskTest extends PluggableFlowableTestCase {
     protected void setUp() throws Exception {
         boolean serverUpAndRunning = false;
         while (!serverUpAndRunning) {
-            wiser = new Wiser();
-            wiser.setPort(5025);
+            wiser = Wiser.port(5025);
 
             try {
                 wiser.start();

diff --git a/modules/flowable-entitylink-service/src/test/resources/log4j.properties b/modules/flowable-entitylink-service/src/test/resources/log4j.properties
@@ -7,6 +7,5 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
 
 
 log4j.logger.org.apache.ibatis=INFO
-log4j.logger.javax.activation=INFO
 
 log4j.logger.org.flowable.engine.impl.agenda=DEBUG
diff --git a/modules/flowable-event-registry/pom.xml b/modules/flowable-event-registry/pom.xml
@@ -137,9 +137,9 @@
             org.junit.jupiter*;resolution:=optional,
             com.sun*;resolution:=optional,
             liquibase*;resolution:=optional,
-            javax.activation*;resolution:=optional,
+            jakarta.activation*;resolution:=optional,
             jakarta.persistence*;resolution:=optional,
-            org.apache.commons.mail*;resolution:=optional,
+            jakarta.mail*;resolution:=optional,
             org.apache.xerces*;resolution:=optional,
             org.springframework*;resolution:=optional,
             com.fasterxml*;resolution:=optional,

diff --git a/modules/flowable-eventsubscription-service/src/test/resources/log4j.properties b/modules/flowable-eventsubscription-service/src/test/resources/log4j.properties
@@ -7,6 +7,5 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
 
 
 log4j.logger.org.apache.ibatis=INFO
-log4j.logger.javax.activation=INFO
 
 log4j.logger.org.flowable.engine.impl.agenda=DEBUG
diff --git a/modules/flowable-groovy-script-static-engine/src/test/resources/log4j.properties b/modules/flowable-groovy-script-static-engine/src/test/resources/log4j.properties
@@ -7,4 +7,3 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
 
 
 log4j.logger.org.apache.ibatis=INFO
-log4j.logger.javax.activation=INFO
diff --git a/modules/flowable-identitylink-service/src/test/resources/log4j.properties b/modules/flowable-identitylink-service/src/test/resources/log4j.properties
@@ -7,6 +7,5 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
 
 
 log4j.logger.org.apache.ibatis=INFO
-log4j.logger.javax.activation=INFO
 
 log4j.logger.org.flowable.engine.impl.agenda=DEBUG
diff --git a/modules/flowable-jms-spring-executor/src/test/resources/log4j.properties b/modules/flowable-jms-spring-executor/src/test/resources/log4j.properties
@@ -7,6 +7,5 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
 
 
 log4j.logger.org.apache.ibatis=INFO
-log4j.logger.javax.activation=INFO
 
 log4j.logger.org.flowable.engine.impl.agenda=DEBUG
diff --git a/modules/flowable-jmx/src/test/resources/log4j.properties b/modules/flowable-jmx/src/test/resources/log4j.properties
@@ -7,5 +7,4 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
 
 
 log4j.logger.org.apache.ibatis=INFO
-log4j.logger.javax.activation=INFO
 
diff --git a/modules/flowable-job-service/src/test/resources/log4j.properties b/modules/flowable-job-service/src/test/resources/log4j.properties
@@ -7,6 +7,5 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
 
 
 log4j.logger.org.apache.ibatis=INFO
-log4j.logger.javax.activation=INFO
 
 log4j.logger.org.flowable.engine.impl.agenda=DEBUG
diff --git a/modules/flowable-ldap-configurator/src/test/resources/log4j.properties b/modules/flowable-ldap-configurator/src/test/resources/log4j.properties
@@ -7,5 +7,4 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
 
 
 log4j.logger.org.apache.ibatis=INFO
-log4j.logger.javax.activation=INFO
 
diff --git a/modules/flowable-mail/pom.xml b/modules/flowable-mail/pom.xml
@@ -128,8 +128,8 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-email</artifactId>
+            <groupId>org.eclipse.angus</groupId>
+            <artifactId>angus-mail</artifactId>
         </dependency>
 
         <dependency>

diff --git a/modules/flowable-mail/src/main/java/org/flowable/mail/common/api/MailMessage.java b/modules/flowable-mail/src/main/java/org/flowable/mail/common/api/MailMessage.java
@@ -18,7 +18,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import javax.activation.DataSource;
+import jakarta.activation.DataSource;
 
 /**
  * @author Filip Hrisafov

diff --git a/...s/flowable-mail/src/main/java/org/flowable/mail/common/impl/BaseMailActivityDelegate.java b/...s/flowable-mail/src/main/java/org/flowable/mail/common/impl/BaseMailActivityDelegate.java
@@ -22,8 +22,8 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import javax.activation.DataSource;
-import javax.activation.FileDataSource;
+import jakarta.activation.DataSource;
+import jakarta.activation.FileDataSource;
 
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.common.engine.api.FlowableException;