Skip to content

Commit 5b14cb4

Browse files
filiphrfiliphr
committed
Use jakarta mail instead of javax mail and use Jakarta mail API without apache commons email
1 parent 95580fe commit 5b14cb4

File tree

51 files changed

+535
-434
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+535
-434
lines changed

‎distro/src/notice.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ com.fasterxml.jackson.datatype jackson-datatype-joda 2.15.2 The
7777
com.google.guava guava 31.0.1-jre The Apache Software License, Version 2.0
7878
com.h2database h2 2.1.214 The H2 License, Version 1.0
7979
com.fasterxml.uuid java-uuid-generator 3.3.0 The Apache Software License, Version 2.0
80-
com.sun.mail javax.mail 1.6.2 CDDL/GPLv2+CE
8180
commons-beanutils commons-beanutils 1.8.3 The Apache Software License, Version 2.0
8281
commons-codec commons-codec 1.15 Apache License, Version 2.0
8382
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
9190
de.odysseus.juel juel-spi 2.2.7 The Apache Software License, Version 2.0
9291
io.swagger swagger-annotations 1.6.2 Apache License 2.0
9392
io.swagger swagger-models 1.6.2 Apache License 2.0
94-
javax.activation activation 1.1.1 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
93+
jakarta.activation jakarta.activation-api 2.1.2 EDL 1.0
94+
jakarta.mail jakarta.mail.api 2.1.2 EDL 1.0
9595
joda-time joda-time 2.10.13 Apache 2
9696
log4j log4j 1.2.17 The Apache Software License, Version 2.0
97-
org.apache.commons commons-email 1.5 Apache License, Version 2.0
9897
org.apache.commons commons-lang3 3.12.0 The Apache Software License, Version 2.0
9998
org.apache.httpcomponents httpclient 4.5.13 Apache License, Version 2.0
10099
org.apache.httpcomponents httpcore 4.4.15 Apache License, Version 2.0
101100
org.apache.httpcomponents httpmime 4.5.13 Apache License, Version 2.0
102101
org.apache.geronimo.bundles json 20090211_1 The Apache Software License, Version 2.0
103102
org.apache.groovy groovy 4.0.13 The Apache Software License, Version 2.0
104103
org.apache.groovy groovy-jsr223 4.0.13 The Apache Software License, Version 2.0
104+
org.eclipse.angus angus-mail 2.0.2 EDL 1.0 / EPL 2.0
105105
org.liquibase liquibase-core 4.5.0 Apache License, Version 2.0
106106
org.mybatis mybatis 3.5.11 The Apache Software License, Version 2.0
107107
org.mybatis mybatis-spring 3.0.0 The Apache Software License, Version 2.0

‎modules/flowable-app-engine/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@
154154
junit*;resolution:=optional,
155155
org.junit*;resolution:=optional,
156156
com.sun*;resolution:=optional,
157-
javax.activation*;resolution:=optional,
157+
jakarta.activation*;resolution:=optional,
158158
jakarta.persistence*;resolution:=optional,
159-
org.apache.commons.mail*;resolution:=optional,
159+
jakarta.mail*;resolution:=optional,
160160
org.apache.xerces*;resolution:=optional,
161161
org.springframework*;resolution:=optional,
162162
com.fasterxml*;resolution:=optional,

‎modules/flowable-app-engine/src/test/resources/log4j.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
77

88

99
log4j.logger.org.apache.ibatis=INFO
10-
log4j.logger.javax.activation=INFO
1110

1211
log4j.logger.org.flowable.cmmn.engine.impl.agenda=DEBUG

‎modules/flowable-batch-service/src/test/resources/log4j.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
77

88

99
log4j.logger.org.apache.ibatis=INFO
10-
log4j.logger.javax.activation=INFO
1110

1211
log4j.logger.org.flowable.engine.impl.agenda=DEBUG

‎modules/flowable-cmmn-engine-configurator/src/test/resources/log4j.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
77

88

99
log4j.logger.org.apache.ibatis=INFO
10-
log4j.logger.javax.activation=INFO
10+
log4j.logger.jakarta.activation=INFO
1111

1212
log4j.logger.org.flowable.engine.impl.agenda=DEBUG

‎modules/flowable-cmmn-engine/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@
190190
<scope>test</scope>
191191
</dependency>
192192
<dependency>
193-
<groupId>org.subethamail</groupId>
194-
<artifactId>subethasmtp-wiser</artifactId>
193+
<groupId>com.github.davidmoten</groupId>
194+
<artifactId>subethasmtp</artifactId>
195195
<scope>test</scope>
196196
</dependency>
197197
<dependency>
@@ -222,9 +222,9 @@
222222
junit*;resolution:=optional,
223223
org.junit*;resolution:=optional,
224224
com.sun*;resolution:=optional,
225-
javax.activation*;resolution:=optional,
225+
jakarta.activation*;resolution:=optional,
226226
jakarta.persistence*;resolution:=optional,
227-
org.apache.commons.mail*;resolution:=optional,
227+
jakarta.mail*;resolution:=optional,
228228
org.apache.xerces*;resolution:=optional,
229229
org.springframework*;resolution:=optional,
230230
com.fasterxml*;resolution:=optional,

‎modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/task/CmmnMailTaskTest.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,16 @@
2626
import java.util.Collections;
2727
import java.util.List;
2828

29-
import javax.activation.DataHandler;
30-
import javax.mail.MessagingException;
31-
import javax.mail.internet.MimeMessage;
32-
import javax.mail.internet.MimeMultipart;
29+
import jakarta.activation.DataHandler;
30+
import jakarta.mail.MessagingException;
31+
import jakarta.mail.internet.MimeMessage;
32+
import jakarta.mail.internet.MimeMultipart;
3333

3434
import org.apache.commons.lang3.Validate;
3535
import org.flowable.cmmn.engine.test.CmmnDeployment;
3636
import org.flowable.cmmn.engine.test.FlowableCmmnTestCase;
3737
import org.flowable.common.engine.impl.cfg.mail.FlowableMailClientCreator;
3838
import org.flowable.common.engine.impl.cfg.mail.MailServerInfo;
39-
import org.flowable.mail.common.api.client.FlowableMailClient;
4039
import org.junit.AfterClass;
4140
import org.junit.Before;
4241
import org.junit.BeforeClass;
@@ -58,15 +57,13 @@ public class CmmnMailTaskTest extends FlowableCmmnTestCase {
5857

5958
@BeforeClass
6059
public static void setupWiser() throws Exception {
61-
wiser = new Wiser();
62-
wiser.setPort(5025);
60+
wiser = Wiser.port(5025);
6361

6462
int counter = 0;
6563
boolean serverUpAndRunning = false;
6664
while (!serverUpAndRunning && counter++ < 11) {
6765

68-
wiser = new Wiser();
69-
wiser.setPort(5025);
66+
wiser = Wiser.port(5025);
7067

7168
try {
7269
wiser.start();

‎modules/flowable-cmmn-engine/src/test/resources/log4j.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
77

88

99
log4j.logger.org.apache.ibatis=DEBUG
10-
log4j.logger.javax.activation=INFO
10+
log4j.logger.jakarta.activation=INFO
1111
log4j.logger.org.springframework=INFO
1212
log4j.logger.liquibase=INFO
1313

‎modules/flowable-engine-common/src/main/java/org/flowable/common/engine/impl/cfg/mail/FlowableMailClientCreator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.flowable.mail.common.impl.MailHostServerConfiguration;
2626
import org.flowable.mail.common.impl.MailJndiServerConfiguration;
2727
import org.flowable.mail.common.impl.MailServerConfiguration;
28-
import org.flowable.mail.common.impl.apache.commons.ApacheCommonsEmailFlowableMailClient;
28+
import org.flowable.mail.common.impl.jakarta.mail.JakartaMailFlowableMailClient;
2929

3030
/**
3131
* @author Filip Hrisafov
@@ -53,7 +53,7 @@ public static FlowableMailClient createHostClient(String host, MailServerInfo se
5353
protected static FlowableMailClient createMailClient(MailServerConfiguration serverConfiguration, MailServerInfo serverInfo,
5454
MailServerInfo fallbackServerInfo) {
5555
MailDefaultsConfiguration defaultsConfiguration = createMailDefaultsConfiguration(serverInfo, fallbackServerInfo);
56-
return new ApacheCommonsEmailFlowableMailClient(serverConfiguration, defaultsConfiguration);
56+
return new JakartaMailFlowableMailClient(serverConfiguration, defaultsConfiguration);
5757
}
5858

5959
protected static MailHostServerConfiguration createMailHostServerConfiguration(String host, MailServerInfo mailServer) {

‎modules/flowable-engine-configurator/src/test/resources/log4j.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ log4j.appender.CA.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %
77

88

99
log4j.logger.org.apache.ibatis=INFO
10-
log4j.logger.javax.activation=INFO
10+
log4j.logger.jakarta.activation=INFO
1111

1212
log4j.logger.org.flowable.engine.impl.agenda=DEBUG

0 commit comments

Comments
 (0)