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.
de.muehlencord.shared
shared-db
- ejb
+ jar
shared
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.
de.muehlencord.shared
shared-jeeutil
- ejb
+ jar
shared-jeeutil
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.
- javax.mail
- com.sun.mail
+ jakarta.mail
+ jakarta.mail-api
ews-java-api
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.
17
UTF-8
- 2.0.6
- 2.14.2
- 1.18.26
- 5.9.2
+ 2.0.12
+ 2.16.1
+ 1.18.30
+ 5.10.2
- 5.2.3
- 3.9.0
- 3.12.0
+ 5.2.5
+ 3.10.0
+ 3.14.0
2.10.1
- 5.2.2
+ 5.3.1
1.70
6.1.7.Final
- 1.6.2
+ 2.1.2
+ 2.0
+ 1.4.0
- 4.0.4
- 5.1.4
+ 4.0.5
+ 5.1.8
2.1.0
- 2.0.0
+ 2.0.1
+
+ 3.1.1
+ 1.6
+ 3.8.1
+ 2.5.3
+ 2.22.2
+ 3.6.1
+ 1.6.8
+ 1.14
+
@@ -156,14 +168,15 @@ limitations under the License.
- javax.mail
- com.sun.mail
- ${com-sun-mail.version}
+ jakarta.mail
+ jakarta.mail-api
+ ${jakarta.mail-api.version}
+
ews-java-api
com.microsoft.ews-java-api
- 2.0
+ ${ews-java-api.version}
@@ -210,7 +223,7 @@ limitations under the License.
scrypt
com.lambdaworks
- 1.4.0
+ ${scrypt.version}
bcprov-jdk15on
@@ -267,7 +280,7 @@ limitations under the License.
true
org.sonatype.plugins
- 1.6.8
+ ${nexus-staging-maven-plugin.version}
@@ -297,7 +310,7 @@ limitations under the License.
org.apache.maven.plugins
- 3.1.1
+ ${maven-javadoc-plugin.version}
@@ -321,7 +334,7 @@ limitations under the License.
org.codehaus.mojo
- 1.14
+ ${license-maven-plugin.version}
@@ -340,7 +353,7 @@ limitations under the License.
org.apache.maven.plugins
- 1.6
+ ${maven-gpg-plugin.version}
@@ -360,27 +373,20 @@ limitations under the License.
${maven.compiler.target}
org.apache.maven.plugins
- 3.8.1
-
-
-
-
- maven-ejb-plugin
- org.apache.maven.plugins
- 3.0.1
+ ${maven-compiler-plugin.version}
maven-release-plugin
- 2.5.3
+ ${maven-release-plugin.version}
maven-surefire-plugin
org.apache.maven.plugins
- 2.22.2
+ ${maven-surefire-plugin.version}
@@ -397,7 +403,6 @@ limitations under the License.
v@{project.version}
- 2.5.3
org.apache.maven.plugins
@@ -407,7 +412,7 @@ limitations under the License.
org.apache.maven.plugins
maven-dependency-plugin
- 3.6.1
+ ${maven-dependency-plugin.version}