This is an automated email from the ASF dual-hosted git repository. btellier pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git.
from 98f9684 Merge pull request #289 from chibenwa/drop-jmap-draft-cassandra-integration-tests new c386502 JAMES-3500 Re-enable some reuseForks new 355153e JAMES-3500 Use a wait strategy on MockSMTP server new c52ee9e JAMES-3500 Reduce build verbosity new f73be07 JAMES-3500 Tag extra unstable test new d7eea88 JAMES-3500 Fix instable test in RabbitMQEventDeadLettersIntegrationTest new f3eb2cf JAMES-3500 Reuse Cassandra image accross maven projects new 153bc57 JAMES-3500 Add a retrier for ConfigurationClient new d0f347b JAMES-3255 Tag some unstable tests new 74e2b8d JAMES-3500 Increase isolation for mailet integration tests new bea9c7e JAMES-3500 Increase memory allocated to surefire for webadmin deployment tests new 735d689 JAMES-3500 Disable unused protocols in webAdmin integration tests new 88ae89d JAMES-3500 Fix instable test in GetMailboxesMethodTest new 139dbc9 JAMES-3500 Fasten deploy: -T1C new 9569e94 JAMES-3491 WebSocket PUSH cancellation new 6698bcb JAMES-3497 Remove unused properties in MPT master POM new 85f9ee2 JAMES-3497 apache-james-mpt-antlib no longer exists new fc23d65 [REFACTORING] Convert mpt tests to JUNIT 5 new 053aaa9 JAMES-2884 Improve JMAP EmailBodyPart documentation formatting The 18 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: Jenkinsfile | 3 +- .../james/backends/cassandra/DockerCassandra.java | 31 +++++-- backends-common/elasticsearch/pom.xml | 2 +- backends-common/rabbitmq/pom.xml | 2 +- mailbox/api/pom.xml | 2 +- mailbox/backup/pom.xml | 2 +- mailbox/cassandra/pom.xml | 4 +- mailbox/event/json/pom.xml | 2 +- mailbox/memory/pom.xml | 2 +- mailbox/store/pom.xml | 2 +- mailbox/tools/indexer/pom.xml | 2 +- mailet/standard/pom.xml | 2 +- mdn/pom.xml | 2 +- mpt/impl/imap-mailbox/cassandra/pom.xml | 2 +- .../cassandra/CassandraAuthenticatePlainTest.java | 15 +-- .../cassandra/CassandraAuthenticatedStateTest.java | 15 +-- .../cassandra/CassandraConcurrentSessionsTest.java | 15 +-- .../cassandra/CassandraCondstoreTest.java | 16 +--- .../imapmailbox/cassandra/CassandraCopyTest.java | 15 +-- .../imapmailbox/cassandra/CassandraEventsTest.java | 15 +-- .../cassandra/CassandraExpungeTest.java | 15 +-- .../cassandra/CassandraFetchBodySectionTest.java | 15 +-- .../cassandra/CassandraFetchBodyStructureTest.java | 15 +-- .../cassandra/CassandraFetchHeadersTest.java | 15 +-- .../imapmailbox/cassandra/CassandraFetchTest.java | 15 +-- .../cassandra/CassandraListingTest.java | 17 ++-- .../cassandra/CassandraListingWithSharingTest.java | 15 +-- .../cassandra/CassandraMailboxAnnotationTest.java | 15 +-- .../CassandraMailboxWithLongNameErrorTest.java | 15 +-- .../imapmailbox/cassandra/CassandraMoveTest.java | 15 +-- .../CassandraNonAuthenticatedStateTest.java | 15 +-- .../cassandra/CassandraPartialFetchTest.java | 15 +-- .../imapmailbox/cassandra/CassandraQuotaTest.java | 15 +-- .../imapmailbox/cassandra/CassandraRenameTest.java | 15 +-- .../imapmailbox/cassandra/CassandraSearchTest.java | 15 +-- .../cassandra/CassandraSecurityTest.java | 15 +-- .../imapmailbox/cassandra/CassandraSelectTest.java | 15 +-- .../cassandra/CassandraSelectedInboxTest.java | 15 +-- .../cassandra/CassandraSelectedStateTest.java | 15 +-- .../cassandra/CassandraUidSearchOnIndexTest.java | 15 +-- .../cassandra/CassandraUidSearchTest.java | 15 +-- .../cassandra/CassandraUserFlagsSupportTest.java | 15 +-- ...Rule.java => CassandraHostSystemExtension.java} | 41 ++++++--- .../james/mpt/imapmailbox/suite/ACLCommands.java | 7 +- .../mpt/imapmailbox/suite/ACLIntegration.java | 6 +- .../mpt/imapmailbox/suite/AuthenticatePlain.java | 6 +- .../mpt/imapmailbox/suite/AuthenticatedState.java | 6 +- .../mpt/imapmailbox/suite/ConcurrentSessions.java | 6 +- .../james/mpt/imapmailbox/suite/Condstore.java | 6 +- .../apache/james/mpt/imapmailbox/suite/Copy.java | 6 +- .../apache/james/mpt/imapmailbox/suite/Events.java | 6 +- .../james/mpt/imapmailbox/suite/Expunge.java | 6 +- .../apache/james/mpt/imapmailbox/suite/Fetch.java | 6 +- .../mpt/imapmailbox/suite/FetchBodySection.java | 6 +- .../mpt/imapmailbox/suite/FetchBodyStructure.java | 6 +- .../james/mpt/imapmailbox/suite/FetchHeaders.java | 6 +- .../james/mpt/imapmailbox/suite/Listing.java | 6 +- .../imapmailbox/suite/ListingWithSharingTest.java | 6 +- .../mpt/imapmailbox/suite/MailboxAnnotation.java | 6 +- .../suite/MailboxWithLongNameError.java | 6 +- .../apache/james/mpt/imapmailbox/suite/Move.java | 6 +- .../imapmailbox/suite/NonAuthenticatedState.java | 6 +- .../james/mpt/imapmailbox/suite/PartialFetch.java | 6 +- .../james/mpt/imapmailbox/suite/QuotaTest.java | 6 +- .../apache/james/mpt/imapmailbox/suite/Recent.java | 6 +- .../apache/james/mpt/imapmailbox/suite/Rename.java | 6 +- .../apache/james/mpt/imapmailbox/suite/Search.java | 6 +- .../james/mpt/imapmailbox/suite/Security.java | 7 +- .../apache/james/mpt/imapmailbox/suite/Select.java | 6 +- .../james/mpt/imapmailbox/suite/SelectedInbox.java | 6 +- .../james/mpt/imapmailbox/suite/SelectedState.java | 6 +- .../james/mpt/imapmailbox/suite/UidSearch.java | 6 +- .../mpt/imapmailbox/suite/UidSearchOnIndex.java | 6 +- .../mpt/imapmailbox/suite/UserFlagsSupport.java | 6 +- .../mpt/imapmailbox/cyrus/CyrusACLCommands.java | 8 +- .../mpt/imapmailbox/cyrus/CyrusACLIntegration.java | 8 +- .../elasticsearch/ElasticSearchRecentTest.java | 12 +-- .../ElasticSearchUidSearchOnIndexTest.java | 10 +- mpt/impl/imap-mailbox/inmemory/pom.xml | 2 +- .../inmemory/InMemoryAuthenticatePlainTest.java | 6 +- .../inmemory/InMemoryAuthenticatedStateTest.java | 6 +- .../inmemory/InMemoryConcurrentSessionsTest.java | 6 +- .../inmemory/InMemoryCondstoreTest.java | 5 +- .../mpt/imapmailbox/inmemory/InMemoryCopyTest.java | 6 +- .../imapmailbox/inmemory/InMemoryEventsTest.java | 6 +- .../imapmailbox/inmemory/InMemoryExpungeTest.java | 6 +- .../inmemory/InMemoryFetchBodySectionTest.java | 6 +- .../inmemory/InMemoryFetchBodyStructureTest.java | 6 +- .../inmemory/InMemoryFetchHeadersTest.java | 6 +- .../imapmailbox/inmemory/InMemoryFetchTest.java | 6 +- .../imapmailbox/inmemory/InMemoryListingTest.java | 8 +- .../inmemory/InMemoryListingWithSharingTest.java | 6 +- .../inmemory/InMemoryMailboxAnnotationTest.java | 6 +- .../InMemoryMailboxWithLongNameErrorTest.java | 4 +- .../mpt/imapmailbox/inmemory/InMemoryMoveTest.java | 6 +- .../InMemoryNonAuthenticatedStateTest.java | 6 +- .../inmemory/InMemoryPartialFetchTest.java | 6 +- .../imapmailbox/inmemory/InMemoryQuotaTest.java | 6 +- .../imapmailbox/inmemory/InMemoryRecentTest.java | 6 +- .../imapmailbox/inmemory/InMemoryRenameTest.java | 6 +- .../imapmailbox/inmemory/InMemorySearchTest.java | 6 +- .../imapmailbox/inmemory/InMemorySecurityTest.java | 6 +- .../imapmailbox/inmemory/InMemorySelectTest.java | 6 +- .../inmemory/InMemorySelectedInboxTest.java | 6 +- .../inmemory/InMemorySelectedStateTest.java | 6 +- .../inmemory/InMemoryUidSearchOnIndexTest.java | 6 +- .../inmemory/InMemoryUidSearchTest.java | 6 +- .../inmemory/InMemoryUserFlagsSupportTest.java | 6 +- mpt/impl/imap-mailbox/jpa/pom.xml | 2 +- .../imapmailbox/jpa/JpaAuthenticatePlainTest.java | 12 +-- .../imapmailbox/jpa/JpaAuthenticatedStateTest.java | 12 +-- .../imapmailbox/jpa/JpaConcurrentSessionsTest.java | 10 +- .../mpt/imapmailbox/jpa/JpaCondstoreTest.java | 10 +- .../james/mpt/imapmailbox/jpa/JpaCopyTest.java | 10 +- .../james/mpt/imapmailbox/jpa/JpaEventsTest.java | 10 +- .../james/mpt/imapmailbox/jpa/JpaExpungeTest.java | 10 +- .../imapmailbox/jpa/JpaFetchBodySectionTest.java | 10 +- .../imapmailbox/jpa/JpaFetchBodyStructureTest.java | 10 +- .../mpt/imapmailbox/jpa/JpaFetchHeadersTest.java | 10 +- .../james/mpt/imapmailbox/jpa/JpaFetchTest.java | 10 +- .../james/mpt/imapmailbox/jpa/JpaListingTest.java | 10 +- .../imapmailbox/jpa/JpaMailboxAnnotationTest.java | 10 +- .../jpa/JpaMailboxWithLongNameErrorTest.java | 10 +- .../james/mpt/imapmailbox/jpa/JpaMoveTest.java | 10 +- .../jpa/JpaNonAuthenticatedStateTest.java | 10 +- .../mpt/imapmailbox/jpa/JpaPartialFetchTest.java | 10 +- .../james/mpt/imapmailbox/jpa/JpaQuotaTest.java | 10 +- .../james/mpt/imapmailbox/jpa/JpaRenameTest.java | 10 +- .../james/mpt/imapmailbox/jpa/JpaSearchTest.java | 10 +- .../james/mpt/imapmailbox/jpa/JpaSecurityTest.java | 10 +- .../james/mpt/imapmailbox/jpa/JpaSelectTest.java | 10 +- .../mpt/imapmailbox/jpa/JpaSelectedInboxTest.java | 10 +- .../mpt/imapmailbox/jpa/JpaSelectedStateTest.java | 10 +- .../imapmailbox/jpa/JpaUidSearchOnIndexTest.java | 10 +- .../mpt/imapmailbox/jpa/JpaUidSearchTest.java | 10 +- .../imapmailbox/jpa/JpaUserFlagsSupportTest.java | 10 +- ...SystemRule.java => JPAHostSystemExtension.java} | 21 ++--- mpt/impl/imap-mailbox/lucenesearch/pom.xml | 2 +- .../lucenesearch/LuceneAuthenticatePlainTest.java | 6 +- .../lucenesearch/LuceneAuthenticatedStateTest.java | 6 +- .../lucenesearch/LuceneConcurrentSessionsTest.java | 10 +- .../lucenesearch/LuceneCondstoreTest.java | 10 +- .../imapmailbox/lucenesearch/LuceneCopyTest.java | 8 +- .../imapmailbox/lucenesearch/LuceneEventsTest.java | 10 +- .../lucenesearch/LuceneExpungeTest.java | 10 +- .../lucenesearch/LuceneFetchBodySectionTest.java | 10 +- .../lucenesearch/LuceneFetchBodyStructureTest.java | 10 +- .../lucenesearch/LuceneFetchHeadersTest.java | 10 +- .../imapmailbox/lucenesearch/LuceneFetchTest.java | 10 +- .../lucenesearch/LuceneListingTest.java | 10 +- .../lucenesearch/LuceneMailboxAnnotationTest.java | 10 +- .../LuceneMailboxWithLongNameErrorTest.java | 10 +- .../imapmailbox/lucenesearch/LuceneMoveTest.java | 6 +- .../LuceneNonAuthenticatedStateTest.java | 10 +- .../lucenesearch/LucenePartialFetchTest.java | 10 +- .../imapmailbox/lucenesearch/LuceneQuotaTest.java | 6 +- .../imapmailbox/lucenesearch/LuceneRecentTest.java | 10 +- .../imapmailbox/lucenesearch/LuceneRenameTest.java | 10 +- .../lucenesearch/LuceneSecurityTest.java | 10 +- .../imapmailbox/lucenesearch/LuceneSelectTest.java | 10 +- .../lucenesearch/LuceneSelectedInboxTest.java | 10 +- .../lucenesearch/LuceneSelectedStateTest.java | 10 +- .../lucenesearch/LuceneUidSearchOnIndexTest.java | 10 +- .../lucenesearch/LuceneUserFlagsSupportTest.java | 10 +- .../maildir/MaildirAuthenticatePlainTest.java | 10 +- .../maildir/MaildirAuthenticatedStateTest.java | 12 +-- .../maildir/MaildirConcurrentSessionsTest.java | 10 +- .../imapmailbox/maildir/MaildirCondstoreTest.java | 10 +- .../mpt/imapmailbox/maildir/MaildirCopyTest.java | 10 +- .../mpt/imapmailbox/maildir/MaildirEventsTest.java | 10 +- .../imapmailbox/maildir/MaildirExpungeTest.java | 10 +- .../maildir/MaildirFetchBodySectionTest.java | 10 +- .../maildir/MaildirFetchBodyStructureTest.java | 10 +- .../maildir/MaildirFetchHeadersTest.java | 10 +- .../mpt/imapmailbox/maildir/MaildirFetchTest.java | 10 +- .../imapmailbox/maildir/MaildirListingTest.java | 10 +- .../maildir/MaildirMailboxAnnotationTest.java | 10 +- .../MaildirMailboxWithLongNameErrorTest.java | 10 +- .../mpt/imapmailbox/maildir/MaildirMoveTest.java | 10 +- .../maildir/MaildirNonAuthenticatedStateTest.java | 10 +- .../maildir/MaildirPartialFetchTest.java | 10 +- .../mpt/imapmailbox/maildir/MaildirQuotaTest.java | 6 +- .../mpt/imapmailbox/maildir/MaildirRenameTest.java | 10 +- .../mpt/imapmailbox/maildir/MaildirSearchTest.java | 8 +- .../imapmailbox/maildir/MaildirSecurityTest.java | 10 +- .../mpt/imapmailbox/maildir/MaildirSelectTest.java | 10 +- .../maildir/MaildirSelectedInboxTest.java | 10 +- .../maildir/MaildirSelectedStateTest.java | 10 +- .../maildir/MaildirUidSearchOnIndexTest.java | 10 +- .../imapmailbox/maildir/MaildirUidSearchTest.java | 10 +- .../maildir/MaildirUserFlagsSupportTest.java | 10 +- .../rabbitmq/RabbitMQAuthenticatePlainTest.java | 14 +-- .../rabbitmq/RabbitMQAuthenticatedStateTest.java | 14 +-- .../rabbitmq/RabbitMQConcurrentSessionsTest.java | 14 +-- .../rabbitmq/RabbitMQCondstoreTest.java | 14 +-- .../mpt/imapmailbox/rabbitmq/RabbitMQCopyTest.java | 14 +-- .../imapmailbox/rabbitmq/RabbitMQEventsTest.java | 14 +-- .../rabbitmq/RabbitMQFetchBodySectionTest.java | 14 +-- .../rabbitmq/RabbitMQFetchBodyStructureTest.java | 14 +-- .../rabbitmq/RabbitMQFetchHeadersTest.java | 14 +-- .../imapmailbox/rabbitmq/RabbitMQFetchTest.java | 14 +-- .../imapmailbox/rabbitmq/RabbitMQListingTest.java | 14 +-- .../rabbitmq/RabbitMQListingWithSharingTest.java | 14 +-- .../rabbitmq/RabbitMQMailboxAnnotationTest.java | 14 +-- .../RabbitMQMailboxWithLongNameErrorTest.java | 14 +-- .../mpt/imapmailbox/rabbitmq/RabbitMQMoveTest.java | 14 +-- .../RabbitMQNonAuthenticatedStateTest.java | 14 +-- .../rabbitmq/RabbitMQPartialFetchTest.java | 14 +-- .../imapmailbox/rabbitmq/RabbitMQQuotaTest.java | 14 +-- .../imapmailbox/rabbitmq/RabbitMQRenameTest.java | 14 +-- .../imapmailbox/rabbitmq/RabbitMQSearchTest.java | 14 +-- .../imapmailbox/rabbitmq/RabbitMQSecurityTest.java | 14 +-- .../imapmailbox/rabbitmq/RabbitMQSelectTest.java | 14 +-- .../rabbitmq/RabbitMQSelectedInboxTest.java | 14 +-- .../rabbitmq/RabbitMQSelectedStateTest.java | 14 +-- .../rabbitmq/RabbitMQUidSearchTest.java | 14 +-- .../rabbitmq/RabbitMQUserFlagsSupportTest.java | 14 +-- .../host/RabbitMQEventBusHostSystemExtension.java | 48 +++++----- .../host/RabbitMQEventBusHostSystemRule.java | 52 ----------- .../apache/james/mpt/smtp/SmtpAuthCommandTest.java | 6 +- mpt/pom.xml | 4 - pom.xml | 13 +-- protocols/imap/pom.xml | 2 +- protocols/smtp/pom.xml | 2 +- server/blob/blob-cassandra/pom.xml | 2 +- server/blob/blob-memory/pom.xml | 2 +- server/blob/blob-s3/pom.xml | 13 +++ .../guice/cassandra-rabbitmq-guice/pom.xml | 2 +- server/data/data-cassandra/pom.xml | 2 +- server/data/data-file/pom.xml | 2 +- server/mailet/integration-testing/pom.xml | 1 - .../james/mailets/RemoteDeliveryErrorTest.java | 34 +++---- .../org/apache/james/smtp/dsn/DSNRelayTest.java | 55 ++++------- .../james/smtp/dsn/DSNRemoteIntegrationTest.java | 25 ++--- server/mailet/mailets/pom.xml | 2 +- server/mailet/mock-smtp-server/pom.xml | 18 +++- .../mock/smtp/server/ConfigurationClient.java | 2 + .../mock/smtp/server/HTTPConfigurationServer.java | 2 +- .../james/mock/smtp/server/MockSMTPServerMain.java | 6 +- .../server/testing/MockSmtpServerExtension.java | 8 +- .../src/{resources => main/jib}/logback.xml | 0 .../mock/smtp/server/ConfigurationClientTest.java | 2 +- .../smtp/server/HTTPConfigurationServerTest.java | 3 +- .../mailrepository-cassandra/pom.xml | 2 +- .../integration/GetMailboxesMethodTest.java | 24 ++--- .../pom.xml | 2 +- server/protocols/jmap-draft/pom.xml | 2 +- .../pom.xml | 2 +- .../jmap/rfc8621/contract/WebSocketContract.scala | 102 +++++++++++++++++++++ .../memory-jmap-rfc-8621-integration-tests/pom.xml | 13 +++ .../doc/specs/spec/mail/message.mdown | 8 +- .../james/jmap/core/WebSocketTransport.scala | 3 +- .../james/jmap/json/ResponseSerializer.scala | 1 + .../apache/james/jmap/routes/WebSocketRoutes.scala | 3 +- .../distributed-webadmin-integration-test/pom.xml | 4 +- .../RabbitMQEventDeadLettersIntegrationTest.java | 86 ++++++++++++----- ...LinshareBlobExportMechanismIntegrationTest.java | 3 + .../src/test/resources/imapserver.xml | 15 --- .../src/test/resources/lmtpserver.xml | 18 ---- .../src/test/resources/managesieveserver.xml | 33 ------- .../src/test/resources/pop3server.xml | 19 ---- .../src/test/resources/smtpserver.xml | 56 ----------- .../memory-webadmin-integration-test/pom.xml | 4 +- ...LinshareBlobExportMechanismIntegrationTest.java | 3 + .../webadmin/routes/AddressMappingRoutesTest.java | 1 - .../james/webadmin/routes/AliasRoutesTest.java | 1 - .../webadmin/routes/DomainMappingsRoutesTest.java | 1 - .../james/webadmin/routes/ForwardRoutesTest.java | 1 - .../james/webadmin/routes/GroupsRoutesTest.java | 1 - .../james/webadmin/routes/MappingRoutesTest.java | 1 - .../webadmin/routes/RegexMappingRoutesTest.java | 1 - .../routes/DeletedMessagesVaultRoutesTest.java | 2 - server/protocols/webadmin/webadmin-mailbox/pom.xml | 2 +- .../java/org/apache/james/util/docker/Images.java | 2 +- 274 files changed, 1194 insertions(+), 1626 deletions(-) rename mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/{CassandraHostSystemRule.java => CassandraHostSystemExtension.java} (54%) rename mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/{JPAHostSystemRule.java => JPAHostSystemExtension.java} (77%) rename backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/DockerRabbitMQTestRule.java => mpt/impl/imap-mailbox/rabbitmq/src/test/java/org/apache/james/mpt/imapmailbox/rabbitmq/host/RabbitMQEventBusHostSystemExtension.java (57%) delete mode 100644 mpt/impl/imap-mailbox/rabbitmq/src/test/java/org/apache/james/mpt/imapmailbox/rabbitmq/host/RabbitMQEventBusHostSystemRule.java rename server/mailet/mock-smtp-server/src/{resources => main/jib}/logback.xml (100%) --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org For additional commands, e-mail: notifications-h...@james.apache.org