migrate to jakarta.mail

Co-authored-by: Joern Muehlencord <joern.muehlencord@vitroconnect.com>
Reviewed-on: https://jomu.timelord.de/git/jomu/shared/pulls/1

_bin/createRelease.bat

@@ -1,5 +0,0 @@
-@ECHO OFF
-setlocal
-set BASEPATH=%~dp0%
-cd  %BASEPATH%\..
-mvn release:clean release:prepare -Dmaven.test.skip=true -Darguments="-Dmaven.test.skip=true -DskipTests"

configuration/pom.xml

@@ -24,7 +24,7 @@ limitations under the License.
     <parent>
         <artifactId>shared</artifactId>
         <groupId>de.muehlencord</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>    
 
     <name>shared-configuration</name>

db/pom.xml

@@ -15,18 +15,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>de.muehlencord.shared</groupId>
   <artifactId>shared-db</artifactId>
-  <packaging>ejb</packaging>
+  <packaging>jar</packaging>
 
   <parent>
     <artifactId>shared</artifactId>
     <groupId>de.muehlencord</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.1-SNAPSHOT</version>
   </parent>
 
   <name>shared-db</name>

jeeutil/pom.xml

@@ -15,18 +15,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>shared</artifactId>
     <groupId>de.muehlencord</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.1-SNAPSHOT</version>
   </parent>
 
   <groupId>de.muehlencord.shared</groupId>
   <artifactId>shared-jeeutil</artifactId>
-  <packaging>ejb</packaging>
+  <packaging>jar</packaging>
 
   <name>shared-jeeutil</name>
 

network/nb-configuration.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2019 Joern Muehlencord (joern@muehlencord.de).
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <netbeans.compile.on.save>all</netbeans.compile.on.save>
-    </properties>
-</project-shared-configuration>

network/pom.xml

@@ -16,34 +16,41 @@ limitations under the License.
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <artifactId>shared-network</artifactId>
 
-  <build>
+  <groupId>de.muehlencord.shared</groupId>
-    <finalName>${project.artifactId}</finalName>
+  <modelVersion>4.0.0</modelVersion>
-  </build>
+  <name>shared-network</name>
+
+  <packaging>jar</packaging>
+
+  <parent>
+    <artifactId>shared</artifactId>
+    <groupId>de.muehlencord</groupId>
+    <version>2.0.1-SNAPSHOT</version>
+  </parent>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <url>http://maven.apache.org</url>
+
+  <version>2.0.1-SNAPSHOT</version>
+
   <dependencies>
-    <dependency>
+
-      <artifactId>junit-jupiter-engine</artifactId>
-      <groupId>org.junit.jupiter</groupId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <artifactId>slf4j-api</artifactId>
       <groupId>org.slf4j</groupId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
+
-      <artifactId>slf4j-jdk14</artifactId>
-      <groupId>org.slf4j</groupId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <artifactId>shared-util</artifactId>
       <groupId>de.muehlencord.shared</groupId>
-      <type>jar</type>
     </dependency>
 
     <dependency>
-      <artifactId>javax.mail</artifactId>
+      <groupId>jakarta.mail</groupId>
-      <groupId>com.sun.mail</groupId>
+      <artifactId>jakarta.mail-api</artifactId>
     </dependency>
     <dependency>
       <artifactId>ews-java-api</artifactId>
@@ -60,25 +67,22 @@ limitations under the License.
       <artifactId>jaxws-api</artifactId>
       <groupId>javax.xml.ws</groupId>
       <scope>test</scope>
-      <version>2.3.1</version>
+    </dependency>
+
+    <!-- Test -->
+    <dependency>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <artifactId>slf4j-jdk14</artifactId>
+      <groupId>org.slf4j</groupId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
-  <groupId>de.muehlencord.shared</groupId>
-  <modelVersion>4.0.0</modelVersion>
-  <name>shared-network</name>
 
-  <packaging>jar</packaging>
+  <build>
-
+    <finalName>${project.artifactId}</finalName>
-  <parent>
+  </build>
-    <artifactId>shared</artifactId>
-    <groupId>de.muehlencord</groupId>
-    <version>2.0.0-SNAPSHOT</version>
-  </parent>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
-  <url>http://maven.apache.org</url>
-
-  <version>2.0.0-SNAPSHOT</version>
 </project>

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;
 

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

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;
 

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;
 

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);

poi-util/pom.xml

@@ -47,9 +47,9 @@ limitations under the License.
   <parent>
     <artifactId>shared</artifactId>
     <groupId>de.muehlencord</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.1-SNAPSHOT</version>
   </parent>
 
 
-  <version>2.0.0-SNAPSHOT</version>
+  <version>2.0.1-SNAPSHOT</version>
 </project>

pom.xml

@@ -18,8 +18,9 @@ limitations under the License.
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+  <groupId>de.muehlencord</groupId>
   <artifactId>shared</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>2.0.1-SNAPSHOT</version>
   <name>shared</name>
   <packaging>pom</packaging>
 
@@ -54,17 +55,24 @@ limitations under the License.
     <url>https://jomu.timelord.de/git/jomu/shared/</url>
   </scm>
 
+  <repositories>
+    <repository>
+      <id>gitea</id>
+      <url>https://jomu.timelord.de/git/api/packages/jomu/maven</url>
+    </repository>
+  </repositories>
+
   <distributionManagement>
     <repository>
-      <id>ossrh</id>
+      <id>jomu-gitea</id>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+      <url>https://jomu.timelord.de/git/api/packages/jomu/maven</url>
     </repository>
     <snapshotRepository>
-      <id>ossrh</id>
+      <id>jomu-gitea</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <url>https://jomu.timelord.de/git/api/packages/jomu/maven</url>
     </snapshotRepository>
   </distributionManagement>
-  <groupId>de.muehlencord</groupId>
+
 
   <issueManagement>
     <system>Gitea</system>
@@ -79,28 +87,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>
+    <slf4j.version>2.0.9</slf4j.version>
-    <jackson.version>2.14.2</jackson.version>
+    <jackson.version>2.18.1</jackson.version>
-    <lombok.version>1.18.26</lombok.version>
+    <lombok.version>1.18.34</lombok.version>
-    <junit.version>5.9.2</junit.version>
+    <junit.version>5.11.3</junit.version>
 
-    <poi.version>5.2.3</poi.version>
+    <poi.version>5.3.0</poi.version>
-    <commons-net.version>3.9.0</commons-net.version>
+    <commons-net.version>3.11.1</commons-net.version>
-    <commons-lang.version>3.12.0</commons-lang.version>
+    <commons-lang.version>3.17.0</commons-lang.version>
-    <gson.version>2.10.1</gson.version>
+    <gson.version>2.11.0</gson.version>
-    <fusionauth.version>5.2.2</fusionauth.version>
+    <fusionauth.version>5.3.3</fusionauth.version>
     <bouncycastle.version>1.70</bouncycastle.version>
-    <hibernate.version>6.1.7.Final</hibernate.version>
+    <hibernate.version>7.0.0.Beta1</hibernate.version>
-    <com-sun-mail.version>1.6.2</com-sun-mail.version>
+    <jakarta.mail.version>2.1.3</jakarta.mail.version>
 
-    <jakarta-faces.version>4.0.4</jakarta-faces.version>
+    <jakarta-faces.version>4.1.1</jakarta-faces.version>
-    <joinfaces.version>5.1.4</joinfaces.version>
+    <joinfaces.version>5.3.5</joinfaces.version>
-    <jakarta.interceptor-api.version>2.1.0</jakarta.interceptor-api.version>
+    <jakarta.interceptor-api.version>2.2.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>
+    <jaxws-api.version>2.3.1</jaxws-api.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.joinfaces</groupId>
+        <artifactId>joinfaces-bom</artifactId>
+        <version>${joinfaces.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.joinfaces</groupId>
         <artifactId>joinfaces-dependencies</artifactId>
@@ -156,9 +172,9 @@ limitations under the License.
 
       <!-- mail -->
       <dependency>
-        <artifactId>javax.mail</artifactId>
+        <groupId>jakarta.mail</groupId>
-        <groupId>com.sun.mail</groupId>
+        <artifactId>jakarta.mail-api</artifactId>
-        <version>${com-sun-mail.version}</version>
+        <version>${jakarta.mail.version}</version>
       </dependency>
       <dependency>
         <artifactId>ews-java-api</artifactId>
@@ -206,6 +222,11 @@ limitations under the License.
         <groupId>com.fasterxml.jackson.datatype</groupId>
         <version>${jackson.version}</version>
       </dependency>
+      <dependency>
+        <artifactId>jaxws-api</artifactId>
+        <groupId>javax.xml.ws</groupId>
+        <version>${jaxws-api.version}</version>
+      </dependency>
 
       <dependency>
         <artifactId>scrypt</artifactId>
@@ -258,17 +279,17 @@ limitations under the License.
       <build>
         <plugins>
           <!-- deploy artifacts to maven repository -->
-          <plugin>
+          <!--          <plugin>-->
-            <artifactId>nexus-staging-maven-plugin</artifactId>
+          <!--            <artifactId>nexus-staging-maven-plugin</artifactId>-->
-            <configuration>
+          <!--            <configuration>-->
-              <autoReleaseAfterClose>true</autoReleaseAfterClose>
+          <!--              <autoReleaseAfterClose>true</autoReleaseAfterClose>-->
-              <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+          <!--              <nexusUrl>https://oss.sonatype.org/</nexusUrl>-->
-              <serverId>ossrh</serverId>
+          <!--              <serverId>ossrh</serverId>-->
-            </configuration>
+          <!--            </configuration>-->
-            <extensions>true</extensions>
+          <!--            <extensions>true</extensions>-->
-            <groupId>org.sonatype.plugins</groupId>
+          <!--            <groupId>org.sonatype.plugins</groupId>-->
-            <version>1.6.8</version>
+          <!--            <version>1.6.8</version>-->
-          </plugin>
+          <!--          </plugin>-->
 
           <!-- ensure sources are build so they are also uploaded -->
           <plugin>

util/pom.xml

@@ -26,7 +26,7 @@ limitations under the License.
     <parent>
         <artifactId>shared</artifactId>
         <groupId>de.muehlencord</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>