From 3fa67d675f014fe49f26c77705717708a76c1267 Mon Sep 17 00:00:00 2001
From: bbottema <benny@bennybottema.com>
Date: Wed, 17 Jan 2024 20:32:27 +0100
Subject: [PATCH] #489: switched from com.sun.mail:jakarta.mail to
 jakarta.mai:jakarta.mail-api + org.eclipse.angus:angus-mail

---
 modules/batch-module/pom.xml                        |  2 +-
 modules/core-module/pom.xml                         | 13 +++++++------
 modules/dkim-module/pom.xml                         |  2 +-
 modules/simple-java-mail/pom.xml                    |  2 +-
 .../mimemessage/ImmutableDelegatingSMTPMessage.java |  2 +-
 .../internal/mimemessage/MimeMessageParser.java     |  4 ++--
 .../ImmutableDelegatingSMTPMessageTest.java         |  2 +-
 modules/smime-module/pom.xml                        |  2 +-
 pom.xml                                             |  9 ++-------
 9 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/modules/batch-module/pom.xml b/modules/batch-module/pom.xml
index 5ccf1331..6f3319d4 100644
--- a/modules/batch-module/pom.xml
+++ b/modules/batch-module/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>smtp-connection-pool</artifactId>
-            <version>2.2.0</version>
+            <version>2.3.0</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/modules/core-module/pom.xml b/modules/core-module/pom.xml
index 6e7487ff..e0c31141 100644
--- a/modules/core-module/pom.xml
+++ b/modules/core-module/pom.xml
@@ -45,14 +45,15 @@
 
         <!-- core dependencies -->
         <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>jakarta.mail</artifactId>
-            <version>2.0.1</version>
+            <groupId>jakarta.mail</groupId>
+            <artifactId>jakarta.mail-api</artifactId>
+            <version>2.1.2</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.activation</groupId>
-            <artifactId>jakarta.activation</artifactId>
-            <version>2.0.1</version>
+            <groupId>org.eclipse.angus</groupId>
+            <artifactId>angus-mail</artifactId>
+            <version>2.0.2</version>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency><!-- email validation framework -->
diff --git a/modules/dkim-module/pom.xml b/modules/dkim-module/pom.xml
index 8aa54a49..eceb0e18 100644
--- a/modules/dkim-module/pom.xml
+++ b/modules/dkim-module/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.simplejavamail</groupId>
             <artifactId>utils-mail-dkim</artifactId>
-            <version>3.0.0</version>
+            <version>3.1.0</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/modules/simple-java-mail/pom.xml b/modules/simple-java-mail/pom.xml
index 2a5c4a60..ece0b9b0 100644
--- a/modules/simple-java-mail/pom.xml
+++ b/modules/simple-java-mail/pom.xml
@@ -80,7 +80,7 @@
         <dependency><!-- SMTP test server -->
             <groupId>com.github.davidmoten</groupId>
             <artifactId>subethasmtp</artifactId>
-            <version>6.0.1</version>
+            <version>6.0.7</version>
             <scope>test</scope>
         </dependency>
         <!-- required for java 9+ compatibility with assertj-assertions-generator-maven-plugin, which uses javax.annotation.Generated -->
diff --git a/modules/simple-java-mail/src/main/java/org/simplejavamail/converter/internal/mimemessage/ImmutableDelegatingSMTPMessage.java b/modules/simple-java-mail/src/main/java/org/simplejavamail/converter/internal/mimemessage/ImmutableDelegatingSMTPMessage.java
index 2b27251f..421a3780 100644
--- a/modules/simple-java-mail/src/main/java/org/simplejavamail/converter/internal/mimemessage/ImmutableDelegatingSMTPMessage.java
+++ b/modules/simple-java-mail/src/main/java/org/simplejavamail/converter/internal/mimemessage/ImmutableDelegatingSMTPMessage.java
@@ -1,6 +1,6 @@
 package org.simplejavamail.converter.internal.mimemessage;
 
-import com.sun.mail.smtp.SMTPMessage;
+import org.eclipse.angus.mail.smtp.SMTPMessage;
 import jakarta.activation.DataHandler;
 import jakarta.mail.Address;
 import jakarta.mail.Flags;
diff --git a/modules/simple-java-mail/src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageParser.java b/modules/simple-java-mail/src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageParser.java
index 3ed8f994..9ce8b58d 100644
--- a/modules/simple-java-mail/src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageParser.java
+++ b/modules/simple-java-mail/src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageParser.java
@@ -1,6 +1,6 @@
 package org.simplejavamail.converter.internal.mimemessage;
 
-import com.sun.mail.handlers.text_plain;
+import org.eclipse.angus.mail.handlers.text_plain;
 import jakarta.activation.ActivationDataFlavor;
 import jakarta.activation.CommandMap;
 import jakarta.activation.DataHandler;
@@ -719,7 +719,7 @@ public Date getSentDate() {
 	}
 
 	/**
-	 * DataContentHandler for text/calendar, based on {@link com.sun.mail.handlers.text_html}.
+	 * DataContentHandler for text/calendar, based on {@link org.eclipse.angus.mail.handlers.text_html}.
 	 * <p>
 	 * The unfortunate class name matches Java Mail's handler naming convention.
 	 */
diff --git a/modules/simple-java-mail/src/test/java/org/simplejavamail/converter/internal/mimemessage/ImmutableDelegatingSMTPMessageTest.java b/modules/simple-java-mail/src/test/java/org/simplejavamail/converter/internal/mimemessage/ImmutableDelegatingSMTPMessageTest.java
index afafe852..be7c975d 100644
--- a/modules/simple-java-mail/src/test/java/org/simplejavamail/converter/internal/mimemessage/ImmutableDelegatingSMTPMessageTest.java
+++ b/modules/simple-java-mail/src/test/java/org/simplejavamail/converter/internal/mimemessage/ImmutableDelegatingSMTPMessageTest.java
@@ -1,6 +1,6 @@
 package org.simplejavamail.converter.internal.mimemessage;
 
-import com.sun.mail.smtp.SMTPMessage;
+import org.eclipse.angus.mail.smtp.SMTPMessage;
 import jakarta.activation.DataHandler;
 import jakarta.mail.Address;
 import jakarta.mail.Flags;
diff --git a/modules/smime-module/pom.xml b/modules/smime-module/pom.xml
index 8d27a0e9..193876a6 100644
--- a/modules/smime-module/pom.xml
+++ b/modules/smime-module/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
 			<groupId>org.simplejavamail</groupId>
 			<artifactId>utils-mail-smime</artifactId>
-			<version>2.2.0</version>
+			<version>2.3.0</version>
 		</dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index e9cde5e9..7a3d906d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.bbottema</groupId>
         <artifactId>modular-project-parent</artifactId>
-        <version>1.0.21</version>
+        <version>1.0.23</version>
     </parent>
 
     <groupId>org.simplejavamail</groupId>
@@ -106,7 +106,7 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.7.32</version>
+                <version>1.7.36</version>
             </dependency>
             <dependency>
                 <groupId>com.google.code.findbugs</groupId>
@@ -128,11 +128,6 @@
                 <artifactId>junit</artifactId>
                 <version>4.13.2</version>
             </dependency>
-            <dependency>
-                <groupId>jakarta.activation</groupId>
-                <artifactId>jakarta.activation-api</artifactId>
-                <version>2.0.1</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>