Skip to content

Commit b6c3b45

Browse files
cekiceki
committed
move to jakarta.mail
Signed-off-by: Ceki Gulcu <ceki@qos.ch>
1 parent db6259d commit b6c3b45

File tree

10 files changed

+78
-38
lines changed

10 files changed

+78
-38
lines changed

‎logback-access/pom.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,14 @@
6161
<artifactId>hsqldb</artifactId>
6262
<scope>test</scope>
6363
</dependency>
64+
6465
<dependency>
65-
<groupId>javax.mail</groupId>
66-
<artifactId>javax.mail-api</artifactId>
66+
<groupId>jakarta.mail</groupId>
67+
<artifactId>jakarta.mail-api</artifactId>
6768
<scope>compile</scope>
6869
<optional>true</optional>
6970
</dependency>
71+
7072
</dependencies>
7173

7274
<build>

‎logback-classic/pom.xml

+12-7
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,21 @@
9696
<artifactId>mysql-connector-java</artifactId>
9797
<scope>test</scope>
9898
</dependency>
99+
99100
<dependency>
100-
<groupId>javax.mail</groupId>
101-
<artifactId>javax.mail-api</artifactId>
101+
<groupId>jakarta.mail</groupId>
102+
<artifactId>jakarta.mail-api</artifactId>
103+
<scope>compile</scope>
102104
<optional>true</optional>
103105
</dependency>
106+
104107
<dependency>
105-
<groupId>com.sun.mail</groupId>
106-
<artifactId>javax.mail</artifactId>
107-
<scope>runtime</scope>
108-
</dependency>
108+
<groupId>com.sun.mail</groupId>
109+
<artifactId>jakarta.mail</artifactId>
110+
<scope>runtime</scope>
111+
<optional>true</optional>
112+
</dependency>
113+
109114
<dependency>
110115
<groupId>org.codehaus.janino</groupId>
111116
<artifactId>janino</artifactId>
@@ -125,7 +130,7 @@
125130
<dependency>
126131
<groupId>com.icegreen</groupId>
127132
<artifactId>greenmail</artifactId>
128-
<version>1.5.10</version>
133+
<version>2.0.0-alpha-1</version>
129134
<scope>test</scope>
130135
</dependency>
131136
<dependency>

‎logback-classic/src/main/java9/module-info.java

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
requires org.slf4j;
33
requires static java.management;
44
requires static javax.servlet.api;
5+
56
requires ch.qos.logback.core;
67
uses ch.qos.logback.classic.spi.Configurator;
78
provides org.slf4j.spi.SLF4JServiceProvider with ch.qos.logback.classic.spi.LogbackServiceProvider;

‎logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_GreenTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
import org.junit.Test;
4040
import org.slf4j.MDC;
4141

42-
import javax.mail.MessagingException;
43-
import javax.mail.internet.MimeMessage;
44-
import javax.mail.internet.MimeMultipart;
42+
import jakarta.mail.MessagingException;
43+
import jakarta.mail.internet.MimeMessage;
44+
import jakarta.mail.internet.MimeMultipart;
4545

4646
import java.io.ByteArrayInputStream;
4747
import java.io.ByteArrayOutputStream;

‎logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_SubethaSMTPTest.java ‎logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_SubethaSMTPTest.xava

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import java.util.concurrent.ThreadPoolExecutor;
2525
import java.util.concurrent.TimeUnit;
2626

27-
import javax.mail.Part;
28-
import javax.mail.internet.MimeMessage;
29-
import javax.mail.internet.MimeMultipart;
27+
import jakarta.mail.Part;
28+
import jakarta.mail.internet.MimeMessage;
29+
import jakarta.mail.internet.MimeMultipart;
3030

3131
import org.dom4j.io.SAXReader;
3232
import org.junit.After;

‎logback-core/pom.xml

+15-7
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,26 @@
3333
<artifactId>jansi</artifactId>
3434
<optional>true</optional>
3535
</dependency>
36+
3637
<dependency>
37-
<groupId>javax.mail</groupId>
38-
<artifactId>javax.mail-api</artifactId>
38+
<groupId>jakarta.mail</groupId>
39+
<artifactId>jakarta.mail-api</artifactId>
3940
<scope>compile</scope>
4041
<optional>true</optional>
4142
</dependency>
4243
<dependency>
43-
<groupId>com.sun.mail</groupId>
44-
<artifactId>javax.mail</artifactId>
45-
<scope>runtime</scope>
46-
<optional>true</optional>
47-
</dependency>
44+
<groupId>jakarta.activation</groupId>
45+
<artifactId>jakarta.activation-api</artifactId>
46+
<scope>compile</scope>
47+
<optional>true</optional>
48+
</dependency>
49+
50+
<dependency>
51+
<groupId>com.sun.mail</groupId>
52+
<artifactId>jakarta.mail</artifactId>
53+
<scope>runtime</scope>
54+
<optional>true</optional>
55+
</dependency>
4856

4957
<dependency>
5058
<groupId>org.mockito</groupId>

‎logback-core/src/main/java/ch/qos/logback/core/net/#Authenticator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
*/
1414
package ch.qos.logback.core.net;
1515

16-
import javax.mail.Authenticator;
17-
import javax.mail.PasswordAuthentication;
16+
import jakarta.mail.Authenticator;
17+
import jakarta.mail.PasswordAuthentication;
1818

1919
/**
2020
* Used by SMTPAppender for authentication purposes.

‎logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
import java.util.Properties;
2121
import java.util.concurrent.Future;
2222

23-
import javax.mail.Message;
24-
import javax.mail.Multipart;
25-
import javax.mail.Session;
26-
import javax.mail.Transport;
27-
import javax.mail.internet.AddressException;
28-
import javax.mail.internet.InternetAddress;
29-
import javax.mail.internet.MimeBodyPart;
30-
import javax.mail.internet.MimeMessage;
31-
import javax.mail.internet.MimeMultipart;
23+
import jakarta.mail.Message;
24+
import jakarta.mail.Multipart;
25+
import jakarta.mail.Session;
26+
import jakarta.mail.Transport;
27+
import jakarta.mail.internet.AddressException;
28+
import jakarta.mail.internet.InternetAddress;
29+
import jakarta.mail.internet.MimeBodyPart;
30+
import jakarta.mail.internet.MimeMessage;
31+
import jakarta.mail.internet.MimeMultipart;
3232
import javax.naming.Context;
3333
import javax.naming.InitialContext;
3434

‎logback-core/src/main/java9/module-info.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
requires static transitive java.sql;
33
requires static transitive java.naming;
44
requires static transitive java.xml;
5-
requires static javax.mail.api;
5+
requires static jakarta.mail;
6+
requires static jakarta.activation;
7+
68
requires static javax.servlet.api;
79
requires static janino;
810
requires static commons.compiler;

‎pom.xml

+26-4
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@
5454
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5555
<junit.version>4.12</junit.version>
5656
<hamcrest.version>1.3</hamcrest.version>
57-
<javax.mail.version>1.6.2</javax.mail.version>
57+
<!--<javax.mail.version>1.6.2</javax.mail.version>-->
58+
<jakarta.mail.version>2.0.1</jakarta.mail.version>
5859
<janino.version>3.1.6</janino.version>
5960
<!-- slf4j.version property is used below, in
6061
logback-classic/pom.xml, /logback-examples/src/main/resources/setClasspath.cmd, download.htnl
@@ -166,16 +167,37 @@
166167
<artifactId>jansi</artifactId>
167168
<version>${jansi.version}</version>
168169
</dependency>
170+
171+
<!--
169172
<dependency>
170173
<groupId>javax.mail</groupId>
171174
<artifactId>javax.mail-api</artifactId>
172175
<version>${javax.mail.version}</version>
173176
</dependency>
174-
<dependency>
177+
<dependency>
175178
<groupId>com.sun.mail</groupId>
176-
<artifactId>javax.mail</artifactId>
179+
<artifactId>javax.mail</artifactId>
177180
<version>${javax.mail.version}</version>
178-
</dependency>
181+
</dependency>
182+
-->
183+
184+
<dependency>
185+
<groupId>jakarta.mail</groupId>
186+
<artifactId>jakarta.mail-api</artifactId>
187+
<version>${jakarta.mail.version}</version>
188+
</dependency>
189+
190+
<dependency>
191+
<groupId>jakarta.activation</groupId>
192+
<artifactId>jakarta.activation-api</artifactId>
193+
<version>${jakarta.mail.version}</version>
194+
</dependency>
195+
196+
<dependency>
197+
<groupId>com.sun.mail</groupId>
198+
<artifactId>jakarta.mail</artifactId>
199+
<version>${jakarta.mail.version}</version>
200+
</dependency>
179201

180202
<dependency>
181203
<groupId>org.dom4j</groupId>

0 commit comments

Comments
 (0)