From db1d81bcd997491f7039352533f5c8d511460858 Mon Sep 17 00:00:00 2001
From: Joern Muehlencord <joern.muehlencord@vitroconnect.com>
Date: Thu, 15 Feb 2024 23:45:13 +0100
Subject: [PATCH] change to jakarta.mail

---
 db/pom.xml                                    |  2 +-
 jeeutil/pom.xml                               |  2 +-
 network/pom.xml                               |  4 +-
 .../network/mail/DefaultMailReader.java       | 20 +++---
 .../shared/network/mail/MailMessage.java      |  4 +-
 .../shared/network/mail/MailMessageUtils.java | 13 ++--
 .../network/mail/imap/ImapMailReader.java     |  2 +-
 .../shared/network/mail/TestSendMail.java     | 27 +++----
 pom.xml                                       | 71 ++++++++++---------
 9 files changed, 76 insertions(+), 69 deletions(-)

diff --git a/db/pom.xml b/db/pom.xml
index cbfde88..cb19bea 100644
--- a/db/pom.xml
+++ b/db/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
 
   <groupId>de.muehlencord.shared</groupId>
   <artifactId>shared-db</artifactId>
-  <packaging>ejb</packaging>
+  <packaging>jar</packaging>
 
   <parent>
     <artifactId>shared</artifactId>
diff --git a/jeeutil/pom.xml b/jeeutil/pom.xml
index 27c1fcf..d25d78b 100644
--- a/jeeutil/pom.xml
+++ b/jeeutil/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
 
   <groupId>de.muehlencord.shared</groupId>
   <artifactId>shared-jeeutil</artifactId>
-  <packaging>ejb</packaging>
+  <packaging>jar</packaging>
 
   <name>shared-jeeutil</name>
 
diff --git a/network/pom.xml b/network/pom.xml
index 3b6d0be..d82a5d6 100644
--- a/network/pom.xml
+++ b/network/pom.xml
@@ -42,8 +42,8 @@ limitations under the License.
     </dependency>
 
     <dependency>
-      <artifactId>javax.mail</artifactId>
-      <groupId>com.sun.mail</groupId>
+      <groupId>jakarta.mail</groupId>
+      <artifactId>jakarta.mail-api</artifactId>
     </dependency>
     <dependency>
       <artifactId>ews-java-api</artifactId>
diff --git a/network/src/main/java/de/muehlencord/shared/network/mail/DefaultMailReader.java b/network/src/main/java/de/muehlencord/shared/network/mail/DefaultMailReader.java
index 93f1912..5ad0e4d 100644
--- a/network/src/main/java/de/muehlencord/shared/network/mail/DefaultMailReader.java
+++ b/network/src/main/java/de/muehlencord/shared/network/mail/DefaultMailReader.java
@@ -16,20 +16,20 @@
 package de.muehlencord.shared.network.mail;
 
 import de.muehlencord.shared.util.StringUtil;
+import jakarta.mail.Flags;
+import jakarta.mail.Folder;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Session;
+import jakarta.mail.Store;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.search.MessageIDTerm;
+import jakarta.mail.search.SearchTerm;
+import jakarta.mail.util.SharedByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
-import javax.mail.Flags;
-import javax.mail.Folder;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Store;
-import javax.mail.internet.MimeMessage;
-import javax.mail.search.MessageIDTerm;
-import javax.mail.search.SearchTerm;
-import javax.mail.util.SharedByteArrayInputStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/network/src/main/java/de/muehlencord/shared/network/mail/MailMessage.java b/network/src/main/java/de/muehlencord/shared/network/mail/MailMessage.java
index 8396d5f..edf7bd1 100644
--- a/network/src/main/java/de/muehlencord/shared/network/mail/MailMessage.java
+++ b/network/src/main/java/de/muehlencord/shared/network/mail/MailMessage.java
@@ -15,12 +15,12 @@
  */
 package de.muehlencord.shared.network.mail;
 
+import jakarta.mail.Address;
+import jakarta.mail.internet.InternetAddress;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
-import javax.mail.Address;
-import javax.mail.internet.InternetAddress;
 
 /**
  * A mail message
diff --git a/network/src/main/java/de/muehlencord/shared/network/mail/MailMessageUtils.java b/network/src/main/java/de/muehlencord/shared/network/mail/MailMessageUtils.java
index cd98c60..5185b65 100644
--- a/network/src/main/java/de/muehlencord/shared/network/mail/MailMessageUtils.java
+++ b/network/src/main/java/de/muehlencord/shared/network/mail/MailMessageUtils.java
@@ -16,18 +16,19 @@
 package de.muehlencord.shared.network.mail;
 
 import static de.muehlencord.shared.util.StringUtil.getStackTraceString;
+
+import jakarta.mail.BodyPart;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Multipart;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringWriter;
 import java.util.Locale;
-import javax.mail.BodyPart;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/network/src/main/java/de/muehlencord/shared/network/mail/imap/ImapMailReader.java b/network/src/main/java/de/muehlencord/shared/network/mail/imap/ImapMailReader.java
index fc18ee1..301671b 100644
--- a/network/src/main/java/de/muehlencord/shared/network/mail/imap/ImapMailReader.java
+++ b/network/src/main/java/de/muehlencord/shared/network/mail/imap/ImapMailReader.java
@@ -19,7 +19,7 @@ import de.muehlencord.shared.network.mail.DefaultMailReader;
 import de.muehlencord.shared.network.mail.MailProtocol;
 import de.muehlencord.shared.network.mail.MailReaderConfiguration;
 import de.muehlencord.shared.network.mail.MailReaderConnectionException;
-import javax.mail.Session;
+import jakarta.mail.Session;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/network/src/test/java/de/muehlencord/shared/network/mail/TestSendMail.java b/network/src/test/java/de/muehlencord/shared/network/mail/TestSendMail.java
index 3cebecf..5d8ed62 100644
--- a/network/src/test/java/de/muehlencord/shared/network/mail/TestSendMail.java
+++ b/network/src/test/java/de/muehlencord/shared/network/mail/TestSendMail.java
@@ -15,6 +15,19 @@
  */
 package de.muehlencord.shared.network.mail;
 
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Multipart;
+import jakarta.mail.PasswordAuthentication;
+import jakarta.mail.Session;
+import jakarta.mail.Transport;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -22,18 +35,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.PasswordAuthentication;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -63,7 +64,7 @@ public class TestSendMail {
         props.put("mail.smtp.port", "587");
         props.put("mail.debug", "true");
 
-        Session mailSession = Session.getInstance(props, new javax.mail.Authenticator() {
+        Session mailSession = Session.getInstance(props, new jakarta.mail.Authenticator() {
             @Override
             protected PasswordAuthentication getPasswordAuthentication() {
                 return new PasswordAuthentication(RECEIVER, PASSWORD);
diff --git a/pom.xml b/pom.xml
index ee4d6d8..a12875a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,24 +79,36 @@ limitations under the License.
     <maven.compiler.release>17</maven.compiler.release>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <slf4j.version>2.0.6</slf4j.version>
-    <jackson.version>2.14.2</jackson.version>
-    <lombok.version>1.18.26</lombok.version>
-    <junit.version>5.9.2</junit.version>
+    <slf4j.version>2.0.12</slf4j.version>
+    <jackson.version>2.16.1</jackson.version>
+    <lombok.version>1.18.30</lombok.version>
+    <junit.version>5.10.2</junit.version>
 
-    <poi.version>5.2.3</poi.version>
-    <commons-net.version>3.9.0</commons-net.version>
-    <commons-lang.version>3.12.0</commons-lang.version>
+    <poi.version>5.2.5</poi.version>
+    <commons-net.version>3.10.0</commons-net.version>
+    <commons-lang.version>3.14.0</commons-lang.version>
     <gson.version>2.10.1</gson.version>
-    <fusionauth.version>5.2.2</fusionauth.version>
+    <fusionauth.version>5.3.1</fusionauth.version>
     <bouncycastle.version>1.70</bouncycastle.version>
     <hibernate.version>6.1.7.Final</hibernate.version>
-    <com-sun-mail.version>1.6.2</com-sun-mail.version>
+    <jakarta.mail-api.version>2.1.2</jakarta.mail-api.version>
+    <ews-java-api.version>2.0</ews-java-api.version>
+    <scrypt.version>1.4.0</scrypt.version>
 
-    <jakarta-faces.version>4.0.4</jakarta-faces.version>
-    <joinfaces.version>5.1.4</joinfaces.version>
+    <jakarta-faces.version>4.0.5</jakarta-faces.version>
+    <joinfaces.version>5.1.8</joinfaces.version>
     <jakarta.interceptor-api.version>2.1.0</jakarta.interceptor-api.version>
-    <jakarta-inject-api.version>2.0.0</jakarta-inject-api.version>
+    <jakarta-inject-api.version>2.0.1</jakarta-inject-api.version>
+
+    <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
+    <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
+    <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+    <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
+    <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
+    <maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
+    <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
+    <license-maven-plugin.version>1.14</license-maven-plugin.version>
+
   </properties>
 
   <dependencyManagement>
@@ -156,14 +168,15 @@ limitations under the License.
 
       <!-- mail -->
       <dependency>
-        <artifactId>javax.mail</artifactId>
-        <groupId>com.sun.mail</groupId>
-        <version>${com-sun-mail.version}</version>
+        <groupId>jakarta.mail</groupId>
+        <artifactId>jakarta.mail-api</artifactId>
+        <version>${jakarta.mail-api.version}</version>
       </dependency>
+
       <dependency>
         <artifactId>ews-java-api</artifactId>
         <groupId>com.microsoft.ews-java-api</groupId>
-        <version>2.0</version>
+        <version>${ews-java-api.version}</version>
       </dependency>
 
       <!-- Faces -->
@@ -210,7 +223,7 @@ limitations under the License.
       <dependency>
         <artifactId>scrypt</artifactId>
         <groupId>com.lambdaworks</groupId>
-        <version>1.4.0</version>
+        <version>${scrypt.version}</version>
       </dependency>
       <dependency>
         <artifactId>bcprov-jdk15on</artifactId>
@@ -267,7 +280,7 @@ limitations under the License.
             </configuration>
             <extensions>true</extensions>
             <groupId>org.sonatype.plugins</groupId>
-            <version>1.6.8</version>
+            <version>${nexus-staging-maven-plugin.version}</version>
           </plugin>
 
           <!-- ensure sources are build so they are also uploaded -->
@@ -297,7 +310,7 @@ limitations under the License.
               </execution>
             </executions>
             <groupId>org.apache.maven.plugins</groupId>
-            <version>3.1.1</version>
+            <version>${maven-javadoc-plugin.version}</version>
           </plugin>
 
           <!-- create license file -->
@@ -321,7 +334,7 @@ limitations under the License.
               </execution>
             </executions>
             <groupId>org.codehaus.mojo</groupId>
-            <version>1.14</version>
+            <version>${license-maven-plugin.version}</version>
           </plugin>
 
           <!-- sign jar archives -->
@@ -340,7 +353,7 @@ limitations under the License.
               </execution>
             </executions>
             <groupId>org.apache.maven.plugins</groupId>
-            <version>1.6</version>
+            <version>${maven-gpg-plugin.version}</version>
           </plugin>
         </plugins>
       </build>
@@ -360,27 +373,20 @@ limitations under the License.
             <target>${maven.compiler.target}</target>
           </configuration>
           <groupId>org.apache.maven.plugins</groupId>
-          <version>3.8.1</version>
-        </plugin>
-
-        <!-- build maven ejb artifacts -->
-        <plugin>
-          <artifactId>maven-ejb-plugin</artifactId>
-          <groupId>org.apache.maven.plugins</groupId>
-          <version>3.0.1</version>
+          <version>${maven-compiler-plugin.version}</version>
         </plugin>
 
         <!-- create new releases -->
         <plugin>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.5.3</version>
+          <version>${maven-release-plugin.version}</version>
         </plugin>
 
         <!-- control junit tests from maven build -->
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
           <groupId>org.apache.maven.plugins</groupId>
-          <version>2.22.2</version>
+          <version>${maven-surefire-plugin.version}</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -397,7 +403,6 @@ limitations under the License.
         <configuration>
           <tagNameFormat>v@{project.version}</tagNameFormat>
         </configuration>
-        <version>2.5.3</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -407,7 +412,7 @@ limitations under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.6.1</version>
+        <version>${maven-dependency-plugin.version}</version>
       </plugin>
     </plugins>
   </build>