From e3e7872efa86ef8b659bcb5e5eba8fa1994a0917 Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Mon, 17 Jul 2023 15:13:39 +0700 Subject: [PATCH 01/22] [UPGRADE] - Maven org.codehaus.mojo:versions-maven-plugin:2.11.0 ->2.16.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bbea10ea761..5d9bc4c6d2c 100644 --- a/pom.xml +++ b/pom.xml @@ -3417,7 +3417,7 @@ org.codehaus.mojo versions-maven-plugin - 2.11.0 + 2.16.0 org.eclipse.m2e From 566ba68e7983c992c0e23942fa7114f1433918e0 Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Mon, 17 Jul 2023 15:28:30 +0700 Subject: [PATCH 02/22] [UPGRADE] - Maven org.apache.maven:maven-plugin-api 3.8.5 -> 3.9.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d9bc4c6d2c..183937371ee 100644 --- a/pom.xml +++ b/pom.xml @@ -640,7 +640,7 @@ 3.0-alpha-1 3.6.4 - 3.8.5 + 3.9.3 3.1.0 3.0 2.0.3 From 3f8e7c517c771645a8f5547d5385c8d09003b6a0 Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Mon, 17 Jul 2023 15:34:16 +0700 Subject: [PATCH 03/22] [UPGRADE] - Maven org.apache.maven.wagon:wagon-ssh 3.5.2 -> 3.5.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 183937371ee..d7dee1658d7 100644 --- a/pom.xml +++ b/pom.xml @@ -3308,7 +3308,7 @@ org.apache.maven.wagon wagon-ssh - 3.5.2 + 3.5.3 From 3e006a9e513112896de7bb02a574f5758032d8ff Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Mon, 17 Jul 2023 15:34:45 +0700 Subject: [PATCH 04/22] [UPGRADE] - Maven com.puppycrawl.tools:checkstyle 10.3.4 -> 10.12.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d7dee1658d7..5d96b16fc73 100644 --- a/pom.xml +++ b/pom.xml @@ -3618,7 +3618,7 @@ com.puppycrawl.tools checkstyle - 10.3.4 + 10.12.1 From dfb5a918e97276f9071a8bac5e08360c155eb220 Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Mon, 17 Jul 2023 15:35:15 +0700 Subject: [PATCH 05/22] [UPGRADE] - Maven org.apache.maven.doxia:doxia-module-markdown 1.9.1 -> 1.12.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d96b16fc73..78993ed60ad 100644 --- a/pom.xml +++ b/pom.xml @@ -3600,7 +3600,7 @@ org.apache.maven.doxia doxia-module-markdown - 1.9.1 + 1.12.0 From 84b44308a9a95c4a3ac9558d712c92e92df9d02d Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Mon, 17 Jul 2023 18:35:39 +0700 Subject: [PATCH 06/22] [UPGRADE] - Maven org.apache.maven.reporting:maven-reporting-api 3.0 -> 3.1.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 78993ed60ad..e50b67c73a6 100644 --- a/pom.xml +++ b/pom.xml @@ -642,7 +642,7 @@ 3.6.4 3.9.3 3.1.0 - 3.0 + 3.1.1 2.0.3 javax.activation activation From 4962753aca15b35a0778c984d273afa7b6d8a39f Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Mon, 17 Jul 2023 18:36:43 +0700 Subject: [PATCH 07/22] [UPGRADE] - Maven org.apache.maven.plugin-tools:maven-plugin-annotations 3.6.4 -> 3.9.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e50b67c73a6..b03f73e763d 100644 --- a/pom.xml +++ b/pom.xml @@ -639,7 +639,7 @@ 4.5.13 3.0-alpha-1 - 3.6.4 + 3.9.0 3.9.3 3.1.0 3.1.1 From f4088c5c89aecf9dd2386df1c144bba5d465a20f Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Mon, 10 Jul 2023 09:26:43 +0700 Subject: [PATCH 08/22] [UPGRADE] - Maven surefire plugin/ surefire report plugin: 2.22.2 -> 3.1.2 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b03f73e763d..44ac6395e1b 100644 --- a/pom.xml +++ b/pom.xml @@ -3323,7 +3323,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + 3.1.2 @@ -3342,7 +3342,7 @@ org.apache.maven.plugins maven-surefire-report-plugin - 2.22.2 + 3.1.2 true @@ -3783,7 +3783,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + 3.1.2 unstable From 95111ee23920444947a52d9a4b46aa7a339d4c71 Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Mon, 10 Jul 2023 09:26:53 +0700 Subject: [PATCH 09/22] Maven - Execute build surefire report after test --- pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index 44ac6395e1b..292721986c2 100644 --- a/pom.xml +++ b/pom.xml @@ -3665,6 +3665,19 @@ + + org.apache.maven.plugins + maven-surefire-report-plugin + + + build-surefire-report + + report-only + + post-integration-test + + + From 97f6937cac2179bc7a7c59a196fff5649f99c2c8 Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Wed, 19 Jul 2023 11:31:38 +0700 Subject: [PATCH 10/22] [UPGRADE] - Maven com.github.ekryd.sortpom:sortpom-maven-plugin 3.1.2 -> 3.2.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 292721986c2..249729dc8ee 100644 --- a/pom.xml +++ b/pom.xml @@ -2957,7 +2957,7 @@ com.github.ekryd.sortpom sortpom-maven-plugin - 3.1.2 + 3.2.1 false false From 0bb778b8bb0290fc45b8d6d935d77320acf5cbe6 Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Wed, 19 Jul 2023 11:32:13 +0700 Subject: [PATCH 11/22] [UPGRADE] - Maven jib-maven-plugin 3.2.1 -> 3.3.2 --- examples/custom-james-assembly/README.md | 2 +- examples/custom-james-assembly/pom.xml | 2 +- pom.xml | 2 +- server/mailet/mock-smtp-server/pom.xml | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/custom-james-assembly/README.md b/examples/custom-james-assembly/README.md index c26525e053b..81b3bd65675 100644 --- a/examples/custom-james-assembly/README.md +++ b/examples/custom-james-assembly/README.md @@ -71,7 +71,7 @@ We do provide in this example [JIB](https://github.com/GoogleContainerTools/jib/ com.google.cloud.tools jib-maven-plugin - 2.7.1 + 3.3.2 adoptopenjdk:11-jdk-hotspot diff --git a/examples/custom-james-assembly/pom.xml b/examples/custom-james-assembly/pom.xml index a56d151b80f..374806e268e 100644 --- a/examples/custom-james-assembly/pom.xml +++ b/examples/custom-james-assembly/pom.xml @@ -51,7 +51,7 @@ com.google.cloud.tools jib-maven-plugin - 2.7.1 + 3.3.2 eclipse-temurin:11-jre-jammy diff --git a/pom.xml b/pom.xml index 249729dc8ee..8684d2856ff 100644 --- a/pom.xml +++ b/pom.xml @@ -2999,7 +2999,7 @@ com.google.cloud.tools jib-maven-plugin - 3.2.1 + 3.3.2 io.github.evis diff --git a/server/mailet/mock-smtp-server/pom.xml b/server/mailet/mock-smtp-server/pom.xml index 03a2afe1ebf..a583247b65b 100644 --- a/server/mailet/mock-smtp-server/pom.xml +++ b/server/mailet/mock-smtp-server/pom.xml @@ -121,7 +121,6 @@ com.google.cloud.tools jib-maven-plugin - 2.7.0 eclipse-temurin:11-jre-jammy From d7ad395e067de5736cef8619b3517100e60718e5 Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Wed, 19 Jul 2023 11:33:18 +0700 Subject: [PATCH 12/22] [UPGRADE] - Maven org.scalatest:scalatest-maven-plugin 2.0.2 -> 2.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8684d2856ff..6f65890cfdd 100644 --- a/pom.xml +++ b/pom.xml @@ -3034,7 +3034,7 @@ org.scalatest scalatest-maven-plugin - 2.0.2 + 2.2.0 ${project.build.directory}/surefire-reports . From 8ae6e869abffaefa8488d4d31a2962d3e14812b9 Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Wed, 19 Jul 2023 11:33:41 +0700 Subject: [PATCH 13/22] [UPGRADE] - Maven org.apache.maven.plugins:maven-assembly-plugin 3.1.1 -> 3.6.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6f65890cfdd..e14a685f498 100644 --- a/pom.xml +++ b/pom.xml @@ -3105,7 +3105,7 @@ org.apache.maven.plugins maven-assembly-plugin - 3.1.1 + 3.6.0 org.apache.maven.plugins From 78f5fbb4cef18ccfb07062e8a2ff05805e7df2e7 Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Wed, 19 Jul 2023 11:34:09 +0700 Subject: [PATCH 14/22] [UPGRADE] - Maven maven-checkstyle-plugin 3.1.2 -> 3.3.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e14a685f498..ed69b059a21 100644 --- a/pom.xml +++ b/pom.xml @@ -3121,7 +3121,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.2 + 3.3.0 org.apache.maven.plugins From a0a4ecbe262590ece65990f5cbba0416625bc7df Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Wed, 19 Jul 2023 11:34:38 +0700 Subject: [PATCH 15/22] [UPGRADE] - Maven maven-compiler-plugin 3.8.1 -> 3.11.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ed69b059a21..1f1ddbb159e 100644 --- a/pom.xml +++ b/pom.xml @@ -3131,7 +3131,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 true ${target.jdk} From e5fe4dd97f465b4de8bd5a31f8fe45128ae5942f Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Wed, 19 Jul 2023 11:34:59 +0700 Subject: [PATCH 16/22] [UPGRADE] - Maven maven-jar-plugin 3.2.2 -> 3.3.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1f1ddbb159e..3ddbc4b0528 100644 --- a/pom.xml +++ b/pom.xml @@ -3199,7 +3199,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.2 + 3.3.0 org.apache.maven.plugins From ba76de8586f018efec8615ad22dfc11efdd8fe86 Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Wed, 19 Jul 2023 12:45:25 +0700 Subject: [PATCH 17/22] [UPGRADE] - Maven - pl.project13.maven:git-commit-id-plugin 4.9.10 -> io.github.git-commit-id:git-commit-id-maven-plugin 6.0.0 --- examples/pom.xml | 10 ++++++++++ pom.xml | 14 +++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index c8681fe9c2f..f4ea85b9ca0 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -73,6 +73,16 @@ + + io.github.git-commit-id + git-commit-id-maven-plugin + + + get-the-git-infos + none + + + diff --git a/pom.xml b/pom.xml index 3ddbc4b0528..955c0e0d233 100644 --- a/pom.xml +++ b/pom.xml @@ -3493,9 +3493,9 @@ - pl.project13.maven - git-commit-id-plugin - 4.9.10 + io.github.git-commit-id + git-commit-id-maven-plugin + 6.0.0 @@ -3632,8 +3632,8 @@ - pl.project13.maven - git-commit-id-plugin + io.github.git-commit-id + git-commit-id-maven-plugin ${project.basedir}/.git git @@ -3984,8 +3984,8 @@ - pl.project13.maven - git-commit-id-plugin + io.github.git-commit-id + git-commit-id-maven-plugin get-the-git-infos From c22189df80ea2475d254f11c6fffecc11eb96b33 Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Wed, 19 Jul 2023 13:33:06 +0700 Subject: [PATCH 18/22] [UPGRADE] - Maven - org.apache.maven.plugins:maven-jxr-plugin 3.2.0 -> 3.3.0 --- pom.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 955c0e0d233..8e5f143f804 100644 --- a/pom.xml +++ b/pom.xml @@ -3237,10 +3237,7 @@ org.apache.maven.plugins maven-jxr-plugin - 3.2.0 - - true - + 3.3.0 org.apache.maven.plugins From abf6a1a07755543850cffa154c1ffb789d7940fe Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Fri, 21 Jul 2023 17:53:50 +0700 Subject: [PATCH 19/22] [CLEAN CODE] - Maven - Remove maven-surefire-plugin version tag in child pom --- .../rabbitmq-jmap-draft-integration-testing/pom.xml | 1 - .../distributed-jmap-rfc-8621-integration-tests/pom.xml | 1 - .../distributed-webadmin-integration-test/pom.xml | 1 - 3 files changed, 3 deletions(-) diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml index 10d8c064d21..a03e2edc84b 100644 --- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml +++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml @@ -175,7 +175,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 org.apache.james.junit.categories.Unstable diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml index 7a3ed08c214..f82e7570fee 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml +++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml @@ -146,7 +146,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 unstable diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml index f8b8a98ad36..16259ef9c31 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml @@ -122,7 +122,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 unstable From 441ca3524da6cabb19f607b01abaf3770204dbea Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Wed, 26 Jul 2023 10:07:27 +0700 Subject: [PATCH 20/22] Jenkinsfile - echo maven version, java version --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 2e0293778d9..da3164751d8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -64,6 +64,8 @@ pipeline { steps { echo 'Building branch ' + env.BRANCH_NAME echo 'Using PATH ' + env.PATH + sh 'mvn -version' + sh 'java -version' } } From 166a80c4bff188dac46c10f113bef7bc76b8df54 Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Wed, 26 Jul 2023 11:21:18 +0700 Subject: [PATCH 21/22] Fix JMAP draft test - increase Duration of time waiting to start James server - Fix error: org.awaitility.core.ConditionTimeoutException: Lambda expression in org.apache.james.jmap.HttpJmapAuthentication that uses org.apache.http.client.utils.URIBuilder, org.apache.http.client.utils.URIBuilderorg.apache.james.core.Username, org.apache.james.core.Usernamejava.lang.String: expected ANYTHING but was null within 10 seconds. --- .../java/org/apache/james/jmap/HttpJmapAuthentication.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/testing/src/main/java/org/apache/james/jmap/HttpJmapAuthentication.java b/server/testing/src/main/java/org/apache/james/jmap/HttpJmapAuthentication.java index 79e14c9e3c3..00fbc34b415 100644 --- a/server/testing/src/main/java/org/apache/james/jmap/HttpJmapAuthentication.java +++ b/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()); } From 846a299e8238067d812e32b0ec0aa748cd4337f2 Mon Sep 17 00:00:00 2001 From: Tung Tran Date: Wed, 26 Jul 2023 19:21:56 +0700 Subject: [PATCH 22/22] Disable the update flag concurrency test cases in CassandraMessageMapperTest --- ...ssandraMessageMapperRelaxedConsistencyTest.java | 14 ++++++++++++++ .../cassandra/mail/CassandraMessageMapperTest.java | 14 ++++++++++++++ .../store/mail/model/MessageMapperTest.java | 8 ++++---- 3 files changed, 32 insertions(+), 4 deletions(-) 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/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) {