diff --git a/backends-common/opensearch/pom.xml b/backends-common/opensearch/pom.xml
index 55782b45bca..c7c0c196b02 100644
--- a/backends-common/opensearch/pom.xml
+++ b/backends-common/opensearch/pom.xml
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-to-slf4j</artifactId>
-            <version>2.19.0</version>
+            <version>${log4j2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
diff --git a/backends-common/pulsar/pom.xml b/backends-common/pulsar/pom.xml
index c53d57e7f4f..db5379b750d 100644
--- a/backends-common/pulsar/pom.xml
+++ b/backends-common/pulsar/pom.xml
@@ -32,6 +32,7 @@
     <properties>
         <pulsar-client.version>2.11.0</pulsar-client.version>
         <clever-cloud.pulsar4s.version>2.9.0</clever-cloud.pulsar4s.version>
+        <akka-stream.version>2.8.3</akka-stream.version>
     </properties>
 
     <dependencies>
@@ -102,12 +103,12 @@
         <dependency>
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-stream-typed_${scala.base}</artifactId>
-            <version>2.6.20</version>
+            <version>${akka-stream.version}</version>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-stream_${scala.base}</artifactId>
-            <version>2.6.20</version>
+            <version>${akka-stream.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
diff --git a/examples/custom-healthcheck/pom.xml b/examples/custom-healthcheck/pom.xml
index 172aa2da8c2..afb422c4ca8 100644
--- a/examples/custom-healthcheck/pom.xml
+++ b/examples/custom-healthcheck/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
-            <version>3.4.18</version>
+            <version>3.5.8</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/examples/custom-imap/pom.xml b/examples/custom-imap/pom.xml
index 3ec23666885..51d785d1aec 100644
--- a/examples/custom-imap/pom.xml
+++ b/examples/custom-imap/pom.xml
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
-            <version>5.1.0</version>
+            <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/examples/metrics-graphite/pom.xml b/examples/metrics-graphite/pom.xml
index cf791cc03e3..5119148668f 100644
--- a/examples/metrics-graphite/pom.xml
+++ b/examples/metrics-graphite/pom.xml
@@ -31,12 +31,12 @@
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-graphite</artifactId>
-            <version>4.2.15</version>
+            <version>4.2.19</version>
         </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
-            <version>5.1.0</version>
+            <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperRelaxedConsistencyTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperRelaxedConsistencyTest.java
index efdebf845a1..a71d7318973 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperRelaxedConsistencyTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperRelaxedConsistencyTest.java
@@ -21,11 +21,13 @@
 
 import org.apache.james.backends.cassandra.CassandraClusterExtension;
 import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
+import org.apache.james.junit.categories.Unstable;
 import org.apache.james.mailbox.store.mail.model.MapperProvider;
 import org.apache.james.mailbox.store.mail.model.MessageMapperTest;
 import org.apache.james.utils.UpdatableTickingClock;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 class CassandraMessageMapperRelaxedConsistencyTest {
@@ -51,6 +53,18 @@ protected MapperProvider createMapperProvider() {
         protected UpdatableTickingClock updatableTickingClock() {
             return cassandraMapperProvider.getUpdatableTickingClock();
         }
+
+        @Tag(Unstable.TAG)
+        @Override
+        public void setFlagsShouldWorkWithConcurrencyWithRemove() throws Exception {
+            super.setFlagsShouldWorkWithConcurrencyWithRemove();
+        }
+
+        @Tag(Unstable.TAG)
+        @Override
+        public void userFlagsUpdateShouldWorkInConcurrentEnvironment() throws Exception {
+            super.userFlagsUpdateShouldWorkInConcurrentEnvironment();
+        }
     }
 
     @Nested
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
index 2cf24fbbfc6..012ac06050a 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapperTest.java
@@ -39,6 +39,7 @@
 import org.apache.james.backends.cassandra.StatementRecorder.Selector;
 import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration;
 import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.junit.categories.Unstable;
 import org.apache.james.mailbox.MessageManager;
 import org.apache.james.mailbox.cassandra.ids.CassandraId;
 import org.apache.james.mailbox.cassandra.ids.CassandraMessageId;
@@ -65,6 +66,7 @@
 import org.assertj.core.api.SoftAssertions;
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -458,4 +460,16 @@ void messagesRetrievedUsingFetchTypeAttachmentsMetadataShouldHaveAttachmentsMeta
 
         assertThat(retrievedMessage.getAttachments()).isEqualTo(message.getAttachments());
     }
+
+    @Tag(Unstable.TAG)
+    @Override
+    public void setFlagsShouldWorkWithConcurrencyWithRemove() throws Exception {
+        super.setFlagsShouldWorkWithConcurrencyWithRemove();
+    }
+
+    @Tag(Unstable.TAG)
+    @Override
+    public void userFlagsUpdateShouldWorkInConcurrentEnvironment() throws Exception {
+        super.userFlagsUpdateShouldWorkInConcurrentEnvironment();
+    }
 }
diff --git a/mailbox/event/json/pom.xml b/mailbox/event/json/pom.xml
index 3f929bff4bf..6aafd95ac47 100644
--- a/mailbox/event/json/pom.xml
+++ b/mailbox/event/json/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>com.beachape</groupId>
             <artifactId>enumeratum_${scala.base}</artifactId>
-            <version>1.7.0</version>
+            <version>1.7.2</version>
         </dependency>
         <dependency>
             <groupId>com.chuusai</groupId>
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
index a5fe322689d..e60a583f972 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
@@ -46,6 +46,8 @@
 import javax.mail.Flags.Flag;
 
 import org.apache.commons.io.input.TeeInputStream;
+import org.apache.commons.io.input.UnsynchronizedBufferedInputStream;
+import org.apache.commons.io.input.UnsynchronizedFilterInputStream;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.james.events.EventBus;
@@ -107,7 +109,6 @@
 import org.apache.james.mime4j.stream.RecursionMode;
 import org.apache.james.util.io.BodyOffsetInputStream;
 import org.apache.james.util.io.InputStreamConsummer;
-import org.apache.james.util.io.UnsynchronizedBufferedInputStream;
 import org.apache.james.util.streams.Iterators;
 import org.reactivestreams.Publisher;
 
@@ -358,7 +359,9 @@ public AppendResult appendMessage(InputStream msgIn, Date internalDate, final Ma
             file = Files.createTempFile("imap", ".msg").toFile();
             try (FileOutputStream out = new FileOutputStream(file);
                  BufferedOutputStream bufferedOut = new BufferedOutputStream(out);
-                 UnsynchronizedBufferedInputStream tmpMsgIn = new UnsynchronizedBufferedInputStream(new TeeInputStream(msgIn, bufferedOut));
+                 UnsynchronizedFilterInputStream tmpMsgIn = UnsynchronizedBufferedInputStream.builder()
+                     .setInputStream(new TeeInputStream(msgIn, bufferedOut))
+                     .get();
                  BodyOffsetInputStream bIn = new BodyOffsetInputStream(tmpMsgIn)) {
                 Pair<PropertyBuilder, HeaderImpl> pair = parseProperties(bIn);
                 PropertyBuilder propertyBuilder = pair.getLeft();
@@ -405,8 +408,10 @@ private Mono<AppendResult> appendMessage(Content msgIn, Date internalDate, final
             }
 
             try (InputStream contentStream = msgIn.getInputStream();
-                 UnsynchronizedBufferedInputStream bufferedContentStream = new UnsynchronizedBufferedInputStream(contentStream);
-                    BodyOffsetInputStream bIn = new BodyOffsetInputStream(bufferedContentStream)) {
+                 UnsynchronizedFilterInputStream bufferedContentStream = UnsynchronizedBufferedInputStream.builder()
+                     .setInputStream(contentStream)
+                     .get();
+                BodyOffsetInputStream bIn = new BodyOffsetInputStream(bufferedContentStream)) {
                 Pair<PropertyBuilder, HeaderImpl> pair = parseProperties(bIn);
                 PropertyBuilder propertyBuilder = pair.getLeft();
                 HeaderImpl headers = pair.getRight();
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
index 1efac851eaa..ae93906c491 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java
@@ -919,8 +919,8 @@ public void userFlagsUpdateShouldWorkInConcurrentEnvironment() throws Exception
 
         saveMessages();
 
-        int threadCount = 2;
-        int updateCount = 10;
+        int threadCount = 8;
+        int updateCount = 40;
         ConcurrentTestRunner.builder()
             .operation((threadNumber, step) -> messageMapper.updateFlags(benwaInboxMailbox, message1.getUid(),
                 new FlagsUpdateCalculator(new Flags("custom-" + threadNumber + "-" + step), FlagsUpdateMode.ADD)))
@@ -939,8 +939,8 @@ public void setFlagsShouldWorkWithConcurrencyWithRemove() throws Exception {
         Assume.assumeTrue(mapperProvider.getSupportedCapabilities().contains(MapperProvider.Capabilities.THREAD_SAFE_FLAGS_UPDATE));
         saveMessages();
 
-        int threadCount = 4;
-        int updateCount = 20;
+        int threadCount = 8;
+        int updateCount = 40;
         ConcurrentTestRunner.builder()
             .operation((threadNumber, step) -> {
                 if (step  < updateCount / 2) {
diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/KeyStoreHolder.java b/mailet/crypto/src/main/java/org/apache/james/transport/KeyStoreHolder.java
index 0142293e1b5..7d2dc57012f 100644
--- a/mailet/crypto/src/main/java/org/apache/james/transport/KeyStoreHolder.java
+++ b/mailet/crypto/src/main/java/org/apache/james/transport/KeyStoreHolder.java
@@ -46,7 +46,7 @@
 
 import javax.mail.MessagingException;
 
-import org.apache.james.util.io.UnsynchronizedBufferedInputStream;
+import org.apache.commons.io.input.UnsynchronizedBufferedInputStream;
 import org.bouncycastle.cert.jcajce.JcaCertStoreBuilder;
 import org.bouncycastle.cert.selector.X509CertificateHolderSelector;
 import org.bouncycastle.cert.selector.jcajce.JcaX509CertSelectorConverter;
@@ -101,7 +101,10 @@ public KeyStoreHolder(String keyStoreFileName, String keyStorePassword, String k
         }
         
         keyStore = KeyStore.getInstance(keyStoreType);        
-        keyStore.load(new UnsynchronizedBufferedInputStream(new FileInputStream(keyStoreFileName)), keyStorePassword.toCharArray());
+        keyStore.load(UnsynchronizedBufferedInputStream
+            .builder()
+            .setInputStream(new FileInputStream(keyStoreFileName))
+            .get(), keyStorePassword.toCharArray());
         if (keyStore.size() == 0) {
             throw new KeyStoreException("The keystore must be not empty");
         }
diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java b/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java
index 5bb18304352..020437a5d61 100644
--- a/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java
+++ b/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java
@@ -45,7 +45,7 @@
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMultipart;
 
-import org.apache.james.util.io.UnsynchronizedBufferedInputStream;
+import org.apache.commons.io.input.UnsynchronizedBufferedInputStream;
 import org.bouncycastle.cert.jcajce.JcaCertStore;
 import org.bouncycastle.cms.SignerInfoGenerator;
 import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder;
@@ -128,7 +128,11 @@ public SMIMEKeyHolder(String keyStoreFileName, String keyStorePassword, String k
         }
         
         KeyStore keyStore = KeyStore.getInstance(keyStoreType);
-        keyStore.load(new UnsynchronizedBufferedInputStream(new FileInputStream(keyStoreFileName)), keyStorePassword.toCharArray());
+
+        keyStore.load(UnsynchronizedBufferedInputStream.builder()
+            .setInputStream(new FileInputStream(keyStoreFileName))
+            .get(),
+            keyStorePassword.toCharArray());
         
         Enumeration<String> aliases = keyStore.aliases();
         if (keyAlias == null) {
diff --git a/mailet/mailetdocs-maven-plugin/pom.xml b/mailet/mailetdocs-maven-plugin/pom.xml
index 332e0290c4d..e4300c1dcd0 100644
--- a/mailet/mailetdocs-maven-plugin/pom.xml
+++ b/mailet/mailetdocs-maven-plugin/pom.xml
@@ -34,7 +34,9 @@
         information available from implementation source.</description>
     <url>http://james.apache.org/mailet/maven-mailetdocs-plugin/</url>
     <inceptionYear>2008</inceptionYear>
-
+    <properties>
+        <doxia.version>1.12.0</doxia.version>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>${james.groupId}</groupId>
@@ -64,12 +66,12 @@
         <dependency>
             <groupId>org.apache.maven.doxia</groupId>
             <artifactId>doxia-core</artifactId>
-            <version>1.11.1</version>
+            <version>${doxia.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.doxia</groupId>
             <artifactId>doxia-sink-api</artifactId>
-            <version>1.11.1</version>
+            <version>${doxia.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java
index 87a898bc8f9..1c5a3d862b8 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java
@@ -30,7 +30,7 @@
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMultipart;
 
-import org.apache.james.util.io.UnsynchronizedBufferedInputStream;
+import org.apache.commons.io.input.UnsynchronizedBufferedInputStream;
 import org.apache.mailet.AttributeName;
 import org.apache.mailet.AttributeUtils;
 import org.apache.mailet.AttributeValue;
@@ -119,8 +119,9 @@ private void processAttachment(Mail mail, Map<String,  AttributeValue<?>> attach
                     continue;
                 }
                 byte[] bytes = (byte[]) i.next().getValue();
-                InputStream is = new UnsynchronizedBufferedInputStream(
-                        new ByteArrayInputStream(bytes));
+                InputStream is = UnsynchronizedBufferedInputStream.builder()
+                    .setInputStream(new ByteArrayInputStream(bytes))
+                    .get();
                 MimeBodyPart p = new MimeBodyPart(is);
                 if (!(message.isMimeType("multipart/*") && (message
                         .getContent() instanceof MimeMultipart))) {
diff --git a/pom.xml b/pom.xml
index bbea10ea761..fb4cea036f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -598,45 +598,45 @@
 
         <james.groupId>org.apache.james</james.groupId>
         <james.protocols.groupId>${james.groupId}.protocols</james.protocols.groupId>
-        <activemq.version>5.17.3</activemq.version>
+        <activemq.version>5.18.2</activemq.version>
         <apache-mime4j.version>0.8.9</apache-mime4j.version>
         <apache.openjpa.version>3.2.0</apache.openjpa.version>
         <derby.version>10.14.2.0</derby.version>
-        <log4j2.version>2.19.0</log4j2.version>
+        <log4j2.version>2.20.0</log4j2.version>
         <javax.inject.version>1</javax.inject.version>
         <javax.activation.groupId>javax.activation</javax.activation.groupId>
         <javax.activation.artifactId>activation</javax.activation.artifactId>
         <jsieve.version>0.8</jsieve.version>
         <spring.version>4.3.25.RELEASE</spring.version>
-        <activmq-artemis.version>2.27.1</activmq-artemis.version>
+        <activmq-artemis.version>2.29.0</activmq-artemis.version>
         <apache-jspf-resolver.version>1.0.3</apache-jspf-resolver.version>
         <javamail.version>1.5.4</javamail.version>
         <javax-activation.version>1.1.1</javax-activation.version>
-        <slf4j.version>2.0.6</slf4j.version>
+        <slf4j.version>2.0.7</slf4j.version>
 
         <dnsjava.version>3.5.2</dnsjava.version>
-        <junit.jupiter.version>5.8.2</junit.jupiter.version>
-        <junit.platform.version>1.8.2</junit.platform.version>
-        <junit.vintage.version>5.8.2</junit.vintage.version>
+        <junit.jupiter.version>5.9.3</junit.jupiter.version>
+        <junit.platform.version>1.9.3</junit.platform.version>
+        <junit.vintage.version>5.9.3</junit.vintage.version>
         <concurrent.version>1.3.4</concurrent.version>
         <xbean-spring.version>4.21</xbean-spring.version>
         <netty.version>4.1.94.Final</netty.version>
         <cucumber.version>2.4.0</cucumber.version>
 
         <pax-logging-api.version>1.6.4</pax-logging-api.version>
-        <jackson.version>2.14.1</jackson.version>
-        <jackson.databind.version>2.14.1</jackson.databind.version>
-        <feign.version>11.10</feign.version>
+        <jackson.version>2.15.2</jackson.version>
+        <jackson.databind.version>2.15.2</jackson.databind.version>
+        <feign.version>12.4</feign.version>
         <feign-form.version>3.8.0</feign-form.version>
         <jjwt.version>0.11.5</jjwt.version>
-        <metrics.version>4.2.15</metrics.version>
+        <metrics.version>4.2.19</metrics.version>
         <testcontainers.version>1.17.6</testcontainers.version>
         <es.version>2.2.1</es.version>
         <es-reporter.version>6.0.0-RC3</es-reporter.version>
-        <guava.version>31.1-jre</guava.version>
+        <guava.version>32.1.1-jre</guava.version>
 
         <jutf7.version>1.0.0</jutf7.version>
-        <apache.httpcomponents.version>4.5.13</apache.httpcomponents.version>
+        <apache.httpcomponents.version>4.5.14</apache.httpcomponents.version>
         <!-- maven-mailetdocs-plugin artifacts -->
         <maven-artifact.version>3.0-alpha-1</maven-artifact.version>
         <maven-plugin-annotations.version>3.6.4</maven-plugin-annotations.version>
@@ -650,19 +650,20 @@
         <jaxb.version>2.3.1</jaxb.version>
         <lucene.version>3.6.2</lucene.version>
         <jasypt.version>1.9.3</jasypt.version>
-        <guice.version>5.1.0</guice.version>
-        <logback.version>1.4.5</logback.version>
-        <tink.version>1.7.0</tink.version>
+        <guice.version>6.0.0</guice.version>
+        <logback.version>1.4.8</logback.version>
+        <tink.version>1.9.0</tink.version>
         <lettuce.core.version>6.2.4.RELEASE</lettuce.core.version>
 
         <bouncycastle.version>1.70</bouncycastle.version>
 
         <scala.base>2.13</scala.base>
-        <scala.version>${scala.base}.10</scala.version>
+        <scala.version>${scala.base}.11</scala.version>
         <scalatestplus-play.version>5.0.0</scalatestplus-play.version>
         <doclint>none</doclint>
-        <mockito.version>4.8.0</mockito.version>
+        <mockito.version>5.2.0</mockito.version>
         <jacoco-maven-plugin.version>0.8.9</jacoco-maven-plugin.version>
+        <javacrumbs.json-unit.version>2.38.0</javacrumbs.json-unit.version>
     </properties>
 
     <dependencyManagement>
@@ -2122,7 +2123,7 @@
             <dependency>
                 <groupId>com.github.ben-manes.caffeine</groupId>
                 <artifactId>caffeine</artifactId>
-                <version>3.1.2</version>
+                <version>3.1.6</version>
             </dependency>
             <dependency>
                 <groupId>com.github.dpaukov</groupId>
@@ -2196,7 +2197,7 @@
             <dependency>
                 <groupId>com.jayway.jsonpath</groupId>
                 <artifactId>json-path</artifactId>
-                <version>2.7.0</version>
+                <version>2.8.0</version>
             </dependency>
             <dependency>
                 <groupId>com.jcraft</groupId>
@@ -2252,12 +2253,12 @@
             <dependency>
                 <groupId>com.typesafe.play</groupId>
                 <artifactId>play-json_${scala.base}</artifactId>
-                <version>2.9.3</version>
+                <version>2.9.4</version>
             </dependency>
             <dependency>
                 <groupId>com.unboundid</groupId>
                 <artifactId>unboundid-ldapsdk</artifactId>
-                <version>6.0.7</version>
+                <version>6.0.9</version>
             </dependency>
             <dependency>
                 <groupId>commons-beanutils</groupId>
@@ -2278,7 +2279,7 @@
             <dependency>
                 <groupId>commons-daemon</groupId>
                 <artifactId>commons-daemon</artifactId>
-                <version>1.3.3</version>
+                <version>1.3.4</version>
             </dependency>
             <dependency>
                 <groupId>commons-dbcp</groupId>
@@ -2294,7 +2295,7 @@
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.11.0</version>
+                <version>2.13.0</version>
             </dependency>
             <dependency>
                 <groupId>commons-net</groupId>
@@ -2314,7 +2315,7 @@
             <dependency>
                 <groupId>eu.timepit</groupId>
                 <artifactId>refined_${scala.base}</artifactId>
-                <version>0.10.3</version>
+                <version>0.11.0</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
@@ -2354,7 +2355,7 @@
             <dependency>
                 <groupId>io.github.hakky54</groupId>
                 <artifactId>sslcontext-kickstart-for-pem</artifactId>
-                <version>7.4.7</version>
+                <version>8.1.2</version>
             </dependency>
             <dependency>
                 <groupId>io.github.openfeign</groupId>
@@ -2436,7 +2437,7 @@
             <dependency>
                 <groupId>io.projectreactor</groupId>
                 <artifactId>reactor-bom</artifactId>
-                <version>2022.0.8</version>
+                <version>2022.0.9</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -2453,7 +2454,7 @@
             <dependency>
                 <groupId>io.rest-assured</groupId>
                 <artifactId>rest-assured</artifactId>
-                <version>5.3.0</version>
+                <version>5.3.1</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -2496,15 +2497,20 @@
                 <artifactId>jaxb-api</artifactId>
                 <version>${jaxb.version}</version>
             </dependency>
+            <dependency>
+                <groupId>net.javacrumbs.json-unit</groupId>
+                <artifactId>json-unit</artifactId>
+                <version>${javacrumbs.json-unit.version}</version>
+            </dependency>
             <dependency>
                 <groupId>net.javacrumbs.json-unit</groupId>
                 <artifactId>json-unit-assertj</artifactId>
-                <version>2.36.0</version>
+                <version>${javacrumbs.json-unit.version}</version>
             </dependency>
             <dependency>
                 <groupId>nl.jqno.equalsverifier</groupId>
                 <artifactId>equalsverifier</artifactId>
-                <version>3.10.1</version>
+                <version>3.15</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.activemq</groupId>
@@ -2541,7 +2547,7 @@
             <dependency>
                 <groupId>org.apache.ant</groupId>
                 <artifactId>ant</artifactId>
-                <version>1.10.12</version>
+                <version>1.10.13</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -2551,12 +2557,12 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-compress</artifactId>
-                <version>1.22</version>
+                <version>1.23.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-configuration2</artifactId>
-                <version>2.8.0</version>
+                <version>2.9.0</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -2679,7 +2685,7 @@
             <dependency>
                 <groupId>org.apache.pdfbox</groupId>
                 <artifactId>pdfbox</artifactId>
-                <version>2.0.27</version>
+                <version>2.0.29</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -2705,7 +2711,7 @@
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>
-                <version>3.23.1</version>
+                <version>3.24.2</version>
             </dependency>
             <dependency>
                 <groupId>org.awaitility</groupId>
@@ -2741,7 +2747,7 @@
             <dependency>
                 <groupId>org.jsoup</groupId>
                 <artifactId>jsoup</artifactId>
-                <version>1.15.3</version>
+                <version>1.16.1</version>
             </dependency>
             <dependency>
                 <groupId>org.julienrf</groupId>
@@ -2781,7 +2787,7 @@
             <dependency>
                 <groupId>org.mock-server</groupId>
                 <artifactId>mockserver-netty</artifactId>
-                <version>5.14.0</version>
+                <version>5.15.0</version>
                 <exclusions>
                     <exclusion>
                         <groupId>io.netty</groupId>
@@ -2817,7 +2823,7 @@
             <dependency>
                 <groupId>org.scalatest</groupId>
                 <artifactId>scalatest_${scala.base}</artifactId>
-                <version>3.2.14</version>
+                <version>3.2.16</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -3075,7 +3081,7 @@
                             <compilerPlugin>
                                 <groupId>org.scalameta</groupId>
                                 <artifactId>semanticdb-scalac_${scala.version}</artifactId>
-                                <version>4.6.0</version>
+                                <version>4.8.4</version>
                             </compilerPlugin>
                         </compilerPlugins>
                     </configuration>
diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml
index b70e5523481..b11ec65fcc6 100644
--- a/protocols/imap/pom.xml
+++ b/protocols/imap/pom.xml
@@ -110,7 +110,7 @@
         <dependency>
             <groupId>it.unimi.dsi</groupId>
             <artifactId>fastutil-core</artifactId>
-            <version>8.5.9</version>
+            <version>8.5.12</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/server/blob/blob-s3/pom.xml b/server/blob/blob-s3/pom.xml
index 951301625f1..dee65d25146 100644
--- a/server/blob/blob-s3/pom.xml
+++ b/server/blob/blob-s3/pom.xml
@@ -33,7 +33,7 @@
     <name>Apache James :: Server :: Blob :: S3</name>
 
     <properties>
-        <s3-sdk.version>2.20.98</s3-sdk.version>
+        <s3-sdk.version>2.20.103</s3-sdk.version>
     </properties>
 
     <dependencies>
diff --git a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java
index 4ba872108da..58f4d4e1c6f 100644
--- a/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java
+++ b/server/container/core/src/main/java/org/apache/james/server/core/MimeMessageInputStreamSource.java
@@ -33,10 +33,10 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.input.UnsynchronizedBufferedInputStream;
 import org.apache.commons.io.output.DeferredFileOutputStream;
 import org.apache.james.lifecycle.api.Disposable;
 import org.apache.james.util.SizeFormat;
-import org.apache.james.util.io.UnsynchronizedBufferedInputStream;
 
 /**
  * Takes an input stream and creates a repeatable input stream source for a
@@ -186,7 +186,10 @@ public InputStream getInputStream() throws IOException {
         if (getResource().getOut().isInMemory()) {
             return new ByteArrayInputStream(getResource().getOut().getData());
         } else {
-            InputStream in = new UnsynchronizedBufferedInputStream(new FileInputStream(getResource().getOut().getFile()), 2048);
+            InputStream in = UnsynchronizedBufferedInputStream.builder()
+                .setInputStream(new FileInputStream(getResource().getOut().getFile()))
+                .setBufferSize(2048)
+                .get();
             getResource().streams.add(in);
             return in;
         }
diff --git a/server/container/util/src/main/java/org/apache/james/util/io/UnsynchronizedBufferedInputStream.java b/server/container/util/src/main/java/org/apache/james/util/io/UnsynchronizedBufferedInputStream.java
deleted file mode 100644
index cab709cc83b..00000000000
--- a/server/container/util/src/main/java/org/apache/james/util/io/UnsynchronizedBufferedInputStream.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you 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.                                           *
- ****************************************************************/
-
-package org.apache.james.util.io;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Copied from {@link java.io.BufferedInputStream} with the following modifications:
- *  - Removal of 'synchronized' keyword
- *  - Removal of 'volatile' keyword
- *  - Removal of Unsafe usages
- *
- *  See https://issues.apache.org/jira/projects/IO/issues/IO-786 for rationals
- */
-public class UnsynchronizedBufferedInputStream extends FilterInputStream {
-    private static int DEFAULT_BUFFER_SIZE = 8192;
-    private static int MAX_BUFFER_SIZE = 2147483639;
-    protected byte[] buf;
-    protected int count;
-    protected int pos;
-    protected int markpos;
-    protected int marklimit;
-
-    private InputStream getInIfOpen() throws IOException {
-        InputStream input = this.in;
-        if (input == null) {
-            throw new IOException("Stream closed");
-        } else {
-            return input;
-        }
-    }
-
-    private byte[] getBufIfOpen() throws IOException {
-        byte[] buffer = this.buf;
-        if (buffer == null) {
-            throw new IOException("Stream closed");
-        } else {
-            return buffer;
-        }
-    }
-
-    public UnsynchronizedBufferedInputStream(InputStream in) {
-        this(in, DEFAULT_BUFFER_SIZE);
-    }
-
-    public UnsynchronizedBufferedInputStream(InputStream in, int size) {
-        super(in);
-        this.markpos = -1;
-        if (size <= 0) {
-            throw new IllegalArgumentException("Buffer size <= 0");
-        } else {
-            this.buf = new byte[size];
-        }
-    }
-
-    private void fill() throws IOException {
-        byte[] buffer = this.getBufIfOpen();
-        int nsz;
-        if (this.markpos < 0) {
-            this.pos = 0;
-        } else if (this.pos >= buffer.length) {
-            if (this.markpos > 0) {
-                nsz = this.pos - this.markpos;
-                System.arraycopy(buffer, this.markpos, buffer, 0, nsz);
-                this.pos = nsz;
-                this.markpos = 0;
-            } else if (buffer.length >= this.marklimit) {
-                this.markpos = -1;
-                this.pos = 0;
-            } else {
-                if (buffer.length >= MAX_BUFFER_SIZE) {
-                    throw new OutOfMemoryError("Required array size too large");
-                }
-
-                nsz = this.pos <= MAX_BUFFER_SIZE - this.pos ? this.pos * 2 : MAX_BUFFER_SIZE;
-                if (nsz > this.marklimit) {
-                    nsz = this.marklimit;
-                }
-
-                byte[] nbuf = new byte[nsz];
-                System.arraycopy(buffer, 0, nbuf, 0, this.pos);
-
-                buffer = nbuf;
-            }
-        }
-
-        this.count = this.pos;
-        nsz = this.getInIfOpen().read(buffer, this.pos, buffer.length - this.pos);
-        if (nsz > 0) {
-            this.count = nsz + this.pos;
-        }
-
-    }
-
-    public int read() throws IOException {
-        if (this.pos >= this.count) {
-            this.fill();
-            if (this.pos >= this.count) {
-                return -1;
-            }
-        }
-
-        return this.getBufIfOpen()[this.pos++] & 255;
-    }
-
-    private int read1(byte[] b, int off, int len) throws IOException {
-        int avail = this.count - this.pos;
-        if (avail <= 0) {
-            if (len >= this.getBufIfOpen().length && this.markpos < 0) {
-                return this.getInIfOpen().read(b, off, len);
-            }
-
-            this.fill();
-            avail = this.count - this.pos;
-            if (avail <= 0) {
-                return -1;
-            }
-        }
-
-        int cnt = avail < len ? avail : len;
-        System.arraycopy(this.getBufIfOpen(), this.pos, b, off, cnt);
-        this.pos += cnt;
-        return cnt;
-    }
-
-    public int read(byte[] b, int off, int len) throws IOException {
-        this.getBufIfOpen();
-        if ((off | len | off + len | b.length - (off + len)) < 0) {
-            throw new IndexOutOfBoundsException();
-        } else if (len == 0) {
-            return 0;
-        } else {
-            int n = 0;
-
-            InputStream input;
-            do {
-                int nread = this.read1(b, off + n, len - n);
-                if (nread <= 0) {
-                    return n == 0 ? nread : n;
-                }
-
-                n += nread;
-                if (n >= len) {
-                    return n;
-                }
-
-                input = this.in;
-            } while (input == null || input.available() > 0);
-
-            return n;
-        }
-    }
-
-    public long skip(long n) throws IOException {
-        this.getBufIfOpen();
-        if (n <= 0L) {
-            return 0L;
-        } else {
-            long avail = (long)(this.count - this.pos);
-            if (avail <= 0L) {
-                if (this.markpos < 0) {
-                    return this.getInIfOpen().skip(n);
-                }
-
-                this.fill();
-                avail = (long)(this.count - this.pos);
-                if (avail <= 0L) {
-                    return 0L;
-                }
-            }
-
-            long skipped = avail < n ? avail : n;
-            this.pos = (int)((long)this.pos + skipped);
-            return skipped;
-        }
-    }
-
-    public int available() throws IOException {
-        int n = this.count - this.pos;
-        int avail = this.getInIfOpen().available();
-        return n > 2147483647 - avail ? 2147483647 : n + avail;
-    }
-
-    public void mark(int readlimit) {
-        this.marklimit = readlimit;
-        this.markpos = this.pos;
-    }
-
-    public void reset() throws IOException {
-        this.getBufIfOpen();
-        if (this.markpos < 0) {
-            throw new IOException("Resetting to invalid mark");
-        } else {
-            this.pos = this.markpos;
-        }
-    }
-
-    public boolean markSupported() {
-        return true;
-    }
-
-    public void close() throws IOException {
-        while (true) {
-            byte[] buffer;
-            if ((buffer = this.buf) != null) {
-
-                InputStream input = this.in;
-                this.in = null;
-                if (input != null) {
-                    input.close();
-                }
-
-                return;
-            }
-
-            return;
-        }
-    }
-}
diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml
index 521a3e5daeb..bde166d48a1 100644
--- a/server/mailet/integration-testing/pom.xml
+++ b/server/mailet/integration-testing/pom.xml
@@ -32,6 +32,10 @@
 
     <name>Apache James :: Server :: Mailet :: Integration Testing</name>
 
+    <properties>
+        <xmlunit.version>2.9.1</xmlunit.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${james.groupId}</groupId>
@@ -138,12 +142,12 @@
         <dependency>
             <groupId>org.xmlunit</groupId>
             <artifactId>xmlunit-core</artifactId>
-            <version>2.9.0</version>
+            <version>${xmlunit.version}</version>
         </dependency>
         <dependency>
             <groupId>org.xmlunit</groupId>
             <artifactId>xmlunit-matchers</artifactId>
-            <version>2.9.0</version>
+            <version>${xmlunit.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml
index b415acb5624..16cdc776f59 100644
--- a/server/mailet/mailets/pom.xml
+++ b/server/mailet/mailets/pom.xml
@@ -33,7 +33,7 @@
     <name>Apache James :: Server :: Mailets</name>
 
     <properties>
-        <spec2.version>4.17.0</spec2.version>
+        <spec2.version>4.20.0</spec2.version>
     </properties>
 
     <dependencies>
diff --git a/server/protocols/jmap-draft/pom.xml b/server/protocols/jmap-draft/pom.xml
index d6f1525d758..00e4378c284 100644
--- a/server/protocols/jmap-draft/pom.xml
+++ b/server/protocols/jmap-draft/pom.xml
@@ -266,7 +266,7 @@
         <dependency>
             <groupId>org.jgrapht</groupId>
             <artifactId>jgrapht-core</artifactId>
-            <version>1.5.1</version>
+            <version>1.5.2</version>
         </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>
diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/crypto/SecurityKeyLoader.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/crypto/SecurityKeyLoader.java
index e1b4660591e..b3fd1022002 100644
--- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/crypto/SecurityKeyLoader.java
+++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/crypto/SecurityKeyLoader.java
@@ -40,9 +40,9 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 
-import nl.altindag.ssl.exception.CertificateParseException;
+import nl.altindag.ssl.pem.exception.PemParseException;
+import nl.altindag.ssl.pem.util.PemUtils;
 import nl.altindag.ssl.util.KeyStoreUtils;
-import nl.altindag.ssl.util.PemUtils;
 
 public class SecurityKeyLoader {
     private static final String ALIAS = "james";
@@ -104,7 +104,7 @@ private PublicKey loadPublicKey() throws IOException {
                 fileSystem.getResource(jmapDraftConfiguration.getCertificates().get()))
                 .get(0);
             return certificate.getPublicKey();
-        } catch (CertificateParseException e) {
+        } catch (PemParseException e) {
             String publicKeyAsString = IOUtils.toString(fileSystem.getResource(jmapDraftConfiguration.getCertificates().get()), StandardCharsets.US_ASCII);
             return new PublicKeyReader()
                 .fromPEM(publicKeyAsString)
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/pom.xml b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/pom.xml
index ef6b172cbeb..35d750d7b32 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/pom.xml
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/pom.xml
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>com.softwaremill.sttp.client3</groupId>
             <artifactId>okhttp-backend_${scala.base}</artifactId>
-            <version>3.6.2</version>
+            <version>3.8.16</version>
         </dependency>
         <dependency>
             <groupId>com.typesafe.play</groupId>
diff --git a/server/protocols/jmap-rfc-8621/pom.xml b/server/protocols/jmap-rfc-8621/pom.xml
index c5594234231..72fd65a56b9 100644
--- a/server/protocols/jmap-rfc-8621/pom.xml
+++ b/server/protocols/jmap-rfc-8621/pom.xml
@@ -185,7 +185,7 @@
         <dependency>
             <groupId>org.typelevel</groupId>
             <artifactId>cats-core_${scala.base}</artifactId>
-            <version>2.8.0</version>
+            <version>2.9.0</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/server/protocols/jwt/pom.xml b/server/protocols/jwt/pom.xml
index d664bcc3f57..4ba4aa91446 100644
--- a/server/protocols/jwt/pom.xml
+++ b/server/protocols/jwt/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>jwks-rsa</artifactId>
-            <version>0.21.1</version>
+            <version>0.22.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerTest.java b/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerTest.java
index 551e0e34326..c05aa98d88c 100644
--- a/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerTest.java
+++ b/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerTest.java
@@ -124,7 +124,7 @@
 import io.netty.handler.codec.compression.ZlibWrapper;
 import io.netty.handler.ssl.SslContextBuilder;
 import nl.altindag.ssl.exception.GenericKeyStoreException;
-import nl.altindag.ssl.exception.PrivateKeyParseException;
+import nl.altindag.ssl.pem.exception.PrivateKeyParseException;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 import reactor.netty.Connection;
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/LegacyJavaEncryptionFactory.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/LegacyJavaEncryptionFactory.java
index 206a64f7c9f..491653ce426 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/LegacyJavaEncryptionFactory.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/LegacyJavaEncryptionFactory.java
@@ -40,8 +40,8 @@
 import com.github.fge.lambdas.Throwing;
 
 import nl.altindag.ssl.SSLFactory;
-import nl.altindag.ssl.trustmanager.TrustStoreTrustOptions;
-import nl.altindag.ssl.util.PemUtils;
+import nl.altindag.ssl.pem.util.PemUtils;
+import nl.altindag.ssl.trustmanager.trustoptions.TrustStoreTrustOptions;
 
 public class LegacyJavaEncryptionFactory implements Encryption.Factory {
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractConfigurableAsyncServer.class);
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/VacationRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/VacationRoutesTest.java
index 6aa94768651..15a2e781a0e 100755
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/VacationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/VacationRoutesTest.java
@@ -148,8 +148,8 @@ void postVacationCreates() {
         SoftAssertions.assertSoftly(softly -> {
             softly.assertThat(vacation).isNotNull();
             softly.assertThat(vacation.isEnabled()).isTrue();
-            softly.assertThat(vacation.getFromDate()).isEqualTo(Optional.of(ZonedDateTime.parse("2021-09-20T10:00:00Z[UTC]")));
-            softly.assertThat(vacation.getToDate()).isEqualTo(Optional.of(ZonedDateTime.parse("2021-09-27T18:00:00Z[UTC]")));
+            softly.assertThat(vacation.getFromDate()).isEqualTo(Optional.of(ZonedDateTime.parse("2021-09-20T10:00:00Z")));
+            softly.assertThat(vacation.getToDate()).isEqualTo(Optional.of(ZonedDateTime.parse("2021-09-27T18:00:00Z")));
             softly.assertThat(vacation.getSubject()).isEqualTo(Optional.of("On vacation again"));
             softly.assertThat(vacation.getTextBody()).isEqualTo(Optional.of("Need more vacation!"));
             softly.assertThat(vacation.getHtmlBody()).isEqualTo(Optional.of("<p>Need more vacation!</p>"));
@@ -176,8 +176,8 @@ void postVacationUpdatesAll() throws Exception {
         SoftAssertions.assertSoftly(softly -> {
             softly.assertThat(vacation).isNotNull();
             softly.assertThat(vacation.isEnabled()).isTrue();
-            softly.assertThat(vacation.getFromDate()).isEqualTo(Optional.of(ZonedDateTime.parse("2021-09-20T10:00:00Z[UTC]")));
-            softly.assertThat(vacation.getToDate()).isEqualTo(Optional.of(ZonedDateTime.parse("2021-09-27T18:00:00Z[UTC]")));
+            softly.assertThat(vacation.getFromDate()).isEqualTo(Optional.of(ZonedDateTime.parse("2021-09-20T10:00:00Z")));
+            softly.assertThat(vacation.getToDate()).isEqualTo(Optional.of(ZonedDateTime.parse("2021-09-27T18:00:00Z")));
             softly.assertThat(vacation.getSubject()).isEqualTo(Optional.of("On vacation again"));
             softly.assertThat(vacation.getTextBody()).isEqualTo(Optional.of("Need more vacation!"));
             softly.assertThat(vacation.getHtmlBody()).isEqualTo(Optional.of("<p>Need more vacation!</p>"));
diff --git a/server/protocols/webadmin/webadmin-dropwizard-metrics/pom.xml b/server/protocols/webadmin/webadmin-dropwizard-metrics/pom.xml
index d1d669820bc..d858521a6c4 100644
--- a/server/protocols/webadmin/webadmin-dropwizard-metrics/pom.xml
+++ b/server/protocols/webadmin/webadmin-dropwizard-metrics/pom.xml
@@ -33,6 +33,10 @@
     <description>HTTP endpoint to expose dropwizard collected metrics. This endpoint is intended to be called by
     Prometheus.</description>
 
+    <properties>
+        <prometheus.version>0.16.0</prometheus.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${james.groupId}</groupId>
@@ -61,12 +65,12 @@
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>simpleclient_dropwizard</artifactId>
-            <version>0.15.0</version>
+            <version>${prometheus.version}</version>
         </dependency>
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>simpleclient_servlet</artifactId>
-            <version>0.15.0</version>
+            <version>${prometheus.version}</version>
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
diff --git a/server/queue/queue-pulsar/pom.xml b/server/queue/queue-pulsar/pom.xml
index 7e9cbd7bc53..19c8c6e4771 100644
--- a/server/queue/queue-pulsar/pom.xml
+++ b/server/queue/queue-pulsar/pom.xml
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>com.clever-cloud.pulsar4s</groupId>
             <artifactId>pulsar4s-play-json_${scala.base}</artifactId>
-            <version>2.8.1</version>
+            <version>2.9.0</version>
         </dependency>
         <dependency>
             <groupId>com.typesafe.play</groupId>