Skip to content

Commit 3fa67d6

Browse files
committed
#489: switched from com.sun.mail:jakarta.mail to jakarta.mai:jakarta.mail-api + org.eclipse.angus:angus-mail
1 parent 87c44b2 commit 3fa67d6

File tree

9 files changed

+17
-21
lines changed

9 files changed

+17
-21
lines changed

Diff for: modules/batch-module/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>org.simplejavamail</groupId>
3636
<artifactId>smtp-connection-pool</artifactId>
37-
<version>2.2.0</version>
37+
<version>2.3.0</version>
3838
</dependency>
3939
</dependencies>
4040
</project>

Diff for: modules/core-module/pom.xml

+7-6
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,15 @@
4545

4646
<!-- core dependencies -->
4747
<dependency>
48-
<groupId>com.sun.mail</groupId>
49-
<artifactId>jakarta.mail</artifactId>
50-
<version>2.0.1</version>
48+
<groupId>jakarta.mail</groupId>
49+
<artifactId>jakarta.mail-api</artifactId>
50+
<version>2.1.2</version>
5151
</dependency>
5252
<dependency>
53-
<groupId>com.sun.activation</groupId>
54-
<artifactId>jakarta.activation</artifactId>
55-
<version>2.0.1</version>
53+
<groupId>org.eclipse.angus</groupId>
54+
<artifactId>angus-mail</artifactId>
55+
<version>2.0.2</version>
56+
<scope>runtime</scope>
5657
</dependency>
5758

5859
<dependency><!-- email validation framework -->

Diff for: modules/dkim-module/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>org.simplejavamail</groupId>
3636
<artifactId>utils-mail-dkim</artifactId>
37-
<version>3.0.0</version>
37+
<version>3.1.0</version>
3838
</dependency>
3939
</dependencies>
4040
</project>

Diff for: modules/simple-java-mail/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<dependency><!-- SMTP test server -->
8181
<groupId>com.github.davidmoten</groupId>
8282
<artifactId>subethasmtp</artifactId>
83-
<version>6.0.1</version>
83+
<version>6.0.7</version>
8484
<scope>test</scope>
8585
</dependency>
8686
<!-- required for java 9+ compatibility with assertj-assertions-generator-maven-plugin, which uses javax.annotation.Generated -->

Diff for: modules/simple-java-mail/src/main/java/org/simplejavamail/converter/internal/mimemessage/ImmutableDelegatingSMTPMessage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.simplejavamail.converter.internal.mimemessage;
22

3-
import com.sun.mail.smtp.SMTPMessage;
3+
import org.eclipse.angus.mail.smtp.SMTPMessage;
44
import jakarta.activation.DataHandler;
55
import jakarta.mail.Address;
66
import jakarta.mail.Flags;

Diff for: modules/simple-java-mail/src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageParser.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.simplejavamail.converter.internal.mimemessage;
22

3-
import com.sun.mail.handlers.text_plain;
3+
import org.eclipse.angus.mail.handlers.text_plain;
44
import jakarta.activation.ActivationDataFlavor;
55
import jakarta.activation.CommandMap;
66
import jakarta.activation.DataHandler;
@@ -719,7 +719,7 @@ public Date getSentDate() {
719719
}
720720

721721
/**
722-
* DataContentHandler for text/calendar, based on {@link com.sun.mail.handlers.text_html}.
722+
* DataContentHandler for text/calendar, based on {@link org.eclipse.angus.mail.handlers.text_html}.
723723
* <p>
724724
* The unfortunate class name matches Java Mail's handler naming convention.
725725
*/

Diff for: modules/simple-java-mail/src/test/java/org/simplejavamail/converter/internal/mimemessage/ImmutableDelegatingSMTPMessageTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.simplejavamail.converter.internal.mimemessage;
22

3-
import com.sun.mail.smtp.SMTPMessage;
3+
import org.eclipse.angus.mail.smtp.SMTPMessage;
44
import jakarta.activation.DataHandler;
55
import jakarta.mail.Address;
66
import jakarta.mail.Flags;

Diff for: modules/smime-module/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>org.simplejavamail</groupId>
3636
<artifactId>utils-mail-smime</artifactId>
37-
<version>2.2.0</version>
37+
<version>2.3.0</version>
3838
</dependency>
3939
</dependencies>
4040
</project>

Diff for: pom.xml

+2-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.github.bbottema</groupId>
88
<artifactId>modular-project-parent</artifactId>
9-
<version>1.0.21</version>
9+
<version>1.0.23</version>
1010
</parent>
1111

1212
<groupId>org.simplejavamail</groupId>
@@ -106,7 +106,7 @@
106106
<dependency>
107107
<groupId>org.slf4j</groupId>
108108
<artifactId>slf4j-api</artifactId>
109-
<version>1.7.32</version>
109+
<version>1.7.36</version>
110110
</dependency>
111111
<dependency>
112112
<groupId>com.google.code.findbugs</groupId>
@@ -128,11 +128,6 @@
128128
<artifactId>junit</artifactId>
129129
<version>4.13.2</version>
130130
</dependency>
131-
<dependency>
132-
<groupId>jakarta.activation</groupId>
133-
<artifactId>jakarta.activation-api</artifactId>
134-
<version>2.0.1</version>
135-
</dependency>
136131
</dependencies>
137132
</dependencyManagement>
138133

0 commit comments

Comments
 (0)