Update James SHA-1

tmail-backend/apps/distributed/src/main/java/com/linagora/tmail/james/app/DistributedServer.java

@@ -9,7 +9,6 @@
 import java.util.Set;
 
 import javax.inject.Named;
-import javax.mail.Flags;
 
 import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.commons.lang3.NotImplementedException;
@@ -173,6 +172,7 @@
 import com.linagora.tmail.webadmin.archival.InboxArchivalTaskModule;
 import com.linagora.tmail.webadmin.cleanup.MailboxesCleanupModule;
 
+import jakarta.mail.Flags;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 

tmail-backend/integration-tests/jmap/jmap-integration-tests-common/pom.xml

@@ -49,10 +49,20 @@
             <groupId>${james.groupId}</groupId>
             <artifactId>jmap-rfc-8621-integration-tests-common</artifactId>
         </dependency>
-      <dependency>
-        <groupId>net.javacrumbs.json-unit</groupId>
-        <artifactId>json-unit</artifactId>
-      </dependency>
+        <dependency>
+            <groupId>net.javacrumbs.json-unit</groupId>
+            <artifactId>json-unit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mock-server</groupId>
+            <artifactId>mockserver-netty</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.sun.mail</groupId>
+                    <artifactId>mailapi</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

tmail-backend/integration-tests/rspamd/rspamd-integration-tests-common/src/main/java/com/linagora/tmail/integration/RspamdScannerIntegrationContract.java

@@ -6,8 +6,6 @@
 import java.io.IOException;
 import java.time.Duration;
 
-import javax.mail.internet.MimeMessage;
-
 import org.apache.james.GuiceJamesServer;
 import org.apache.james.core.Domain;
 import org.apache.james.core.Username;
@@ -27,6 +25,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import jakarta.mail.internet.MimeMessage;
+
 public abstract class RspamdScannerIntegrationContract {
     protected static final Domain DOMAIN = Domain.of("example.com");
     protected static final Username BOB = Username.fromLocalPartWithDomain("bob", DOMAIN);

tmail-backend/integration-tests/webadmin/webadmin-integration-tests-common/src/main/java/com/linagora/tmail/integration/CleanupIntegrationContract.java

@@ -10,8 +10,6 @@
 import java.util.Date;
 import java.util.Map;
 
-import javax.mail.Flags;
-
 import org.apache.james.GuiceJamesServer;
 import org.apache.james.core.Domain;
 import org.apache.james.core.Username;
@@ -34,6 +32,7 @@
 import com.linagora.tmail.james.jmap.settings.JmapSettings;
 
 import io.restassured.RestAssured;
+import jakarta.mail.Flags;
 
 public abstract class CleanupIntegrationContract {
 

tmail-backend/integration-tests/webadmin/webadmin-integration-tests-common/src/main/java/com/linagora/tmail/integration/InboxArchivalIntegrationContract.java

@@ -10,8 +10,6 @@
 import java.util.Date;
 import java.util.Map;
 
-import javax.mail.Flags;
-
 import org.apache.james.GuiceJamesServer;
 import org.apache.james.core.Domain;
 import org.apache.james.core.Username;
@@ -30,6 +28,7 @@
 import com.linagora.tmail.james.common.probe.JmapSettingsProbe;
 
 import io.restassured.RestAssured;
+import jakarta.mail.Flags;
 
 public abstract class InboxArchivalIntegrationContract {
     protected static final Domain DOMAIN = Domain.of("domain.tld");

tmail-backend/integration-tests/webadmin/webadmin-integration-tests-common/src/main/java/com/linagora/tmail/integration/RspamdFeedMessageRouteIntegrationContract.java

@@ -8,8 +8,6 @@
 import java.io.ByteArrayInputStream;
 import java.util.Date;
 
-import javax.mail.Flags;
-
 import org.apache.james.GuiceJamesServer;
 import org.apache.james.core.Domain;
 import org.apache.james.core.Username;
@@ -24,6 +22,7 @@
 import org.junit.jupiter.api.Test;
 
 import io.restassured.RestAssured;
+import jakarta.mail.Flags;
 
 public abstract class RspamdFeedMessageRouteIntegrationContract {
     protected static final Domain DOMAIN = Domain.of("domain.tld");

tmail-backend/jmap/extensions-opensearch/src/main/java/com/linagora/tmail/james/jmap/OSEmailAddressContactSearchEngine.java

@@ -12,7 +12,6 @@
 import java.util.UUID;
 
 import javax.inject.Inject;
-import javax.mail.internet.AddressException;
 
 import org.apache.james.backends.opensearch.DocumentId;
 import org.apache.james.backends.opensearch.OpenSearchIndexer;
@@ -47,6 +46,7 @@
 import com.linagora.tmail.james.jmap.dto.DomainContactDocument;
 import com.linagora.tmail.james.jmap.dto.UserContactDocument;
 
+import jakarta.mail.internet.AddressException;
 import reactor.core.publisher.Mono;
 
 public class OSEmailAddressContactSearchEngine implements EmailAddressContactSearchEngine {

tmail-backend/jmap/extensions/src/main/scala/com/linagora/tmail/james/jmap/method/EmailSendMethod.scala

@@ -10,10 +10,10 @@ import com.linagora.tmail.james.jmap.method.CapabilityIdentifier.LINAGORA_PGP
 import com.linagora.tmail.james.jmap.model.EmailSubmissionHelper.resolveEnvelope
 import com.linagora.tmail.james.jmap.model.{EmailSendCreationId, EmailSendCreationRequest, EmailSendCreationRequestInvalidException, EmailSendCreationResponse, EmailSendRequest, EmailSendResults, EmailSetCreationFailure, EmailSetCreationResult, EmailSetCreationSuccess, EmailSubmissionCreationRequest, MimeMessageSourceImpl}
 import eu.timepit.refined.auto._
+import jakarta.mail.Flags
+import jakarta.mail.internet.{InternetAddress, MimeMessage}
 import javax.annotation.PreDestroy
 import javax.inject.Inject
-import javax.mail.Flags
-import javax.mail.internet.{InternetAddress, MimeMessage}
 import org.apache.james.core.{MailAddress, Username}
 import org.apache.james.jmap.JMAPConfiguration
 import org.apache.james.jmap.api.model.Size

tmail-backend/jmap/extensions/src/main/scala/com/linagora/tmail/james/jmap/model/EmailSubmissionHelper.scala

@@ -1,9 +1,9 @@
 package com.linagora.tmail.james.jmap.model
 
 import cats.implicits.toTraverseOps
-import javax.mail.Address
-import javax.mail.Message.RecipientType
-import javax.mail.internet.{InternetAddress, MimeMessage}
+import jakarta.mail.Address
+import jakarta.mail.Message.RecipientType
+import jakarta.mail.internet.{InternetAddress, MimeMessage}
 import org.apache.james.core.MailAddress
 import org.apache.james.jmap.mail.{EmailSubmissionAddress, Envelope}
 

tmail-backend/mailbox/encrypted/api/src/main/scala/com/linagora/tmail/encrypted/EncryptedMessageManager.scala

@@ -5,8 +5,8 @@ import java.util
 import java.util.Date
 
 import com.linagora.tmail.pgp.Encrypter
+import jakarta.mail.Flags
 import javax.inject.Inject
-import javax.mail.Flags
 import org.apache.james.mailbox.MessageManager.{AppendCommand, AppendResult, MailboxMetaData}
 import org.apache.james.mailbox.model.{ComposedMessageIdWithMetaData, FetchGroup, Mailbox, MailboxACL, MailboxConstants, MailboxCounters, MailboxId, MailboxPath, MessageRange, MessageResultIterator, SearchQuery}
 import org.apache.james.mailbox.{MailboxManager, MailboxSession, MessageManager, MessageUid}

tmail-backend/mailets/src/main/scala/com/linagora/tmail/mailets/ContactsCollection.scala

@@ -5,8 +5,8 @@ import com.fasterxml.jackson.datatype.jdk8.Jdk8Module
 import com.google.common.collect.{ImmutableList, ImmutableSet}
 import com.linagora.tmail.james.jmap.EmailAddressContactInjectKeys
 import com.linagora.tmail.james.jmap.contact.{ContactFields, TmailContactUserAddedEvent}
+import jakarta.mail.Message
 import javax.inject.{Inject, Named}
-import javax.mail.Message
 import org.apache.commons.collections.CollectionUtils
 import org.apache.james.core.{MailAddress, Username}
 import org.apache.james.events.Event.EventId

tmail-backend/mailets/src/main/scala/com/linagora/tmail/mailets/TMailMailboxAppender.scala

@@ -3,7 +3,7 @@ package com.linagora.tmail.mailets
 import java.util.Optional
 
 import com.linagora.tmail.team.{TeamMailbox, TeamMailboxRepository}
-import javax.mail.internet.MimeMessage
+import jakarta.mail.internet.MimeMessage
 import org.apache.james.core.Username
 import org.apache.james.mailbox.MailboxManager
 import org.apache.james.mailbox.MessageManager.AppendResult

tmail-backend/mailets/src/test/scala/com/linagora/tmail/mailets/TMailMailboxAppenderTest.scala

@@ -23,8 +23,8 @@ import java.time.Duration
 import com.linagora.tmail.mailets.TMailMailboxAppenderTest.{DOMAIN, EMPTY_FOLDER, FOLDER, STORAGE_DIRECTIVE, TEAM_MAILBOX, USER}
 import com.linagora.tmail.team.{TeamMailbox, TeamMailboxCallbackNoop, TeamMailboxName, TeamMailboxRepository, TeamMailboxRepositoryImpl}
 import eu.timepit.refined.auto._
-import javax.mail.MessagingException
-import javax.mail.internet.MimeMessage
+import jakarta.mail.MessagingException
+import jakarta.mail.internet.MimeMessage
 import org.apache.james.core.builder.MimeMessageBuilder
 import org.apache.james.core.{Domain, Username}
 import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources

tmail-backend/pom.xml

@@ -62,6 +62,7 @@
         <james.groupId>org.apache.james</james.groupId>
         <james.version>3.9.0-SNAPSHOT</james.version>
         <firebase-admin-sdk.version>9.2.0</firebase-admin-sdk.version>
+        <bouncycastle.version>1.70</bouncycastle.version>
         <scala.base>2.13</scala.base>
     </properties>
 
@@ -323,7 +324,17 @@
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcpg-jdk15on</artifactId>
-                <version>1.70</version>
+                <version>${bouncycastle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcpkix-jdk15on</artifactId>
+                <version>${bouncycastle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk15on</artifactId>
+                <version>${bouncycastle.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.firebase</groupId>

tmail-backend/webadmin/webadmin-email-address-contact/src/main/java/com/linagora/tmail/webadmin/EmailAddressContactRoutes.java

@@ -3,7 +3,6 @@
 import static org.eclipse.jetty.http.HttpHeader.LOCATION;
 
 import javax.inject.Inject;
-import javax.mail.internet.AddressException;
 
 import org.apache.james.core.Domain;
 import org.apache.james.core.MailAddress;
@@ -25,6 +24,7 @@
 import com.linagora.tmail.webadmin.model.EmailAddressContactIdResponse;
 import com.linagora.tmail.webadmin.model.EmailAddressContactResponse;
 
+import jakarta.mail.internet.AddressException;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import spark.Request;

tmail-backend/webadmin/webadmin-mailbox/src/test/java/com/linagora/tmail/webadmin/archival/InboxArchivalTaskTest.java

@@ -9,8 +9,6 @@
 import java.util.Date;
 import java.util.Map;
 
-import javax.mail.Flags;
-
 import org.apache.james.core.Domain;
 import org.apache.james.core.Username;
 import org.apache.james.domainlist.api.DomainList;
@@ -33,6 +31,8 @@
 import com.linagora.tmail.james.jmap.settings.JmapSettingsRepositoryJavaUtils;
 import com.linagora.tmail.james.jmap.settings.MemoryJmapSettingsRepository;
 
+import jakarta.mail.Flags;
+
 class InboxArchivalTaskTest {
     private static final Domain DOMAIN = Domain.of("domain.tld");
     private static final Username BOB = Username.fromLocalPartWithDomain("bob", DOMAIN);

tmail-backend/webadmin/webadmin-mailbox/src/test/java/com/linagora/tmail/webadmin/cleanup/CleanupServiceTest.java

@@ -9,8 +9,6 @@
 import java.util.Date;
 import java.util.Map;
 
-import javax.mail.Flags;
-
 import org.apache.james.core.Domain;
 import org.apache.james.core.Username;
 import org.apache.james.dnsservice.api.DNSService;
@@ -39,6 +37,7 @@
 import com.linagora.tmail.james.jmap.settings.JmapSettingsRepositoryJavaUtils;
 import com.linagora.tmail.james.jmap.settings.MemoryJmapSettingsRepository;
 
+import jakarta.mail.Flags;
 import reactor.core.publisher.Flux;
 
 public class CleanupServiceTest {