Finished migration to Jakarta 2.x.x and started migration to Java 8 (starting with BouncyCastle)

Author: bbottema

pom.xml

@@ -75,8 +75,8 @@
 
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcmail-jdk15on</artifactId>
-			<version>1.56</version>
+			<artifactId>bcjmail-jdk15to18</artifactId>
+			<version>1.70</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.mail</groupId>

src/main/java/net/markenwerk/utils/mail/smime/MimeUtil.java

@@ -1,9 +1,9 @@
 package net.markenwerk.utils.mail.smime;
 
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Session;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.mail.internet.MimeMessage;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

src/main/java/net/markenwerk/utils/mail/smime/SmimeState.java

@@ -1,7 +1,7 @@
 package net.markenwerk.utils.mail.smime;
 
-import javax.mail.internet.MimeMultipart;
-import javax.mail.internet.MimePart;
+import jakarta.mail.internet.MimeMultipart;
+import jakarta.mail.internet.MimePart;
 
 /**
  * The {@code SmimeState} of a {@link MimePart} or {@link MimeMultipart} is

src/main/java/net/markenwerk/utils/mail/smime/SmimeUtil.java

@@ -40,17 +40,17 @@
 import org.bouncycastle.operator.OutputEncryptor;
 import org.bouncycastle.util.Store;
 
-import javax.activation.CommandMap;
-import javax.activation.MailcapCommandMap;
-import javax.mail.Header;
-import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.Session;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-import javax.mail.internet.MimePart;
+import jakarta.activation.CommandMap;
+import jakarta.activation.MailcapCommandMap;
+import jakarta.mail.Header;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Multipart;
+import jakarta.mail.Session;
+import jakarta.mail.internet.ContentType;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
+import jakarta.mail.internet.MimePart;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.security.GeneralSecurityException;

src/main/java/net/markenwerk/utils/mail/smime/UpdatableMimeBodyPart.java

@@ -1,7 +1,7 @@
 package net.markenwerk.utils.mail.smime;
 
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeBodyPart;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeBodyPart;
 import java.io.InputStream;
 
 /**