Upgrade dependencies - only lib

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>

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>

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>

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>

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>

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

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();
+    }
 }

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>

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();

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) {

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");
         }

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) {

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>

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))) {