From ce593f60e829b493370d89234a1866d69c2aeb9e Mon Sep 17 00:00:00 2001
From: ophiuhus <ophiuhus@ukr.net>
Date: Mon, 7 Oct 2024 21:31:56 +0300
Subject: [PATCH] Upgraded subethasmtp to the jakarta version

---
 milton-mail-server/pom.xml                    |  4 ++--
 milton-proxy/pom.xml                          | 20 +++++++++++++++++++
 .../davproxy/adapter/RemoteManager.java       |  5 ++---
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/milton-mail-server/pom.xml b/milton-mail-server/pom.xml
index 2d25c361..d3ccc397 100644
--- a/milton-mail-server/pom.xml
+++ b/milton-mail-server/pom.xml
@@ -28,8 +28,8 @@
             <version>2.2.1</version>
         </dependency>
         <dependency>
-            <groupId>org.subethamail</groupId>
-            <artifactId>subethasmtp</artifactId>
+            <groupId>io.github.frshdn</groupId>
+            <artifactId>subethasmtp-java17</artifactId>
             <version>3.1.7</version>
         </dependency>
         <dependency>
diff --git a/milton-proxy/pom.xml b/milton-proxy/pom.xml
index 2559751c..ce345fd2 100644
--- a/milton-proxy/pom.xml
+++ b/milton-proxy/pom.xml
@@ -23,11 +23,31 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>milton-server-ce</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>jakarta.inject</groupId>
+                    <artifactId>jakarta.inject-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.mail</groupId>
+                    <artifactId>jakarta.mail</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jakarta.activation</artifactId>
+                    <groupId>com.sun.activation</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>milton-client</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 </project>
diff --git a/milton-proxy/src/main/java/io/milton/davproxy/adapter/RemoteManager.java b/milton-proxy/src/main/java/io/milton/davproxy/adapter/RemoteManager.java
index 7bd338c0..319b422c 100644
--- a/milton-proxy/src/main/java/io/milton/davproxy/adapter/RemoteManager.java
+++ b/milton-proxy/src/main/java/io/milton/davproxy/adapter/RemoteManager.java
@@ -27,7 +27,6 @@
 import io.milton.davproxy.content.FolderHtmlContentGenerator;
 import io.milton.httpclient.Folder;
 import io.milton.httpclient.HttpException;
-import io.milton.resource.Resource;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -67,7 +66,7 @@ public io.milton.resource.Resource adapt(String hostName, io.milton.httpclient.R
 
     public void copyTo(io.milton.httpclient.Resource remoteResource, String destName, Folder destRemoteFolder) throws RuntimeException, ConflictException, BadRequestException, NotAuthorizedException {
         try {
-            if (destName.equals(remoteResource.name)) { // this is the normal case, copy with no rename                
+            if (destName.equals(remoteResource.name)) { // this is the normal case, copy with no rename
                 remoteResource.copyTo(destRemoteFolder);
             } else {    // its possible to request a copy with a new name
                 remoteResource.copyTo(destRemoteFolder, destName);
@@ -81,7 +80,7 @@ public void copyTo(io.milton.httpclient.Resource remoteResource, String destName
 
     public void moveTo(io.milton.httpclient.Resource remoteResource, String destName, Folder destRemoteFolder) throws NotAuthorizedException, ConflictException, BadRequestException {
         try {
-            if (destName.equals(remoteResource.name)) { // this is the normal case, move with no rename                
+            if (destName.equals(remoteResource.name)) { // this is the normal case, move with no rename
                 remoteResource.moveTo(destRemoteFolder);
             } else {    // its possible to request a copy with a new name
                 remoteResource.moveTo(destRemoteFolder, destName);