7 Commits

Author SHA1 Message Date
12c1ff879b removed obsolete settings 2023-12-10 22:23:50 +01:00
db42afb4da Merge branch 'develop' into feature/jakrtaee10 2023-12-10 22:22:57 +01:00
954444bdfc updated dependencies 2023-12-10 22:21:52 +01:00
fc81092752 prepare release 2023-12-10 22:03:12 +01:00
613a74ca92 update dependencies 2023-11-02 23:06:05 +01:00
55655a5de2 started to migrate to Jakarta EE 10 2023-10-25 13:10:38 +02:00
66be348fd3 prepare version 2.0.0
remove shiro support
2023-10-25 12:07:05 +02:00
12 changed files with 63 additions and 70 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.1-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<name>shared-configuration</name> <name>shared-configuration</name>

View File

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

View File

@ -15,12 +15,13 @@ See the License for the specific language governing permissions and
limitations under the License. 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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<groupId>de.muehlencord</groupId> <groupId>de.muehlencord</groupId>
<version>2.0.1-SNAPSHOT</version> <version>2.0.0-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.1-SNAPSHOT</version> <version>2.0.0-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.1-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<dependencies> <dependencies>
@ -49,8 +49,8 @@ limitations under the License.
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.mail</groupId> <artifactId>javax.mail</artifactId>
<artifactId>jakarta.mail-api</artifactId> <groupId>com.sun.mail</groupId>
</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,19 +16,18 @@
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 jakarta.mail.Session; import javax.mail.Session;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -15,19 +15,6 @@
*/ */
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;
@ -35,6 +22,18 @@ 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;
@ -64,7 +63,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 jakarta.mail.Authenticator() { Session mailSession = Session.getInstance(props, new javax.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.1-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<version>2.0.1-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</project> </project>

41
pom.xml
View File

@ -20,7 +20,7 @@ limitations under the License.
<groupId>de.muehlencord</groupId> <groupId>de.muehlencord</groupId>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<version>2.0.1-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<name>shared</name> <name>shared</name>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -88,35 +88,28 @@ 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.18.1</jackson.version> <jackson.version>2.16.0</jackson.version>
<lombok.version>1.18.34</lombok.version> <lombok.version>1.18.30</lombok.version>
<junit.version>5.11.3</junit.version> <junit.version>5.10.1</junit.version>
<poi.version>5.3.0</poi.version> <poi.version>5.2.5</poi.version>
<commons-net.version>3.11.1</commons-net.version> <commons-net.version>3.10.0</commons-net.version>
<commons-lang.version>3.17.0</commons-lang.version> <commons-lang.version>3.14.0</commons-lang.version>
<gson.version>2.11.0</gson.version> <gson.version>2.10.1</gson.version>
<fusionauth.version>5.3.3</fusionauth.version> <fusionauth.version>5.3.1</fusionauth.version>
<bouncycastle.version>1.70</bouncycastle.version> <bouncycastle.version>1.70</bouncycastle.version>
<hibernate.version>7.0.0.Beta1</hibernate.version> <hibernate.version>6.2.15.Final</hibernate.version>
<jakarta.mail.version>2.1.3</jakarta.mail.version> <com-sun-mail.version>1.6.2</com-sun-mail.version>
<jakarta-faces.version>4.1.1</jakarta-faces.version> <jakarta-faces.version>4.0.5</jakarta-faces.version>
<joinfaces.version>5.3.5</joinfaces.version> <joinfaces.version>5.1.6</joinfaces.version>
<jakarta.interceptor-api.version>2.2.0</jakarta.interceptor-api.version> <jakarta.interceptor-api.version>2.1.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>
@ -172,9 +165,9 @@ limitations under the License.
<!-- mail --> <!-- mail -->
<dependency> <dependency>
<groupId>jakarta.mail</groupId> <artifactId>javax.mail</artifactId>
<artifactId>jakarta.mail-api</artifactId> <groupId>com.sun.mail</groupId>
<version>${jakarta.mail.version}</version> <version>${com-sun-mail.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>ews-java-api</artifactId> <artifactId>ews-java-api</artifactId>

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.1-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>