From 8de80330b19d7459f580d0af00927d37d32dbe9d Mon Sep 17 00:00:00 2001
From: Benoit TELLIER <btellier@linagora.com>
Date: Fri, 11 Sep 2026 16:00:54 +0200
Subject: [PATCH 01/10] [UPGRADE] Spark http 3.0.4 -> 3.0.5

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 444065f62d4..d7edb9411d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3076,7 +3076,7 @@
             <dependency>
                 <groupId>org.zoomba-lang</groupId>
                 <artifactId>spark-core</artifactId>
-                <version>3.0.4</version>
+                <version>3.0.5</version>
             </dependency>
             <dependency>
                 <groupId>pl.pragmatists</groupId>

From 55b811c07497596496f3c1b27e9a1ccc2690b4fd Mon Sep 17 00:00:00 2001
From: Benoit TELLIER <btellier@linagora.com>
Date: Fri, 11 Sep 2026 16:01:37 +0200
Subject: [PATCH 02/10] [UPGRADE] Jsoup 1.23.1 -> 1.23.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d7edb9411d9..18a459a1a16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2896,7 +2896,7 @@
             <dependency>
                 <groupId>org.jsoup</groupId>
                 <artifactId>jsoup</artifactId>
-                <version>1.23.1</version>
+                <version>1.23.2</version>
             </dependency>
             <dependency>
                 <groupId>org.julienrf</groupId>

From 0ceed56e8e13391cfd67637865ffefd051c33bc6 Mon Sep 17 00:00:00 2001
From: Benoit TELLIER <btellier@linagora.com>
Date: Fri, 11 Sep 2026 16:02:26 +0200
Subject: [PATCH 03/10] [UPGRADE] amqp-client 5.33.1 -> 5.35.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 18a459a1a16..ae6bc369d53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2342,7 +2342,7 @@
             <dependency>
                 <groupId>com.rabbitmq</groupId>
                 <artifactId>amqp-client</artifactId>
-                <version>5.34.0</version>
+                <version>5.35.0</version>
             </dependency>
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>

From 24029078b0cd669e6cd47d173746f38c746df595 Mon Sep 17 00:00:00 2001
From: Benoit TELLIER <btellier@linagora.com>
Date: Fri, 11 Sep 2026 16:04:11 +0200
Subject: [PATCH 04/10] [UPGRADE] bouncycastle 1.82 -> 1.85.2

---
 pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ae6bc369d53..9b09cac56b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -684,7 +684,7 @@
         <lettuce.core.version>6.8.2.RELEASE</lettuce.core.version>
         <io.micrometer.core.version>1.15.1</io.micrometer.core.version>
         <io.micrometer.tracing.version>1.5.1</io.micrometer.tracing.version>
-        <bouncycastle.version>1.82</bouncycastle.version>
+        <bouncycastle.version>1.85</bouncycastle.version>
         <scala.base>2.13</scala.base>
         <scala.version>${scala.base}.16</scala.version>
         <doclint>none</doclint>
@@ -2871,6 +2871,11 @@
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk18on</artifactId>
+                <version>1.85.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcutil-jdk18on</artifactId>
                 <version>${bouncycastle.version}</version>
             </dependency>
             <dependency>

From abe364140b7971448c208176b27c4a89b8415b46 Mon Sep 17 00:00:00 2001
From: Benoit TELLIER <btellier@linagora.com>
Date: Wed, 16 Sep 2026 20:23:46 +0200
Subject: [PATCH 05/10] POM: exclude ApacheHttpClient5Transport from OpenSearch
 code

---
 backends-common/opensearch/pom.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/backends-common/opensearch/pom.xml b/backends-common/opensearch/pom.xml
index 9cb81902437..d992b71a6d1 100644
--- a/backends-common/opensearch/pom.xml
+++ b/backends-common/opensearch/pom.xml
@@ -88,6 +88,21 @@
             <groupId>org.opensearch.client</groupId>
             <artifactId>opensearch-java</artifactId>
             <version>2.25.0</version>
+            <exclusions>
+                <!-- Only needed by ApacheHttpClient5Transport, James relies on RestClientTransport -->
+                <exclusion>
+                    <groupId>org.apache.httpcomponents.client5</groupId>
+                    <artifactId>httpclient5</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents.core5</groupId>
+                    <artifactId>httpcore5</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents.core5</groupId>
+                    <artifactId>httpcore5-h2</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.opensearch.client</groupId>

From 511298d543e06f8f7cb5f07c26443aa1aaffc009 Mon Sep 17 00:00:00 2001
From: Benoit TELLIER <btellier@linagora.com>
Date: Wed, 16 Sep 2026 20:24:18 +0200
Subject: [PATCH 06/10] [UPGRADE] log4j2 2.24.3 -> 2.25.5

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9b09cac56b9..110106d53a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -626,7 +626,7 @@
         <apache-mime4j.version>0.8.15</apache-mime4j.version>
         <apache.openjpa.version>4.1.1</apache.openjpa.version><!-- Align with EE10 Persistence 3.1 & Transactions 2.0: https://openjpa.apache.org/ -->
         <h2.version>2.3.232</h2.version>
-        <log4j2.version>2.25.4</log4j2.version>
+        <log4j2.version>2.25.5</log4j2.version>
 
         <!-- Align with Jakarta EE 10
              https://jakarta.ee/release/10/ -->

From 7fa46b0991e3b0eebaba7c6fdff614a34a6cff7b Mon Sep 17 00:00:00 2001
From: Benoit TELLIER <btellier@linagora.com>
Date: Wed, 16 Sep 2026 20:24:43 +0200
Subject: [PATCH 07/10] [UPGRADE] angus-mail 2.0.3 -> 2.0.5

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 110106d53a8..dc3c915103c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -639,7 +639,7 @@
         <spring.version>6.2.8</spring.version>
         <activmq-artemis.version>2.56.0</activmq-artemis.version>
         <apache-jspf-resolver.version>1.0.5</apache-jspf-resolver.version>
-        <angus-mail.version>2.0.3</angus-mail.version><!-- Align with EE10 Mail 2.1: https://eclipse-ee4j.github.io/angus-mail/ -->
+        <angus-mail.version>2.0.5</angus-mail.version>
         <angus-activation.version>2.0.2</angus-activation.version><!-- Align with EE10 Activation 2.1: https://eclipse-ee4j.github.io/angus-activation/ -->
         <slf4j.version>2.0.17</slf4j.version>
         <circe.version>0.14.14</circe.version>

From d5388622be109af983ed36c39c5b6423a0be9a69 Mon Sep 17 00:00:00 2001
From: Benoit TELLIER <btellier@linagora.com>
Date: Wed, 16 Sep 2026 20:25:12 +0200
Subject: [PATCH 08/10] [UPGRADE] logback 1.5.18 -> 1.5.38

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dc3c915103c..38bfa920270 100644
--- a/pom.xml
+++ b/pom.xml
@@ -678,7 +678,7 @@
         <lucene.version>10.2.1</lucene.version>
         <jasypt.version>1.9.3</jasypt.version>
         <guice.version>7.0.0</guice.version>
-        <logback.version>1.5.19</logback.version>
+        <logback.version>1.5.38</logback.version>
         <tink.version>1.17.0</tink.version>
         <zstd-jni.version>1.5.7-7</zstd-jni.version>
         <lettuce.core.version>6.8.2.RELEASE</lettuce.core.version>

From c83134a62d950b6ad3c81fa50b35a05a6b2fcddd Mon Sep 17 00:00:00 2001
From: Benoit TELLIER <btellier@linagora.com>
Date: Wed, 16 Sep 2026 20:25:28 +0200
Subject: [PATCH 09/10] [UPGRADE] Micrometer

---
 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 38bfa920270..26a87659982 100644
--- a/pom.xml
+++ b/pom.xml
@@ -682,8 +682,9 @@
         <tink.version>1.17.0</tink.version>
         <zstd-jni.version>1.5.7-7</zstd-jni.version>
         <lettuce.core.version>6.8.2.RELEASE</lettuce.core.version>
-        <io.micrometer.core.version>1.15.1</io.micrometer.core.version>
-        <io.micrometer.tracing.version>1.5.1</io.micrometer.tracing.version>
+        <io.micrometer.core.version>1.16.7</io.micrometer.core.version>
+        <io.micrometer.tracing.version>1.6.7</io.micrometer.tracing.version>
+
         <bouncycastle.version>1.85</bouncycastle.version>
         <scala.base>2.13</scala.base>
         <scala.version>${scala.base}.16</scala.version>

From f40a7385937b2f9371f5ab141ba524b75304a4d3 Mon Sep 17 00:00:00 2001
From: Benoit TELLIER <btellier@linagora.com>
Date: Wed, 16 Sep 2026 20:25:56 +0200
Subject: [PATCH 10/10] [UPGRADE] Postgres 42.7.7 -> 42.7.13

---
 server/apps/migration/core-data-jpa-to-pg/pom.xml | 2 +-
 server/apps/scaling-pulsar-smtp/pom.xml           | 2 +-
 server/container/guice/postgres-common/pom.xml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/apps/migration/core-data-jpa-to-pg/pom.xml b/server/apps/migration/core-data-jpa-to-pg/pom.xml
index 7f3a6dac056..1f3cd49d4b2 100644
--- a/server/apps/migration/core-data-jpa-to-pg/pom.xml
+++ b/server/apps/migration/core-data-jpa-to-pg/pom.xml
@@ -135,7 +135,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.7.11</version>
+            <version>42.7.13</version>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
diff --git a/server/apps/scaling-pulsar-smtp/pom.xml b/server/apps/scaling-pulsar-smtp/pom.xml
index 93e66eb70e3..531f3a41e76 100644
--- a/server/apps/scaling-pulsar-smtp/pom.xml
+++ b/server/apps/scaling-pulsar-smtp/pom.xml
@@ -185,7 +185,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.7.12</version>
+            <version>42.7.13</version>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
diff --git a/server/container/guice/postgres-common/pom.xml b/server/container/guice/postgres-common/pom.xml
index 8c849d2413a..6ea1cbcb49d 100644
--- a/server/container/guice/postgres-common/pom.xml
+++ b/server/container/guice/postgres-common/pom.xml
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.7.7</version>
+            <version>42.7.13</version>
             <scope>test</scope>
         </dependency>
     </dependencies>