update dependencies

started to migrate to Jakarta EE 10
prepare version 2.0.0
2023-11-02 23:06:05 +01:00 · 2023-10-25 13:10:38 +02:00 · 2023-10-25 12:07:05 +02:00
14 changed files with 151 additions and 137 deletions
--- a/_bin/createRelease.bat
+++ b/_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"
--- a/configuration/pom.xml
+++ b/configuration/pom.xml
@ -24,7 +24,7 @@ limitations under the License.
    <parent>
        <artifactId>shared</artifactId>
        <groupId>de.muehlencord</groupId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
    </parent>    

    <name>shared-configuration</name>
--- a/db/pom.xml
+++ b/db/pom.xml
@ -15,17 +15,18 @@ 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>
  <artifactId>shared-db</artifactId>
-  <packaging>jar</packaging>
+  <packaging>ejb</packaging>

  <parent>
    <artifactId>shared</artifactId>
    <groupId>de.muehlencord</groupId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
  </parent>

  <name>shared-db</name>
--- a/jeeutil/pom.xml
+++ b/jeeutil/pom.xml
@ -15,17 +15,18 @@ 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.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
  </parent>

  <groupId>de.muehlencord.shared</groupId>
  <artifactId>shared-jeeutil</artifactId>
-  <packaging>jar</packaging>
+  <packaging>ejb</packaging>

  <name>shared-jeeutil</name>

--- a/network/nb-configuration.xml
+++ b/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>
--- a/network/pom.xml
+++ b/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>
-  <modelVersion>4.0.0</modelVersion>
-  <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>
-
+  <build>
+    <finalName>${project.artifactId}</finalName>
+  </build>
  <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>
-      <groupId>jakarta.mail</groupId>
-      <artifactId>jakarta.mail-api</artifactId>
+      <artifactId>javax.mail</artifactId>
+      <groupId>com.sun.mail</groupId>
    </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>
-
-    <!-- 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>
+      <version>2.3.1</version>
    </dependency>
  </dependencies>
+  <groupId>de.muehlencord.shared</groupId>
+  <modelVersion>4.0.0</modelVersion>
+  <name>shared-network</name>

-  <build>
-    <finalName>${project.artifactId}</finalName>
-  </build>
+  <packaging>jar</packaging>
+
+  <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>
--- 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;

--- 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
--- 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,19 +16,18 @@
 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;

--- 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 jakarta.mail.Session;
+import javax.mail.Session;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

--- 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,19 +15,6 @@
 */
 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;
@ -35,6 +22,18 @@ 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;
@ -64,7 +63,7 @@ public class TestSendMail {
        props.put("mail.smtp.port", "587");
        props.put("mail.debug", "true");

-      Session mailSession = Session.getInstance(props, new jakarta.mail.Authenticator() {
+        Session mailSession = Session.getInstance(props, new javax.mail.Authenticator() {
            @Override
            protected PasswordAuthentication getPasswordAuthentication() {
                return new PasswordAuthentication(RECEIVER, PASSWORD);
--- a/poi-util/pom.xml
+++ b/poi-util/pom.xml
@ -47,9 +47,9 @@ limitations under the License.
  <parent>
    <artifactId>shared</artifactId>
    <groupId>de.muehlencord</groupId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
  </parent>


-  <version>2.0.1-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
 </project>
--- a/pom.xml
+++ b/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.1-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
  <name>shared</name>
  <packaging>pom</packaging>

@ -55,24 +54,17 @@ 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>jomu-gitea</id>
-      <url>https://jomu.timelord.de/git/api/packages/jomu/maven</url>
+      <id>ossrh</id>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
    </repository>
    <snapshotRepository>
-      <id>jomu-gitea</id>
-      <url>https://jomu.timelord.de/git/api/packages/jomu/maven</url>
+      <id>ossrh</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
    </snapshotRepository>
  </distributionManagement>
-
+  <groupId>de.muehlencord</groupId>

  <issueManagement>
    <system>Gitea</system>
@ -88,35 +80,27 @@ limitations under the License.

    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    <slf4j.version>2.0.9</slf4j.version>
-    <jackson.version>2.18.1</jackson.version>
-    <lombok.version>1.18.34</lombok.version>
-    <junit.version>5.11.3</junit.version>
+    <jackson.version>2.15.0</jackson.version>
+    <lombok.version>1.18.30</lombok.version>
+    <junit.version>5.10.0</junit.version>

-    <poi.version>5.3.0</poi.version>
-    <commons-net.version>3.11.1</commons-net.version>
-    <commons-lang.version>3.17.0</commons-lang.version>
-    <gson.version>2.11.0</gson.version>
-    <fusionauth.version>5.3.3</fusionauth.version>
+    <poi.version>5.2.4</poi.version>
+    <commons-net.version>3.10.0</commons-net.version>
+    <commons-lang.version>3.13.0</commons-lang.version>
+    <gson.version>2.10.1</gson.version>
+    <fusionauth.version>5.3.0</fusionauth.version>
    <bouncycastle.version>1.70</bouncycastle.version>
-    <hibernate.version>7.0.0.Beta1</hibernate.version>
-    <jakarta.mail.version>2.1.3</jakarta.mail.version>
+    <hibernate.version>6.2.13.Final</hibernate.version>
+    <com-sun-mail.version>1.6.2</com-sun-mail.version>

-    <jakarta-faces.version>4.1.1</jakarta-faces.version>
-    <joinfaces.version>5.3.5</joinfaces.version>
-    <jakarta.interceptor-api.version>2.2.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>
+    <jakarta-faces.version>4.0.4</jakarta-faces.version>
+    <joinfaces.version>5.1.5</joinfaces.version>
+    <jakarta.interceptor-api.version>2.1.0</jakarta.interceptor-api.version>
+    <jakarta-inject-api.version>2.0.0</jakarta-inject-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>
@ -172,9 +156,9 @@ limitations under the License.

      <!-- mail -->
      <dependency>
-        <groupId>jakarta.mail</groupId>
-        <artifactId>jakarta.mail-api</artifactId>
-        <version>${jakarta.mail.version}</version>
+        <artifactId>javax.mail</artifactId>
+        <groupId>com.sun.mail</groupId>
+        <version>${com-sun-mail.version}</version>
      </dependency>
      <dependency>
        <artifactId>ews-java-api</artifactId>
@ -222,11 +206,6 @@ 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>
@ -279,17 +258,17 @@ limitations under the License.
      <build>
        <plugins>
          <!-- deploy artifacts to maven repository -->
-          <!--          <plugin>-->
-          <!--            <artifactId>nexus-staging-maven-plugin</artifactId>-->
-          <!--            <configuration>-->
-          <!--              <autoReleaseAfterClose>true</autoReleaseAfterClose>-->
-          <!--              <nexusUrl>https://oss.sonatype.org/</nexusUrl>-->
-          <!--              <serverId>ossrh</serverId>-->
-          <!--            </configuration>-->
-          <!--            <extensions>true</extensions>-->
-          <!--            <groupId>org.sonatype.plugins</groupId>-->
-          <!--            <version>1.6.8</version>-->
-          <!--          </plugin>-->
+          <plugin>
+            <artifactId>nexus-staging-maven-plugin</artifactId>
+            <configuration>
+              <autoReleaseAfterClose>true</autoReleaseAfterClose>
+              <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+              <serverId>ossrh</serverId>
+            </configuration>
+            <extensions>true</extensions>
+            <groupId>org.sonatype.plugins</groupId>
+            <version>1.6.8</version>
+          </plugin>

          <!-- ensure sources are build so they are also uploaded -->
          <plugin>
--- a/util/pom.xml
+++ b/util/pom.xml
@ -26,7 +26,7 @@ limitations under the License.
    <parent>
        <artifactId>shared</artifactId>
        <groupId>de.muehlencord</groupId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
    </parent>
Author	SHA1	Message	Date
Joern Muehlencord	613a74ca92	update dependencies	2023-11-02 23:06:05 +01:00
Joern Muehlencord	55655a5de2	started to migrate to Jakarta EE 10	2023-10-25 13:10:38 +02:00
Joern Muehlencord	66be348fd3	prepare version 2.0.0 remove shiro support	2023-10-25 12:07:05 +02:00