Upgrade dependencies - maven plugin

Jenkinsfile

@@ -64,6 +64,8 @@ pipeline {
             steps {
                 echo 'Building branch ' + env.BRANCH_NAME
                 echo 'Using PATH ' + env.PATH
+                sh 'mvn -version'
+                sh 'java -version'
             }
         }
 

examples/custom-james-assembly/README.md

@@ -71,7 +71,7 @@ We do provide in this example [JIB](https://github.com/GoogleContainerTools/jib/
 <plugin>
     <groupId>com.google.cloud.tools</groupId>
     <artifactId>jib-maven-plugin</artifactId>
-    <version>2.7.1</version>
+    <version>3.3.2</version>
     <configuration>
         <from>
             <image>adoptopenjdk:11-jdk-hotspot</image>

examples/custom-james-assembly/pom.xml

@@ -51,7 +51,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>2.7.1</version>
+                <version>3.3.2</version>
                 <configuration>
                     <from>
                         <image>eclipse-temurin:11-jre-jammy</image>

examples/pom.xml

@@ -73,6 +73,16 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>io.github.git-commit-id</groupId>
+        <artifactId>git-commit-id-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>get-the-git-infos</id>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

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

pom.xml

@@ -639,10 +639,10 @@
         <apache.httpcomponents.version>4.5.13</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>
-        <maven-plugin-api.version>3.8.5</maven-plugin-api.version>
+        <maven-plugin-annotations.version>3.9.0</maven-plugin-annotations.version>
+        <maven-plugin-api.version>3.9.3</maven-plugin-api.version>
         <maven-reporting-impl.version>3.1.0</maven-reporting-impl.version>
-        <maven-reporting-api.version>3.0</maven-reporting-api.version>
+        <maven-reporting-api.version>3.1.1</maven-reporting-api.version>
         <qdox.version>2.0.3</qdox.version>
         <javax.activation.groupId>javax.activation</javax.activation.groupId>
         <javax.activation.artifactId>activation</javax.activation.artifactId>
@@ -2957,7 +2957,7 @@
                 <plugin>
                     <groupId>com.github.ekryd.sortpom</groupId>
                     <artifactId>sortpom-maven-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.2.1</version>
                     <configuration>
                         <createBackupFile>false</createBackupFile>
                         <expandEmptyElements>false</expandEmptyElements>
@@ -2999,7 +2999,7 @@
                 <plugin>
                     <groupId>com.google.cloud.tools</groupId>
                     <artifactId>jib-maven-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.3.2</version>
                 </plugin>
                 <plugin>
                     <groupId>io.github.evis</groupId>
@@ -3034,7 +3034,7 @@
                 <plugin>
                     <groupId>org.scalatest</groupId>
                     <artifactId>scalatest-maven-plugin</artifactId>
-                    <version>2.0.2</version>
+                    <version>2.2.0</version>
                     <configuration>
                         <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
                         <junitxml>.</junitxml>
@@ -3105,7 +3105,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.6.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -3121,7 +3121,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -3131,7 +3131,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.11.0</version>
                     <configuration>
                         <optimize>true</optimize>
                         <source>${target.jdk}</source>
@@ -3199,7 +3199,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.2</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -3237,10 +3237,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jxr-plugin</artifactId>
-                    <version>3.2.0</version>
-                    <configuration>
-                        <aggregate>true</aggregate>
-                    </configuration>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -3308,7 +3305,7 @@
                         <dependency>
                             <groupId>org.apache.maven.wagon</groupId>
                             <artifactId>wagon-ssh</artifactId>
-                            <version>3.5.2</version>
+                            <version>3.5.3</version>
                         </dependency>
                     </dependencies>
                     <executions>
@@ -3323,7 +3320,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.2</version>
+                    <version>3.1.2</version>
                     <configuration>
                         <systemPropertyVariables>
                             <!--https://issues.apache.org/jira/browse/JAMES-3724-->
@@ -3342,7 +3339,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>2.22.2</version>
+                    <version>3.1.2</version>
                     <configuration>
                         <aggregate>true</aggregate>
                     </configuration>
@@ -3417,7 +3414,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.11.0</version>
+                    <version>2.16.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>
@@ -3493,9 +3490,9 @@
                     </configuration>
                 </plugin>
                 <plugin>
-                    <groupId>pl.project13.maven</groupId>
-                    <artifactId>git-commit-id-plugin</artifactId>
-                    <version>4.9.10</version>
+                    <groupId>io.github.git-commit-id</groupId>
+                    <artifactId>git-commit-id-maven-plugin</artifactId>
+                    <version>6.0.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -3600,7 +3597,7 @@
                     <dependency>
                         <groupId>org.apache.maven.doxia</groupId>
                         <artifactId>doxia-module-markdown</artifactId>
-                        <version>1.9.1</version>
+                        <version>1.12.0</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -3618,7 +3615,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>10.3.4</version>
+                        <version>10.12.1</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -3632,8 +3629,8 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
+                <groupId>io.github.git-commit-id</groupId>
+                <artifactId>git-commit-id-maven-plugin</artifactId>
                 <configuration>
                     <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
                     <prefix>git</prefix>
@@ -3665,6 +3662,19 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>build-surefire-report</id>
+                        <goals>
+                            <goal>report-only</goal>
+                        </goals>
+                        <phase>post-integration-test</phase>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <extensions>
             <extension>
@@ -3783,7 +3793,7 @@
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-surefire-plugin</artifactId>
-                            <version>2.22.2</version>
+                            <version>3.1.2</version>
                             <configuration>
                                 <excludedGroups />
                                 <groups>unstable</groups>
@@ -3971,8 +3981,8 @@
                         </plugin>
 
                         <plugin>
-                            <groupId>pl.project13.maven</groupId>
-                            <artifactId>git-commit-id-plugin</artifactId>
+                            <groupId>io.github.git-commit-id</groupId>
+                            <artifactId>git-commit-id-maven-plugin</artifactId>
                             <executions>
                                 <execution>
                                     <id>get-the-git-infos</id>

server/mailet/mock-smtp-server/pom.xml

@@ -121,7 +121,6 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>2.7.0</version>
                 <configuration>
                     <from>
                         <image>eclipse-temurin:11-jre-jammy</image>

server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml

@@ -175,7 +175,6 @@
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-surefire-plugin</artifactId>
-                            <version>2.22.2</version>
                             <configuration>
                                 <excludedGroups />
                                 <groups combine.self="override">org.apache.james.junit.categories.Unstable</groups>

server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml

@@ -146,7 +146,6 @@
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-surefire-plugin</artifactId>
-                            <version>2.22.2</version>
                             <configuration>
                                 <excludedGroups />
                                 <groups>unstable</groups>

server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml

@@ -122,7 +122,6 @@
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-surefire-plugin</artifactId>
-                            <version>2.22.2</version>
                             <configuration>
                                 <excludedGroups />
                                 <groups>unstable</groups>

server/testing/src/main/java/org/apache/james/jmap/HttpJmapAuthentication.java

@@ -23,6 +23,7 @@
 
 import java.io.IOException;
 import java.net.URISyntaxException;
+import java.time.Duration;
 
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.fluent.Request;
@@ -37,7 +38,9 @@
 public class HttpJmapAuthentication {
 
     public static AccessToken authenticateJamesUser(URIBuilder uriBuilder, Username username, String password) {
-        return calmlyAwait.until(
+        return calmlyAwait
+            .atMost(Duration.ofMinutes(2))
+            .until(
             () -> doAuthenticate(uriBuilder, username, password), IsAnything.anything());
     }