change to jakarta.mail

remove shiro support

_bin/createRelease.bat

@@ -0,0 +1,5 @@
+@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</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>    
 
     <name>shared-configuration</name>

db/pom.xml

@@ -15,7 +15,8 @@ See the License for the specific language governing permissions and
 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">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+  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>
@@ -25,7 +26,7 @@ limitations under the License.
   <parent>
     <artifactId>shared</artifactId>
     <groupId>de.muehlencord</groupId>
-    <version>2.0.0</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <name>shared-db</name>

jeeutil/pom.xml

@@ -15,12 +15,13 @@ See the License for the specific language governing permissions and
 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">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+  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</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>de.muehlencord.shared</groupId>

network/nb-configuration.xml

@@ -0,0 +1,34 @@
+<?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,41 +16,34 @@ 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>
 
-  <groupId>de.muehlencord.shared</groupId>
+  <build>
-  <modelVersion>4.0.0</modelVersion>
+    <finalName>${project.artifactId}</finalName>
-  <name>shared-network</name>
+  </build>
-
-  <packaging>jar</packaging>
-
-  <parent>
-    <artifactId>shared</artifactId>
-    <groupId>de.muehlencord</groupId>
-    <version>2.0.0</version>
-  </parent>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
-  <url>http://maven.apache.org</url>
-
-  <version>2.0.0</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>
@@ -67,22 +60,25 @@ limitations under the License.
       <artifactId>jaxws-api</artifactId>
       <groupId>javax.xml.ws</groupId>
       <scope>test</scope>
-    </dependency>
+      <version>2.3.1</version>
-
-    <!-- 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>
 
-  <build>
+  <packaging>jar</packaging>
-    <finalName>${project.artifactId}</finalName>
+
-  </build>
+  <parent>
+    <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</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
 
-  <version>2.0.0</version>
+  <version>2.0.0-SNAPSHOT</version>
 </project>

pom.xml

@@ -18,9 +18,8 @@ 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</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>shared</name>
   <packaging>pom</packaging>
 
@@ -51,28 +50,21 @@ limitations under the License.
   <scm>
     <connection>scm:git:git@jomu.timelord.de:jomu/shared.git</connection>
     <developerConnection>scm:git:git@jomu.timelord.de:jomu/shared.git</developerConnection>
-    <tag>v2.0.0</tag>
+    <tag>HEAD</tag>
     <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>jomu-gitea</id>
+      <id>ossrh</id>
-      <url>https://jomu.timelord.de/git/api/packages/jomu/maven</url>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
     </repository>
     <snapshotRepository>
-      <id>jomu-gitea</id>
+      <id>ossrh</id>
-      <url>https://jomu.timelord.de/git/api/packages/jomu/maven</url>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
     </snapshotRepository>
   </distributionManagement>
-
+  <groupId>de.muehlencord</groupId>
 
   <issueManagement>
     <system>Gitea</system>
@@ -87,10 +79,10 @@ limitations under the License.
     <maven.compiler.release>17</maven.compiler.release>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <slf4j.version>2.0.9</slf4j.version>
+    <slf4j.version>2.0.12</slf4j.version>
-    <jackson.version>2.16.0</jackson.version>
+    <jackson.version>2.16.1</jackson.version>
     <lombok.version>1.18.30</lombok.version>
-    <junit.version>5.10.1</junit.version>
+    <junit.version>5.10.2</junit.version>
 
     <poi.version>5.2.5</poi.version>
     <commons-net.version>3.10.0</commons-net.version>
@@ -98,14 +90,25 @@ limitations under the License.
     <gson.version>2.10.1</gson.version>
     <fusionauth.version>5.3.1</fusionauth.version>
     <bouncycastle.version>1.70</bouncycastle.version>
-    <hibernate.version>6.2.15.Final</hibernate.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.5</jakarta-faces.version>
-    <joinfaces.version>5.1.6</joinfaces.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.1</jakarta-inject-api.version>
-    <jaxws-api.version>2.3.1</jaxws-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>
@@ -165,14 +168,15 @@ 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-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 -->
@@ -215,16 +219,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>
         <groupId>com.lambdaworks</groupId>
-        <version>1.4.0</version>
+        <version>${scrypt.version}</version>
       </dependency>
       <dependency>
         <artifactId>bcprov-jdk15on</artifactId>
@@ -272,17 +271,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>${nexus-staging-maven-plugin.version}</version>
-          <!--          </plugin>-->
+          </plugin>
 
           <!-- ensure sources are build so they are also uploaded -->
           <plugin>
@@ -311,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 -->
@@ -335,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 -->
@@ -354,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>
@@ -374,27 +373,20 @@ limitations under the License.
             <target>${maven.compiler.target}</target>
           </configuration>
           <groupId>org.apache.maven.plugins</groupId>
-          <version>3.8.1</version>
+          <version>${maven-compiler-plugin.version}</version>
-        </plugin>
-
-        <!-- build maven ejb artifacts -->
-        <plugin>
-          <artifactId>maven-ejb-plugin</artifactId>
-          <groupId>org.apache.maven.plugins</groupId>
-          <version>3.0.1</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>
@@ -411,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>
@@ -421,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>

util/pom.xml

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