6 Commits

12 changed files with 94 additions and 79 deletions

View File

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

View File

@ -15,8 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License. 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> <modelVersion>4.0.0</modelVersion>
<groupId>de.muehlencord.shared</groupId> <groupId>de.muehlencord.shared</groupId>
@ -26,7 +25,7 @@ limitations under the License.
<parent> <parent>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<groupId>de.muehlencord</groupId> <groupId>de.muehlencord</groupId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.1-SNAPSHOT</version>
</parent> </parent>
<name>shared-db</name> <name>shared-db</name>

View File

@ -15,13 +15,12 @@ See the License for the specific language governing permissions and
limitations under the License. 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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<groupId>de.muehlencord</groupId> <groupId>de.muehlencord</groupId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.1-SNAPSHOT</version>
</parent> </parent>
<groupId>de.muehlencord.shared</groupId> <groupId>de.muehlencord.shared</groupId>

View File

@ -25,7 +25,7 @@ limitations under the License.
<parent> <parent>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<groupId>de.muehlencord</groupId> <groupId>de.muehlencord</groupId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.1-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -33,7 +33,7 @@ limitations under the License.
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
<version>2.0.0-SNAPSHOT</version> <version>2.0.1-SNAPSHOT</version>
<dependencies> <dependencies>
@ -49,8 +49,8 @@ limitations under the License.
</dependency> </dependency>
<dependency> <dependency>
<artifactId>javax.mail</artifactId> <groupId>jakarta.mail</groupId>
<groupId>com.sun.mail</groupId> <artifactId>jakarta.mail-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>ews-java-api</artifactId> <artifactId>ews-java-api</artifactId>

View File

@ -16,20 +16,20 @@
package de.muehlencord.shared.network.mail; package de.muehlencord.shared.network.mail;
import de.muehlencord.shared.util.StringUtil; 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.io.ByteArrayOutputStream;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Properties; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -15,12 +15,12 @@
*/ */
package de.muehlencord.shared.network.mail; package de.muehlencord.shared.network.mail;
import jakarta.mail.Address;
import jakarta.mail.internet.InternetAddress;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import javax.mail.Address;
import javax.mail.internet.InternetAddress;
/** /**
* A mail message * A mail message

View File

@ -16,18 +16,19 @@
package de.muehlencord.shared.network.mail; package de.muehlencord.shared.network.mail;
import static de.muehlencord.shared.util.StringUtil.getStackTraceString; 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.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.Reader; import java.io.Reader;
import java.io.StringWriter; import java.io.StringWriter;
import java.util.Locale; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -19,7 +19,7 @@ import de.muehlencord.shared.network.mail.DefaultMailReader;
import de.muehlencord.shared.network.mail.MailProtocol; import de.muehlencord.shared.network.mail.MailProtocol;
import de.muehlencord.shared.network.mail.MailReaderConfiguration; import de.muehlencord.shared.network.mail.MailReaderConfiguration;
import de.muehlencord.shared.network.mail.MailReaderConnectionException; import de.muehlencord.shared.network.mail.MailReaderConnectionException;
import javax.mail.Session; import jakarta.mail.Session;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -15,6 +15,19 @@
*/ */
package de.muehlencord.shared.network.mail; 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.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
@ -22,18 +35,6 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Properties; 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.junit.jupiter.api.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -63,7 +64,7 @@ public class TestSendMail {
props.put("mail.smtp.port", "587"); props.put("mail.smtp.port", "587");
props.put("mail.debug", "true"); props.put("mail.debug", "true");
Session mailSession = Session.getInstance(props, new javax.mail.Authenticator() { Session mailSession = Session.getInstance(props, new jakarta.mail.Authenticator() {
@Override @Override
protected PasswordAuthentication getPasswordAuthentication() { protected PasswordAuthentication getPasswordAuthentication() {
return new PasswordAuthentication(RECEIVER, PASSWORD); return new PasswordAuthentication(RECEIVER, PASSWORD);

View File

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

81
pom.xml
View File

@ -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"> <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> <modelVersion>4.0.0</modelVersion>
<groupId>de.muehlencord</groupId>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.1-SNAPSHOT</version>
<name>shared</name> <name>shared</name>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -54,17 +55,24 @@ limitations under the License.
<url>https://jomu.timelord.de/git/jomu/shared/</url> <url>https://jomu.timelord.de/git/jomu/shared/</url>
</scm> </scm>
<repositories>
<repository>
<id>gitea</id>
<url>https://jomu.timelord.de/git/api/packages/jomu/maven</url>
</repository>
</repositories>
<distributionManagement> <distributionManagement>
<repository> <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> </repository>
<snapshotRepository> <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> </snapshotRepository>
</distributionManagement> </distributionManagement>
<groupId>de.muehlencord</groupId>
<issueManagement> <issueManagement>
<system>Gitea</system> <system>Gitea</system>
@ -80,28 +88,35 @@ limitations under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<slf4j.version>2.0.9</slf4j.version> <slf4j.version>2.0.9</slf4j.version>
<jackson.version>2.16.0</jackson.version> <jackson.version>2.18.1</jackson.version>
<lombok.version>1.18.30</lombok.version> <lombok.version>1.18.34</lombok.version>
<junit.version>5.10.1</junit.version> <junit.version>5.11.3</junit.version>
<poi.version>5.2.5</poi.version> <poi.version>5.3.0</poi.version>
<commons-net.version>3.10.0</commons-net.version> <commons-net.version>3.11.1</commons-net.version>
<commons-lang.version>3.14.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.3.1</fusionauth.version> <fusionauth.version>5.3.3</fusionauth.version>
<bouncycastle.version>1.70</bouncycastle.version> <bouncycastle.version>1.70</bouncycastle.version>
<hibernate.version>6.2.15.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.5</jakarta-faces.version> <jakarta-faces.version>4.1.1</jakarta-faces.version>
<joinfaces.version>5.1.6</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.1</jakarta-inject-api.version> <jakarta-inject-api.version>2.0.1</jakarta-inject-api.version>
<jaxws-api.version>2.3.1</jaxws-api.version> <jaxws-api.version>2.3.1</jaxws-api.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>org.joinfaces</groupId>
<artifactId>joinfaces-bom</artifactId>
<version>${joinfaces.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency> <dependency>
<groupId>org.joinfaces</groupId> <groupId>org.joinfaces</groupId>
<artifactId>joinfaces-dependencies</artifactId> <artifactId>joinfaces-dependencies</artifactId>
@ -157,9 +172,9 @@ limitations under the License.
<!-- mail --> <!-- mail -->
<dependency> <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>
<dependency> <dependency>
<artifactId>ews-java-api</artifactId> <artifactId>ews-java-api</artifactId>
@ -264,17 +279,17 @@ limitations under the License.
<build> <build>
<plugins> <plugins>
<!-- deploy artifacts to maven repository --> <!-- 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 --> <!-- ensure sources are build so they are also uploaded -->
<plugin> <plugin>

View File

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