Skip to content

Commit 5337bb7

Browse files
committed
update dependencies
1 parent 1392ad3 commit 5337bb7

File tree

4 files changed

+26
-17
lines changed

4 files changed

+26
-17
lines changed

gradle/libs.versions.toml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
[versions]
22
# https://mvnrepository.com/artifact/org.slf4j/slf4j-api
3-
slf4j = "1.7.36"
3+
slf4j = "2.0.16"
44
# https://mvnrepository.com/artifact/io.projectreactor/reactor-core
5-
project-reactor = "3.4.19"
6-
# https://mvnrepository.com/artifact/javax.mail/mail
7-
javax-mail = "1.5.0-b01"
5+
project-reactor = "3.7.1"
6+
# https://mvnrepository.com/artifact/jakarta.mail/jakarta.mail-api
7+
jakarta-mail = "2.1.3"
8+
angus-mail = "2.0.3"
89
# https://mvnrepository.com/artifact/org.testcontainers/testcontainers
9-
testcontainers = "1.17.3"
10+
testcontainers = "1.20.4"
1011
# https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
11-
junit-jupiter = "5.8.2"
12+
junit-jupiter = "5.11.4"
1213
# https://mvnrepository.com/artifact/org.jetbrains/annotations
13-
jetbrains-annotations = "23.0.0"
14+
jetbrains-annotations = "26.0.1"
1415
# https://mvnrepository.com/artifact/org.projectlombok/lombok
15-
lombok = "1.18.24"
16+
lombok = "1.18.36"
1617

1718
[libraries]
1819
project-reactor-core = { module = "io.projectreactor:reactor-core", version.ref = "project-reactor" }
@@ -23,8 +24,10 @@ junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jun
2324
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
2425
slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
2526
slf4j-ext = { module = "org.slf4j:slf4j-ext", version.ref = "slf4j" }
26-
javax-mail = { module = "javax.mail:mail", version.ref = "javax-mail" }
27+
jakarta-mail-api = { module = "jakarta.mail:jakarta.mail-api", version.ref = "jakarta-mail" }
28+
angus-mail = { module = "org.eclipse.angus:angus-mail", version.ref = "angus-mail" }
2729
testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
2830

2931
[bundles]
30-
junit = ["junit-engine", "junit-api"]
32+
junit = ["junit-engine", "junit-api"]
33+
mail = ["jakarta-mail-api", "angus-mail"]

rlib-mail/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
22
api projects.rlibCommon
3-
api libs.javax.mail
3+
api libs.bundles.mail
44

55
testImplementation projects.rlibTestcontainers
66
}

rlib-mail/src/main/java/com/ss/rlib/mail/sender/exception/UncheckedMessagingException.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package com.ss.rlib.mail.sender.exception;
22

3+
import jakarta.mail.MessagingException;
34
import org.jetbrains.annotations.NotNull;
45

5-
import javax.mail.MessagingException;
6-
76
public class UncheckedMessagingException extends RuntimeException {
87

98
public UncheckedMessagingException(@NotNull MessagingException cause) {

rlib-mail/src/main/java/com/ss/rlib/mail/sender/impl/JavaxMailSender.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,20 @@
66
import com.ss.rlib.mail.sender.MailSender;
77
import com.ss.rlib.mail.sender.MailSenderConfig;
88
import com.ss.rlib.mail.sender.exception.UncheckedMessagingException;
9+
import jakarta.mail.Authenticator;
10+
import jakarta.mail.MessagingException;
11+
import jakarta.mail.PasswordAuthentication;
12+
import jakarta.mail.Session;
13+
import jakarta.mail.Transport;
14+
import jakarta.mail.internet.AddressException;
15+
import jakarta.mail.internet.InternetAddress;
16+
import jakarta.mail.internet.MimeBodyPart;
17+
import jakarta.mail.internet.MimeMessage;
18+
import jakarta.mail.internet.MimeMultipart;
919
import lombok.Builder;
1020
import lombok.Getter;
1121
import org.jetbrains.annotations.NotNull;
1222

13-
import javax.mail.*;
14-
import javax.mail.Message.RecipientType;
15-
import javax.mail.internet.*;
1623
import java.nio.charset.StandardCharsets;
1724
import java.util.Properties;
1825
import java.util.concurrent.*;
@@ -103,7 +110,7 @@ public void send(@NotNull String email, @NotNull String subject, @NotNull String
103110

104111
var message = new MimeMessage(session);
105112
message.setFrom(from);
106-
message.setRecipients(RecipientType.TO, InternetAddress.parse(email));
113+
message.setRecipients(MimeMessage.RecipientType.TO, InternetAddress.parse(email));
107114
message.setSubject(subject, StandardCharsets.UTF_8.name());
108115

109116
var mimeBodyPart = new MimeBodyPart();

0 commit comments

Comments
 (0)