You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2020/06/19 01:39:18 UTC

[james-project] branch 3.5.x updated (ba532d0 -> 9b068b5)

This is an automated email from the ASF dual-hosted git repository.

btellier pushed a change to branch 3.5.x
in repository https://gitbox.apache.org/repos/asf/james-project.git.


    from ba532d0  Remove leading line breaks
     new 0894fab  JAMES-3192 Upgrade Apache configuration to 2.7
     new 5ad068e  JAMES-3195 Avoid loosing stacktrace when fails to delete a file
     new f0c6576  JAMES-3197 Mailet processing should handle NoClassDefFoundError
     new 64d2270  JAMES-3197 Matcher processing should handle NoClassDefFoundError
     new 9b068b5  [maven-release-plugin] prepare release james-project-3.5.0

The 5 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:
 backends-common/cassandra/pom.xml                  |  2 +-
 backends-common/elasticsearch/pom.xml              |  2 +-
 backends-common/jpa/pom.xml                        |  2 +-
 backends-common/pom.xml                            |  2 +-
 backends-common/rabbitmq/pom.xml                   |  2 +-
 core/pom.xml                                       |  2 +-
 event-sourcing/event-sourcing-core/pom.xml         |  2 +-
 event-sourcing/event-sourcing-pojo/pom.xml         |  2 +-
 event-sourcing/event-store-api/pom.xml             |  2 +-
 event-sourcing/event-store-cassandra/pom.xml       |  2 +-
 event-sourcing/event-store-memory/pom.xml          |  2 +-
 event-sourcing/pom.xml                             |  2 +-
 examples/custom-listeners/pom.xml                  |  2 +-
 examples/custom-mailets/pom.xml                    |  2 +-
 examples/pom.xml                                   |  2 +-
 javax-mail-extension/pom.xml                       |  2 +-
 json/pom.xml                                       |  2 +-
 mailbox/api/pom.xml                                |  2 +-
 mailbox/backup/pom.xml                             |  2 +-
 mailbox/cassandra/pom.xml                          |  2 +-
 mailbox/elasticsearch/pom.xml                      |  2 +-
 mailbox/event/event-cassandra/pom.xml              |  2 +-
 mailbox/event/event-memory/pom.xml                 |  2 +-
 mailbox/event/event-rabbitmq/pom.xml               |  2 +-
 mailbox/event/json/pom.xml                         |  2 +-
 mailbox/jpa/pom.xml                                |  2 +-
 mailbox/lucene/pom.xml                             |  2 +-
 mailbox/maildir/pom.xml                            |  2 +-
 mailbox/memory/pom.xml                             |  2 +-
 .../deleted-messages-vault-cassandra/pom.xml       |  2 +-
 mailbox/plugin/deleted-messages-vault/pom.xml      |  2 +-
 mailbox/plugin/quota-mailing-cassandra/pom.xml     |  2 +-
 mailbox/plugin/quota-mailing-memory/pom.xml        |  2 +-
 mailbox/plugin/quota-mailing/pom.xml               |  2 +-
 mailbox/plugin/quota-search-elasticsearch/pom.xml  |  2 +-
 mailbox/plugin/quota-search-scanning/pom.xml       |  2 +-
 mailbox/plugin/quota-search/pom.xml                |  2 +-
 mailbox/plugin/spamassassin/pom.xml                |  2 +-
 mailbox/pom.xml                                    |  2 +-
 mailbox/scanning-search/pom.xml                    |  2 +-
 mailbox/spring/pom.xml                             |  2 +-
 mailbox/store/pom.xml                              |  2 +-
 mailbox/tika/pom.xml                               |  2 +-
 mailbox/tools/copier/pom.xml                       |  2 +-
 mailbox/tools/indexer/pom.xml                      |  2 +-
 mailbox/tools/jpa-migrator/pom.xml                 |  2 +-
 mailbox/tools/maildir-utils/pom.xml                |  2 +-
 mailet/ai/pom.xml                                  |  2 +-
 mailet/api/pom.xml                                 |  2 +-
 mailet/base/pom.xml                                |  2 +-
 mailet/crypto/pom.xml                              |  2 +-
 mailet/icalendar/pom.xml                           |  2 +-
 mailet/mailetdocs-maven-plugin/pom.xml             |  2 +-
 mailet/pom.xml                                     |  2 +-
 mailet/standard/pom.xml                            |  2 +-
 mailet/test/pom.xml                                |  2 +-
 mdn/pom.xml                                        |  2 +-
 metrics/metrics-api/pom.xml                        |  2 +-
 metrics/metrics-dropwizard/pom.xml                 |  2 +-
 metrics/metrics-logger/pom.xml                     |  2 +-
 metrics/metrics-tests/pom.xml                      |  2 +-
 metrics/pom.xml                                    |  2 +-
 mpt/all/pom.xml                                    |  2 +-
 mpt/antlib/pom.xml                                 |  2 +-
 mpt/app/pom.xml                                    |  2 +-
 mpt/core/pom.xml                                   |  2 +-
 mpt/impl/imap-mailbox/cassandra/pom.xml            |  2 +-
 mpt/impl/imap-mailbox/core/pom.xml                 |  2 +-
 mpt/impl/imap-mailbox/cyrus/pom.xml                |  2 +-
 mpt/impl/imap-mailbox/elasticsearch/pom.xml        |  2 +-
 mpt/impl/imap-mailbox/external-james/pom.xml       |  2 +-
 mpt/impl/imap-mailbox/inmemory/pom.xml             |  2 +-
 mpt/impl/imap-mailbox/jpa/pom.xml                  |  2 +-
 mpt/impl/imap-mailbox/lucenesearch/pom.xml         |  2 +-
 mpt/impl/imap-mailbox/maildir/pom.xml              |  2 +-
 mpt/impl/imap-mailbox/pom.xml                      |  2 +-
 mpt/impl/imap-mailbox/rabbitmq/pom.xml             |  2 +-
 mpt/impl/managesieve/cassandra/pom.xml             |  2 +-
 mpt/impl/managesieve/core/pom.xml                  |  2 +-
 mpt/impl/managesieve/file/pom.xml                  |  2 +-
 mpt/impl/managesieve/pom.xml                       |  2 +-
 .../smtp/cassandra-rabbitmq-object-storage/pom.xml |  2 +-
 mpt/impl/smtp/cassandra/pom.xml                    |  2 +-
 mpt/impl/smtp/core/pom.xml                         |  2 +-
 mpt/impl/smtp/pom.xml                              |  2 +-
 mpt/mavenplugin/pom.xml                            |  2 +-
 mpt/pom.xml                                        |  2 +-
 pom.xml                                            |  8 ++---
 protocols/api/pom.xml                              |  2 +-
 protocols/imap/pom.xml                             |  2 +-
 protocols/lmtp/pom.xml                             |  2 +-
 protocols/managesieve/pom.xml                      |  2 +-
 protocols/netty/pom.xml                            |  2 +-
 protocols/pom.xml                                  |  2 +-
 protocols/pop3/pom.xml                             |  2 +-
 protocols/smtp/pom.xml                             |  2 +-
 server/app/pom.xml                                 |  2 +-
 server/blob/blob-api/pom.xml                       |  2 +-
 server/blob/blob-cassandra/pom.xml                 |  2 +-
 server/blob/blob-common/pom.xml                    |  2 +-
 server/blob/blob-export-api/pom.xml                |  2 +-
 server/blob/blob-export-file/pom.xml               |  2 +-
 server/blob/blob-memory/pom.xml                    |  2 +-
 server/blob/blob-objectstorage/pom.xml             |  2 +-
 server/blob/blob-union/pom.xml                     |  2 +-
 server/blob/mail-store/pom.xml                     |  2 +-
 server/blob/pom.xml                                |  2 +-
 server/container/cli-integration/pom.xml           |  2 +-
 server/container/cli/pom.xml                       |  2 +-
 server/container/core/pom.xml                      |  2 +-
 server/container/filesystem-api/pom.xml            |  2 +-
 server/container/guice/activemq/pom.xml            |  2 +-
 server/container/guice/blob-api-guice/pom.xml      |  2 +-
 server/container/guice/blob-export-guice/pom.xml   |  2 +-
 server/container/guice/blob-memory-guice/pom.xml   |  2 +-
 .../guice/blob-objectstorage-guice/pom.xml         |  2 +-
 server/container/guice/cassandra-guice/pom.xml     |  2 +-
 .../container/guice/cassandra-ldap-guice/pom.xml   |  2 +-
 .../guice/cassandra-rabbitmq-guice/pom.xml         |  2 +-
 .../guice/cassandra-rabbitmq-ldap-guice/pom.xml    |  2 +-
 server/container/guice/configuration/pom.xml       |  2 +-
 server/container/guice/es-metric-reporter/pom.xml  |  2 +-
 server/container/guice/guice-common/pom.xml        |  2 +-
 server/container/guice/guice-utils/pom.xml         |  2 +-
 server/container/guice/jmx/pom.xml                 |  2 +-
 server/container/guice/jpa-common-guice/pom.xml    |  2 +-
 server/container/guice/jpa-guice/pom.xml           |  2 +-
 server/container/guice/jpa-smtp-common/pom.xml     |  2 +-
 server/container/guice/jpa-smtp-mariadb/pom.xml    |  2 +-
 server/container/guice/jpa-smtp/pom.xml            |  2 +-
 .../pom.xml                                        |  2 +-
 .../guice/mailbox-plugin-spamassassin/pom.xml      |  2 +-
 server/container/guice/mailbox/pom.xml             |  2 +-
 server/container/guice/mailet/pom.xml              |  2 +-
 server/container/guice/memory-guice/pom.xml        |  2 +-
 server/container/guice/onami/pom.xml               |  2 +-
 server/container/guice/pom.xml                     |  2 +-
 server/container/guice/protocols/imap/pom.xml      |  2 +-
 .../container/guice/protocols/jmap-draft/pom.xml   |  2 +-
 server/container/guice/protocols/lmtp/pom.xml      |  2 +-
 .../container/guice/protocols/managedsieve/pom.xml |  2 +-
 server/container/guice/protocols/netty/pom.xml     |  2 +-
 server/container/guice/protocols/pop/pom.xml       |  2 +-
 server/container/guice/protocols/smtp/pom.xml      |  2 +-
 .../guice/protocols/webadmin-data/pom.xml          |  2 +-
 .../guice/protocols/webadmin-jmap/pom.xml          |  2 +-
 .../guice/protocols/webadmin-mailbox/pom.xml       |  2 +-
 .../guice/protocols/webadmin-mailqueue/pom.xml     |  2 +-
 .../protocols/webadmin-mailrepository/pom.xml      |  2 +-
 .../guice/protocols/webadmin-swagger/pom.xml       |  2 +-
 server/container/guice/protocols/webadmin/pom.xml  |  2 +-
 server/container/guice/rabbitmq/pom.xml            |  2 +-
 server/container/guice/sieve-file/pom.xml          |  2 +-
 server/container/guice/sieve-jpa/pom.xml           |  2 +-
 .../testing/custom-mailets-implementation/pom.xml  |  2 +-
 .../container/guice/testing/custom-mailets/pom.xml |  2 +-
 server/container/guice/testing/dependency/pom.xml  |  2 +-
 server/container/guice/testing/pom.xml             |  2 +-
 server/container/lifecycle-api/pom.xml             |  2 +-
 server/container/mailbox-adapter/pom.xml           |  2 +-
 server/container/mailbox-jmx/pom.xml               |  2 +-
 .../container/metrics/metrics-es-reporter/pom.xml  |  2 +-
 server/container/spring/pom.xml                    |  2 +-
 server/container/util/pom.xml                      |  2 +-
 server/data/data-api/pom.xml                       |  2 +-
 server/data/data-cassandra/pom.xml                 |  2 +-
 server/data/data-file/pom.xml                      |  2 +-
 server/data/data-jdbc/pom.xml                      |  2 +-
 server/data/data-jmap-cassandra/pom.xml            |  2 +-
 server/data/data-jmap/pom.xml                      |  2 +-
 server/data/data-jpa/pom.xml                       |  2 +-
 server/data/data-ldap/pom.xml                      |  2 +-
 server/data/data-library/pom.xml                   |  2 +-
 server/data/data-memory/pom.xml                    |  2 +-
 server/dns-service/dnsservice-api/pom.xml          |  2 +-
 server/dns-service/dnsservice-dnsjava/pom.xml      |  2 +-
 server/dns-service/dnsservice-library/pom.xml      |  2 +-
 server/dns-service/dnsservice-test/pom.xml         |  2 +-
 server/mailet/dkim/pom.xml                         |  2 +-
 server/mailet/integration-testing/pom.xml          |  2 +-
 .../org/apache/james/mailets/MailetErrorsTest.java | 40 ++++++++++++++++++++++
 ...Mailet.java => NoClassDefFoundErrorMailet.java} |  4 +--
 ...tcher.java => NoClassDefFoundErrorMatcher.java} |  5 +--
 server/mailet/mailetcontainer-api/pom.xml          |  2 +-
 server/mailet/mailetcontainer-camel/pom.xml        |  2 +-
 .../james/mailetcontainer/impl/ProcessorUtil.java  |  4 +--
 .../mailetcontainer/impl/camel/CamelProcessor.java |  4 +--
 .../impl/camel/MatcherSplitter.java                |  4 +--
 .../impl/jmx/JMXStateMailetProcessorListener.java  |  4 +--
 .../lib/AbstractStateMailetProcessor.java          |  4 +--
 .../lib/AbstractStateMailetProcessorTest.java      | 20 +++++------
 server/mailet/mailets/pom.xml                      |  2 +-
 server/mailet/mock-smtp-server/pom.xml             |  2 +-
 server/mailrepository/mailrepository-api/pom.xml   |  2 +-
 .../mailrepository-cassandra/pom.xml               |  2 +-
 .../mailrepository/mailrepository-memory/pom.xml   |  2 +-
 server/pom.xml                                     |  2 +-
 server/protocols/fetchmail/pom.xml                 |  2 +-
 .../pom.xml                                        |  2 +-
 .../jmap-draft-integration-testing-common/pom.xml  |  2 +-
 .../memory-jmap-draft-integration-testing/pom.xml  |  2 +-
 .../jmap-draft-integration-testing/pom.xml         |  2 +-
 .../pom.xml                                        |  2 +-
 server/protocols/jmap-draft/pom.xml                |  2 +-
 server/protocols/jmap-rfc-8621/pom.xml             |  5 ++-
 server/protocols/jmap/pom.xml                      |  6 ++--
 server/protocols/jwt/pom.xml                       |  2 +-
 server/protocols/protocols-imap4/pom.xml           |  2 +-
 server/protocols/protocols-library/pom.xml         |  2 +-
 server/protocols/protocols-lmtp/pom.xml            |  2 +-
 server/protocols/protocols-managesieve/pom.xml     |  2 +-
 server/protocols/protocols-pop3/pom.xml            |  2 +-
 server/protocols/protocols-smtp/pom.xml            |  2 +-
 .../distributed-webadmin-integration-test/pom.xml  |  2 +-
 .../memory-webadmin-integration-test/pom.xml       |  2 +-
 server/protocols/webadmin-integration-test/pom.xml |  2 +-
 .../webadmin-integration-test-common/pom.xml       |  2 +-
 server/protocols/webadmin/pom.xml                  |  2 +-
 .../webadmin/webadmin-cassandra-data/pom.xml       |  2 +-
 .../protocols/webadmin/webadmin-cassandra/pom.xml  |  2 +-
 server/protocols/webadmin/webadmin-core/pom.xml    |  2 +-
 server/protocols/webadmin/webadmin-data/pom.xml    |  2 +-
 server/protocols/webadmin/webadmin-jmap/pom.xml    |  2 +-
 .../webadmin-mailbox-deleted-message-vault/pom.xml |  2 +-
 server/protocols/webadmin/webadmin-mailbox/pom.xml |  2 +-
 .../protocols/webadmin/webadmin-mailqueue/pom.xml  |  2 +-
 .../webadmin/webadmin-mailrepository/pom.xml       |  2 +-
 server/protocols/webadmin/webadmin-swagger/pom.xml |  2 +-
 server/queue/queue-activemq/pom.xml                |  2 +-
 .../queue/activemq/ActiveMQMailQueueItem.java      |  2 +-
 server/queue/queue-api/pom.xml                     |  2 +-
 server/queue/queue-file/pom.xml                    |  2 +-
 server/queue/queue-jms/pom.xml                     |  2 +-
 server/queue/queue-memory/pom.xml                  |  2 +-
 server/queue/queue-rabbitmq/pom.xml                |  2 +-
 server/task/task-api/pom.xml                       |  2 +-
 server/task/task-distributed/pom.xml               |  2 +-
 server/task/task-json/pom.xml                      |  2 +-
 server/task/task-memory/pom.xml                    |  2 +-
 server/testing/pom.xml                             |  2 +-
 testing/base/pom.xml                               |  2 +-
 third-party/linshare/pom.xml                       |  2 +-
 third-party/pom.xml                                |  2 +-
 third-party/spamassassin/pom.xml                   |  2 +-
 244 files changed, 305 insertions(+), 267 deletions(-)
 copy server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/{NoopMailet.java => NoClassDefFoundErrorMailet.java} (93%)
 copy server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/{RuntimeErrorMatcher.java => NoClassDefFoundErrorMatcher.java} (90%)


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 01/05: JAMES-3192 Upgrade Apache configuration to 2.7

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch 3.5.x
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 0894fab28e127ea246f3ca277320f62688782d21
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri May 22 09:31:16 2020 +0700

    JAMES-3192 Upgrade Apache configuration to 2.7
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7ed1e86..e69a26a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2294,7 +2294,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-configuration2</artifactId>
-                <version>2.5</version>
+                <version>2.7</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -2315,7 +2315,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-text</artifactId>
-                <version>1.7</version>
+                <version>1.8</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.derby</groupId>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 05/05: [maven-release-plugin] prepare release james-project-3.5.0

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch 3.5.x
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 9b068b5a06c7982f6a86d0420ab58aa812707664
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Jun 19 08:38:52 2020 +0700

    [maven-release-plugin] prepare release james-project-3.5.0
---
 backends-common/cassandra/pom.xml                                   | 2 +-
 backends-common/elasticsearch/pom.xml                               | 2 +-
 backends-common/jpa/pom.xml                                         | 2 +-
 backends-common/pom.xml                                             | 2 +-
 backends-common/rabbitmq/pom.xml                                    | 2 +-
 core/pom.xml                                                        | 2 +-
 event-sourcing/event-sourcing-core/pom.xml                          | 2 +-
 event-sourcing/event-sourcing-pojo/pom.xml                          | 2 +-
 event-sourcing/event-store-api/pom.xml                              | 2 +-
 event-sourcing/event-store-cassandra/pom.xml                        | 2 +-
 event-sourcing/event-store-memory/pom.xml                           | 2 +-
 event-sourcing/pom.xml                                              | 2 +-
 examples/custom-listeners/pom.xml                                   | 2 +-
 examples/custom-mailets/pom.xml                                     | 2 +-
 examples/pom.xml                                                    | 2 +-
 javax-mail-extension/pom.xml                                        | 2 +-
 json/pom.xml                                                        | 2 +-
 mailbox/api/pom.xml                                                 | 2 +-
 mailbox/backup/pom.xml                                              | 2 +-
 mailbox/cassandra/pom.xml                                           | 2 +-
 mailbox/elasticsearch/pom.xml                                       | 2 +-
 mailbox/event/event-cassandra/pom.xml                               | 2 +-
 mailbox/event/event-memory/pom.xml                                  | 2 +-
 mailbox/event/event-rabbitmq/pom.xml                                | 2 +-
 mailbox/event/json/pom.xml                                          | 2 +-
 mailbox/jpa/pom.xml                                                 | 2 +-
 mailbox/lucene/pom.xml                                              | 2 +-
 mailbox/maildir/pom.xml                                             | 2 +-
 mailbox/memory/pom.xml                                              | 2 +-
 mailbox/plugin/deleted-messages-vault-cassandra/pom.xml             | 2 +-
 mailbox/plugin/deleted-messages-vault/pom.xml                       | 2 +-
 mailbox/plugin/quota-mailing-cassandra/pom.xml                      | 2 +-
 mailbox/plugin/quota-mailing-memory/pom.xml                         | 2 +-
 mailbox/plugin/quota-mailing/pom.xml                                | 2 +-
 mailbox/plugin/quota-search-elasticsearch/pom.xml                   | 2 +-
 mailbox/plugin/quota-search-scanning/pom.xml                        | 2 +-
 mailbox/plugin/quota-search/pom.xml                                 | 2 +-
 mailbox/plugin/spamassassin/pom.xml                                 | 2 +-
 mailbox/pom.xml                                                     | 2 +-
 mailbox/scanning-search/pom.xml                                     | 2 +-
 mailbox/spring/pom.xml                                              | 2 +-
 mailbox/store/pom.xml                                               | 2 +-
 mailbox/tika/pom.xml                                                | 2 +-
 mailbox/tools/copier/pom.xml                                        | 2 +-
 mailbox/tools/indexer/pom.xml                                       | 2 +-
 mailbox/tools/jpa-migrator/pom.xml                                  | 2 +-
 mailbox/tools/maildir-utils/pom.xml                                 | 2 +-
 mailet/ai/pom.xml                                                   | 2 +-
 mailet/api/pom.xml                                                  | 2 +-
 mailet/base/pom.xml                                                 | 2 +-
 mailet/crypto/pom.xml                                               | 2 +-
 mailet/icalendar/pom.xml                                            | 2 +-
 mailet/mailetdocs-maven-plugin/pom.xml                              | 2 +-
 mailet/pom.xml                                                      | 2 +-
 mailet/standard/pom.xml                                             | 2 +-
 mailet/test/pom.xml                                                 | 2 +-
 mdn/pom.xml                                                         | 2 +-
 metrics/metrics-api/pom.xml                                         | 2 +-
 metrics/metrics-dropwizard/pom.xml                                  | 2 +-
 metrics/metrics-logger/pom.xml                                      | 2 +-
 metrics/metrics-tests/pom.xml                                       | 2 +-
 metrics/pom.xml                                                     | 2 +-
 mpt/all/pom.xml                                                     | 2 +-
 mpt/antlib/pom.xml                                                  | 2 +-
 mpt/app/pom.xml                                                     | 2 +-
 mpt/core/pom.xml                                                    | 2 +-
 mpt/impl/imap-mailbox/cassandra/pom.xml                             | 2 +-
 mpt/impl/imap-mailbox/core/pom.xml                                  | 2 +-
 mpt/impl/imap-mailbox/cyrus/pom.xml                                 | 2 +-
 mpt/impl/imap-mailbox/elasticsearch/pom.xml                         | 2 +-
 mpt/impl/imap-mailbox/external-james/pom.xml                        | 2 +-
 mpt/impl/imap-mailbox/inmemory/pom.xml                              | 2 +-
 mpt/impl/imap-mailbox/jpa/pom.xml                                   | 2 +-
 mpt/impl/imap-mailbox/lucenesearch/pom.xml                          | 2 +-
 mpt/impl/imap-mailbox/maildir/pom.xml                               | 2 +-
 mpt/impl/imap-mailbox/pom.xml                                       | 2 +-
 mpt/impl/imap-mailbox/rabbitmq/pom.xml                              | 2 +-
 mpt/impl/managesieve/cassandra/pom.xml                              | 2 +-
 mpt/impl/managesieve/core/pom.xml                                   | 2 +-
 mpt/impl/managesieve/file/pom.xml                                   | 2 +-
 mpt/impl/managesieve/pom.xml                                        | 2 +-
 mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml             | 2 +-
 mpt/impl/smtp/cassandra/pom.xml                                     | 2 +-
 mpt/impl/smtp/core/pom.xml                                          | 2 +-
 mpt/impl/smtp/pom.xml                                               | 2 +-
 mpt/mavenplugin/pom.xml                                             | 2 +-
 mpt/pom.xml                                                         | 2 +-
 pom.xml                                                             | 4 ++--
 protocols/api/pom.xml                                               | 2 +-
 protocols/imap/pom.xml                                              | 2 +-
 protocols/lmtp/pom.xml                                              | 2 +-
 protocols/managesieve/pom.xml                                       | 2 +-
 protocols/netty/pom.xml                                             | 2 +-
 protocols/pom.xml                                                   | 2 +-
 protocols/pop3/pom.xml                                              | 2 +-
 protocols/smtp/pom.xml                                              | 2 +-
 server/app/pom.xml                                                  | 2 +-
 server/blob/blob-api/pom.xml                                        | 2 +-
 server/blob/blob-cassandra/pom.xml                                  | 2 +-
 server/blob/blob-common/pom.xml                                     | 2 +-
 server/blob/blob-export-api/pom.xml                                 | 2 +-
 server/blob/blob-export-file/pom.xml                                | 2 +-
 server/blob/blob-memory/pom.xml                                     | 2 +-
 server/blob/blob-objectstorage/pom.xml                              | 2 +-
 server/blob/blob-union/pom.xml                                      | 2 +-
 server/blob/mail-store/pom.xml                                      | 2 +-
 server/blob/pom.xml                                                 | 2 +-
 server/container/cli-integration/pom.xml                            | 2 +-
 server/container/cli/pom.xml                                        | 2 +-
 server/container/core/pom.xml                                       | 2 +-
 server/container/filesystem-api/pom.xml                             | 2 +-
 server/container/guice/activemq/pom.xml                             | 2 +-
 server/container/guice/blob-api-guice/pom.xml                       | 2 +-
 server/container/guice/blob-export-guice/pom.xml                    | 2 +-
 server/container/guice/blob-memory-guice/pom.xml                    | 2 +-
 server/container/guice/blob-objectstorage-guice/pom.xml             | 2 +-
 server/container/guice/cassandra-guice/pom.xml                      | 2 +-
 server/container/guice/cassandra-ldap-guice/pom.xml                 | 2 +-
 server/container/guice/cassandra-rabbitmq-guice/pom.xml             | 2 +-
 server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml        | 2 +-
 server/container/guice/configuration/pom.xml                        | 2 +-
 server/container/guice/es-metric-reporter/pom.xml                   | 2 +-
 server/container/guice/guice-common/pom.xml                         | 2 +-
 server/container/guice/guice-utils/pom.xml                          | 2 +-
 server/container/guice/jmx/pom.xml                                  | 2 +-
 server/container/guice/jpa-common-guice/pom.xml                     | 2 +-
 server/container/guice/jpa-guice/pom.xml                            | 2 +-
 server/container/guice/jpa-smtp-common/pom.xml                      | 2 +-
 server/container/guice/jpa-smtp-mariadb/pom.xml                     | 2 +-
 server/container/guice/jpa-smtp/pom.xml                             | 2 +-
 .../guice/mailbox-plugin-deleted-messages-vault-guice/pom.xml       | 2 +-
 server/container/guice/mailbox-plugin-spamassassin/pom.xml          | 2 +-
 server/container/guice/mailbox/pom.xml                              | 2 +-
 server/container/guice/mailet/pom.xml                               | 2 +-
 server/container/guice/memory-guice/pom.xml                         | 2 +-
 server/container/guice/onami/pom.xml                                | 2 +-
 server/container/guice/pom.xml                                      | 2 +-
 server/container/guice/protocols/imap/pom.xml                       | 2 +-
 server/container/guice/protocols/jmap-draft/pom.xml                 | 2 +-
 server/container/guice/protocols/lmtp/pom.xml                       | 2 +-
 server/container/guice/protocols/managedsieve/pom.xml               | 2 +-
 server/container/guice/protocols/netty/pom.xml                      | 2 +-
 server/container/guice/protocols/pop/pom.xml                        | 2 +-
 server/container/guice/protocols/smtp/pom.xml                       | 2 +-
 server/container/guice/protocols/webadmin-data/pom.xml              | 2 +-
 server/container/guice/protocols/webadmin-jmap/pom.xml              | 2 +-
 server/container/guice/protocols/webadmin-mailbox/pom.xml           | 2 +-
 server/container/guice/protocols/webadmin-mailqueue/pom.xml         | 2 +-
 server/container/guice/protocols/webadmin-mailrepository/pom.xml    | 2 +-
 server/container/guice/protocols/webadmin-swagger/pom.xml           | 2 +-
 server/container/guice/protocols/webadmin/pom.xml                   | 2 +-
 server/container/guice/rabbitmq/pom.xml                             | 2 +-
 server/container/guice/sieve-file/pom.xml                           | 2 +-
 server/container/guice/sieve-jpa/pom.xml                            | 2 +-
 .../container/guice/testing/custom-mailets-implementation/pom.xml   | 2 +-
 server/container/guice/testing/custom-mailets/pom.xml               | 2 +-
 server/container/guice/testing/dependency/pom.xml                   | 2 +-
 server/container/guice/testing/pom.xml                              | 2 +-
 server/container/lifecycle-api/pom.xml                              | 2 +-
 server/container/mailbox-adapter/pom.xml                            | 2 +-
 server/container/mailbox-jmx/pom.xml                                | 2 +-
 server/container/metrics/metrics-es-reporter/pom.xml                | 2 +-
 server/container/spring/pom.xml                                     | 2 +-
 server/container/util/pom.xml                                       | 2 +-
 server/data/data-api/pom.xml                                        | 2 +-
 server/data/data-cassandra/pom.xml                                  | 2 +-
 server/data/data-file/pom.xml                                       | 2 +-
 server/data/data-jdbc/pom.xml                                       | 2 +-
 server/data/data-jmap-cassandra/pom.xml                             | 2 +-
 server/data/data-jmap/pom.xml                                       | 2 +-
 server/data/data-jpa/pom.xml                                        | 2 +-
 server/data/data-ldap/pom.xml                                       | 2 +-
 server/data/data-library/pom.xml                                    | 2 +-
 server/data/data-memory/pom.xml                                     | 2 +-
 server/dns-service/dnsservice-api/pom.xml                           | 2 +-
 server/dns-service/dnsservice-dnsjava/pom.xml                       | 2 +-
 server/dns-service/dnsservice-library/pom.xml                       | 2 +-
 server/dns-service/dnsservice-test/pom.xml                          | 2 +-
 server/mailet/dkim/pom.xml                                          | 2 +-
 server/mailet/integration-testing/pom.xml                           | 2 +-
 server/mailet/mailetcontainer-api/pom.xml                           | 2 +-
 server/mailet/mailetcontainer-camel/pom.xml                         | 2 +-
 server/mailet/mailets/pom.xml                                       | 2 +-
 server/mailet/mock-smtp-server/pom.xml                              | 2 +-
 server/mailrepository/mailrepository-api/pom.xml                    | 2 +-
 server/mailrepository/mailrepository-cassandra/pom.xml              | 2 +-
 server/mailrepository/mailrepository-memory/pom.xml                 | 2 +-
 server/pom.xml                                                      | 2 +-
 server/protocols/fetchmail/pom.xml                                  | 2 +-
 .../cassandra-jmap-draft-integration-testing/pom.xml                | 2 +-
 .../jmap-draft-integration-testing-common/pom.xml                   | 2 +-
 .../memory-jmap-draft-integration-testing/pom.xml                   | 2 +-
 server/protocols/jmap-draft-integration-testing/pom.xml             | 2 +-
 .../rabbitmq-jmap-draft-integration-testing/pom.xml                 | 2 +-
 server/protocols/jmap-draft/pom.xml                                 | 2 +-
 server/protocols/jmap-rfc-8621/pom.xml                              | 5 ++---
 server/protocols/jmap/pom.xml                                       | 6 ++----
 server/protocols/jwt/pom.xml                                        | 2 +-
 server/protocols/protocols-imap4/pom.xml                            | 2 +-
 server/protocols/protocols-library/pom.xml                          | 2 +-
 server/protocols/protocols-lmtp/pom.xml                             | 2 +-
 server/protocols/protocols-managesieve/pom.xml                      | 2 +-
 server/protocols/protocols-pop3/pom.xml                             | 2 +-
 server/protocols/protocols-smtp/pom.xml                             | 2 +-
 .../distributed-webadmin-integration-test/pom.xml                   | 2 +-
 .../memory-webadmin-integration-test/pom.xml                        | 2 +-
 server/protocols/webadmin-integration-test/pom.xml                  | 2 +-
 .../webadmin-integration-test-common/pom.xml                        | 2 +-
 server/protocols/webadmin/pom.xml                                   | 2 +-
 server/protocols/webadmin/webadmin-cassandra-data/pom.xml           | 2 +-
 server/protocols/webadmin/webadmin-cassandra/pom.xml                | 2 +-
 server/protocols/webadmin/webadmin-core/pom.xml                     | 2 +-
 server/protocols/webadmin/webadmin-data/pom.xml                     | 2 +-
 server/protocols/webadmin/webadmin-jmap/pom.xml                     | 2 +-
 .../webadmin/webadmin-mailbox-deleted-message-vault/pom.xml         | 2 +-
 server/protocols/webadmin/webadmin-mailbox/pom.xml                  | 2 +-
 server/protocols/webadmin/webadmin-mailqueue/pom.xml                | 2 +-
 server/protocols/webadmin/webadmin-mailrepository/pom.xml           | 2 +-
 server/protocols/webadmin/webadmin-swagger/pom.xml                  | 2 +-
 server/queue/queue-activemq/pom.xml                                 | 2 +-
 server/queue/queue-api/pom.xml                                      | 2 +-
 server/queue/queue-file/pom.xml                                     | 2 +-
 server/queue/queue-jms/pom.xml                                      | 2 +-
 server/queue/queue-memory/pom.xml                                   | 2 +-
 server/queue/queue-rabbitmq/pom.xml                                 | 2 +-
 server/task/task-api/pom.xml                                        | 2 +-
 server/task/task-distributed/pom.xml                                | 2 +-
 server/task/task-json/pom.xml                                       | 2 +-
 server/task/task-memory/pom.xml                                     | 2 +-
 server/testing/pom.xml                                              | 2 +-
 testing/base/pom.xml                                                | 2 +-
 third-party/linshare/pom.xml                                        | 2 +-
 third-party/pom.xml                                                 | 2 +-
 third-party/spamassassin/pom.xml                                    | 2 +-
 234 files changed, 237 insertions(+), 240 deletions(-)

diff --git a/backends-common/cassandra/pom.xml b/backends-common/cassandra/pom.xml
index 2cfe55e..e322766 100644
--- a/backends-common/cassandra/pom.xml
+++ b/backends-common/cassandra/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-backends-common</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-backends-cassandra</artifactId>
diff --git a/backends-common/elasticsearch/pom.xml b/backends-common/elasticsearch/pom.xml
index 911297c..1992c91 100644
--- a/backends-common/elasticsearch/pom.xml
+++ b/backends-common/elasticsearch/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-backends-common</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-backends-es</artifactId>
diff --git a/backends-common/jpa/pom.xml b/backends-common/jpa/pom.xml
index 56becba..c01236e 100644
--- a/backends-common/jpa/pom.xml
+++ b/backends-common/jpa/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-backends-common</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-backends-jpa</artifactId>
diff --git a/backends-common/pom.xml b/backends-common/pom.xml
index f2318b5..63b5292 100644
--- a/backends-common/pom.xml
+++ b/backends-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>james-backends-common</artifactId>
diff --git a/backends-common/rabbitmq/pom.xml b/backends-common/rabbitmq/pom.xml
index 7cd59c1..583d4dc 100644
--- a/backends-common/rabbitmq/pom.xml
+++ b/backends-common/rabbitmq/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-backends-common</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-backends-rabbitmq</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index e8035f4..da29e73 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>james-project</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/event-sourcing/event-sourcing-core/pom.xml b/event-sourcing/event-sourcing-core/pom.xml
index 1a47ffc..cc9f82e 100644
--- a/event-sourcing/event-sourcing-core/pom.xml
+++ b/event-sourcing/event-sourcing-core/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>event-sourcing</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>event-sourcing-core</artifactId>
diff --git a/event-sourcing/event-sourcing-pojo/pom.xml b/event-sourcing/event-sourcing-pojo/pom.xml
index dcf6484..1bc707a 100644
--- a/event-sourcing/event-sourcing-pojo/pom.xml
+++ b/event-sourcing/event-sourcing-pojo/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>event-sourcing</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>event-sourcing-pojo</artifactId>
diff --git a/event-sourcing/event-store-api/pom.xml b/event-sourcing/event-store-api/pom.xml
index 30f0231..b4e1f2a 100644
--- a/event-sourcing/event-store-api/pom.xml
+++ b/event-sourcing/event-store-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>event-sourcing</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>event-sourcing-event-store-api</artifactId>
diff --git a/event-sourcing/event-store-cassandra/pom.xml b/event-sourcing/event-store-cassandra/pom.xml
index f091c06..364f776 100644
--- a/event-sourcing/event-store-cassandra/pom.xml
+++ b/event-sourcing/event-store-cassandra/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>event-sourcing</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>event-sourcing-event-store-cassandra</artifactId>
diff --git a/event-sourcing/event-store-memory/pom.xml b/event-sourcing/event-store-memory/pom.xml
index 6f4b932..1e807c6 100644
--- a/event-sourcing/event-store-memory/pom.xml
+++ b/event-sourcing/event-store-memory/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>event-sourcing</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>event-sourcing-event-store-memory</artifactId>
diff --git a/event-sourcing/pom.xml b/event-sourcing/pom.xml
index cdbf458..0aa445f 100644
--- a/event-sourcing/pom.xml
+++ b/event-sourcing/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <packaging>pom</packaging>
diff --git a/examples/custom-listeners/pom.xml b/examples/custom-listeners/pom.xml
index c09ae2f..15f8ef4 100644
--- a/examples/custom-listeners/pom.xml
+++ b/examples/custom-listeners/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>examples</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/examples/custom-mailets/pom.xml b/examples/custom-mailets/pom.xml
index 0c15e81..6cb793f 100644
--- a/examples/custom-mailets/pom.xml
+++ b/examples/custom-mailets/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>examples</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/examples/pom.xml b/examples/pom.xml
index ceb507d..52a4e2c 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <packaging>pom</packaging>
diff --git a/javax-mail-extension/pom.xml b/javax-mail-extension/pom.xml
index eccb90d..9ff72cb 100644
--- a/javax-mail-extension/pom.xml
+++ b/javax-mail-extension/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/json/pom.xml b/json/pom.xml
index c5d0148..875b75b 100644
--- a/json/pom.xml
+++ b/json/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>james-project</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/mailbox/api/pom.xml b/mailbox/api/pom.xml
index 1440ed3..2af744e 100644
--- a/mailbox/api/pom.xml
+++ b/mailbox/api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/mailbox/backup/pom.xml b/mailbox/backup/pom.xml
index 172fa3b..70537e0 100644
--- a/mailbox/backup/pom.xml
+++ b/mailbox/backup/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apache-james-mailbox</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml
index cb69ec4..571184a 100644
--- a/mailbox/cassandra/pom.xml
+++ b/mailbox/cassandra/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/elasticsearch/pom.xml b/mailbox/elasticsearch/pom.xml
index 17d90a7..65a973e 100644
--- a/mailbox/elasticsearch/pom.xml
+++ b/mailbox/elasticsearch/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/event/event-cassandra/pom.xml b/mailbox/event/event-cassandra/pom.xml
index 6e0d0f6..b69b214 100644
--- a/mailbox/event/event-cassandra/pom.xml
+++ b/mailbox/event/event-cassandra/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apache-james-mailbox</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/event/event-memory/pom.xml b/mailbox/event/event-memory/pom.xml
index 943a479..93f6cda 100644
--- a/mailbox/event/event-memory/pom.xml
+++ b/mailbox/event/event-memory/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apache-james-mailbox</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/event/event-rabbitmq/pom.xml b/mailbox/event/event-rabbitmq/pom.xml
index d6cbf3d..1bf37db 100644
--- a/mailbox/event/event-rabbitmq/pom.xml
+++ b/mailbox/event/event-rabbitmq/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apache-james-mailbox</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/event/json/pom.xml b/mailbox/event/json/pom.xml
index 6b391ee..eb130b5 100644
--- a/mailbox/event/json/pom.xml
+++ b/mailbox/event/json/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apache-james-mailbox</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/jpa/pom.xml b/mailbox/jpa/pom.xml
index 1db474b..1a54a0e 100644
--- a/mailbox/jpa/pom.xml
+++ b/mailbox/jpa/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/lucene/pom.xml b/mailbox/lucene/pom.xml
index bf76738..aeb473e 100644
--- a/mailbox/lucene/pom.xml
+++ b/mailbox/lucene/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/maildir/pom.xml b/mailbox/maildir/pom.xml
index b180777..9c87fc1 100644
--- a/mailbox/maildir/pom.xml
+++ b/mailbox/maildir/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/memory/pom.xml b/mailbox/memory/pom.xml
index d5077a0..12ac409 100644
--- a/mailbox/memory/pom.xml
+++ b/mailbox/memory/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/plugin/deleted-messages-vault-cassandra/pom.xml b/mailbox/plugin/deleted-messages-vault-cassandra/pom.xml
index 31f18c6..e8e0170 100644
--- a/mailbox/plugin/deleted-messages-vault-cassandra/pom.xml
+++ b/mailbox/plugin/deleted-messages-vault-cassandra/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apache-james-mailbox</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/plugin/deleted-messages-vault/pom.xml b/mailbox/plugin/deleted-messages-vault/pom.xml
index e909345..632e723 100644
--- a/mailbox/plugin/deleted-messages-vault/pom.xml
+++ b/mailbox/plugin/deleted-messages-vault/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apache-james-mailbox</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/plugin/quota-mailing-cassandra/pom.xml b/mailbox/plugin/quota-mailing-cassandra/pom.xml
index d29f17c..d1d2a96 100644
--- a/mailbox/plugin/quota-mailing-cassandra/pom.xml
+++ b/mailbox/plugin/quota-mailing-cassandra/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apache-james-mailbox</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/plugin/quota-mailing-memory/pom.xml b/mailbox/plugin/quota-mailing-memory/pom.xml
index 6c73c25..878f757 100644
--- a/mailbox/plugin/quota-mailing-memory/pom.xml
+++ b/mailbox/plugin/quota-mailing-memory/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apache-james-mailbox</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/plugin/quota-mailing/pom.xml b/mailbox/plugin/quota-mailing/pom.xml
index 800b5a7..526f0dc 100644
--- a/mailbox/plugin/quota-mailing/pom.xml
+++ b/mailbox/plugin/quota-mailing/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apache-james-mailbox</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/plugin/quota-search-elasticsearch/pom.xml b/mailbox/plugin/quota-search-elasticsearch/pom.xml
index db5c31c..e6f8f76 100644
--- a/mailbox/plugin/quota-search-elasticsearch/pom.xml
+++ b/mailbox/plugin/quota-search-elasticsearch/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apache-james-mailbox</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/plugin/quota-search-scanning/pom.xml b/mailbox/plugin/quota-search-scanning/pom.xml
index 276381e..5c584f5 100644
--- a/mailbox/plugin/quota-search-scanning/pom.xml
+++ b/mailbox/plugin/quota-search-scanning/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apache-james-mailbox</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/plugin/quota-search/pom.xml b/mailbox/plugin/quota-search/pom.xml
index 6a7e263..67a0bc9 100644
--- a/mailbox/plugin/quota-search/pom.xml
+++ b/mailbox/plugin/quota-search/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apache-james-mailbox</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/plugin/spamassassin/pom.xml b/mailbox/plugin/spamassassin/pom.xml
index 9e0ca23..fa117d6 100644
--- a/mailbox/plugin/spamassassin/pom.xml
+++ b/mailbox/plugin/spamassassin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index 39410b4..45bd512 100644
--- a/mailbox/pom.xml
+++ b/mailbox/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-mailbox</artifactId>
diff --git a/mailbox/scanning-search/pom.xml b/mailbox/scanning-search/pom.xml
index fb936ad..8b3732c 100644
--- a/mailbox/scanning-search/pom.xml
+++ b/mailbox/scanning-search/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/spring/pom.xml b/mailbox/spring/pom.xml
index df883f2..148109c 100644
--- a/mailbox/spring/pom.xml
+++ b/mailbox/spring/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/store/pom.xml b/mailbox/store/pom.xml
index 4bcb239..288deab 100644
--- a/mailbox/store/pom.xml
+++ b/mailbox/store/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml
index 104c577..50d596e 100644
--- a/mailbox/tika/pom.xml
+++ b/mailbox/tika/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
 
     </parent>
 
diff --git a/mailbox/tools/copier/pom.xml b/mailbox/tools/copier/pom.xml
index 5c63b97..2dde5d9 100644
--- a/mailbox/tools/copier/pom.xml
+++ b/mailbox/tools/copier/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/tools/indexer/pom.xml b/mailbox/tools/indexer/pom.xml
index c5ba6a2..d123295 100644
--- a/mailbox/tools/indexer/pom.xml
+++ b/mailbox/tools/indexer/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/tools/jpa-migrator/pom.xml b/mailbox/tools/jpa-migrator/pom.xml
index dc1dffd..7a5d2a1 100644
--- a/mailbox/tools/jpa-migrator/pom.xml
+++ b/mailbox/tools/jpa-migrator/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/tools/maildir-utils/pom.xml b/mailbox/tools/maildir-utils/pom.xml
index e91d2a3..fd34bf7 100644
--- a/mailbox/tools/maildir-utils/pom.xml
+++ b/mailbox/tools/maildir-utils/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailet/ai/pom.xml b/mailet/ai/pom.xml
index 66067b8..407ab37 100644
--- a/mailet/ai/pom.xml
+++ b/mailet/ai/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-mailet</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailet/api/pom.xml b/mailet/api/pom.xml
index ef689c3..03cb3c3 100644
--- a/mailet/api/pom.xml
+++ b/mailet/api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-mailet</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/mailet/base/pom.xml b/mailet/base/pom.xml
index 6d03fb2..9c9fa51 100644
--- a/mailet/base/pom.xml
+++ b/mailet/base/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-mailet</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/mailet/crypto/pom.xml b/mailet/crypto/pom.xml
index b493168..31e1cac 100644
--- a/mailet/crypto/pom.xml
+++ b/mailet/crypto/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-mailet</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/mailet/icalendar/pom.xml b/mailet/icalendar/pom.xml
index 6116672..dbd52f3 100644
--- a/mailet/icalendar/pom.xml
+++ b/mailet/icalendar/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-mailet</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-mailet-icalendar</artifactId>
diff --git a/mailet/mailetdocs-maven-plugin/pom.xml b/mailet/mailetdocs-maven-plugin/pom.xml
index 9ea5e6b..6be5c32 100644
--- a/mailet/mailetdocs-maven-plugin/pom.xml
+++ b/mailet/mailetdocs-maven-plugin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-mailet</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/mailet/pom.xml b/mailet/pom.xml
index 931041f..e1c9ac5 100644
--- a/mailet/pom.xml
+++ b/mailet/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-mailet</artifactId>
diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml
index ece3d32..4f1015b 100644
--- a/mailet/standard/pom.xml
+++ b/mailet/standard/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-mailet</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/mailet/test/pom.xml b/mailet/test/pom.xml
index 4d556ea..00ee637 100644
--- a/mailet/test/pom.xml
+++ b/mailet/test/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-mailet</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/mdn/pom.xml b/mdn/pom.xml
index 4cb1243..1782222 100644
--- a/mdn/pom.xml
+++ b/mdn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>james-project</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/metrics/metrics-api/pom.xml b/metrics/metrics-api/pom.xml
index 8e066b1..84f827b 100644
--- a/metrics/metrics-api/pom.xml
+++ b/metrics/metrics-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>metrics</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>metrics-api</artifactId>
diff --git a/metrics/metrics-dropwizard/pom.xml b/metrics/metrics-dropwizard/pom.xml
index 624d2fe..470f493 100644
--- a/metrics/metrics-dropwizard/pom.xml
+++ b/metrics/metrics-dropwizard/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>metrics</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>metrics-dropwizard</artifactId>
diff --git a/metrics/metrics-logger/pom.xml b/metrics/metrics-logger/pom.xml
index 4857038..d05456e 100644
--- a/metrics/metrics-logger/pom.xml
+++ b/metrics/metrics-logger/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>metrics</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>metrics-logger</artifactId>
diff --git a/metrics/metrics-tests/pom.xml b/metrics/metrics-tests/pom.xml
index 987b840..2deb5c5 100644
--- a/metrics/metrics-tests/pom.xml
+++ b/metrics/metrics-tests/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>metrics</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/metrics/pom.xml b/metrics/pom.xml
index 6c07526..b56eeec 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>metrics</artifactId>
diff --git a/mpt/all/pom.xml b/mpt/all/pom.xml
index 9aa8886..de7b5e4 100644
--- a/mpt/all/pom.xml
+++ b/mpt/all/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>apache-james-mpt-all</artifactId>
diff --git a/mpt/antlib/pom.xml b/mpt/antlib/pom.xml
index 749082b..93ec077 100644
--- a/mpt/antlib/pom.xml
+++ b/mpt/antlib/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mpt/app/pom.xml b/mpt/app/pom.xml
index f50abb3..1544e47 100644
--- a/mpt/app/pom.xml
+++ b/mpt/app/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mpt/core/pom.xml b/mpt/core/pom.xml
index 653d0df..4bc67d6 100644
--- a/mpt/core/pom.xml
+++ b/mpt/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>apache-james-mpt-core</artifactId>
diff --git a/mpt/impl/imap-mailbox/cassandra/pom.xml b/mpt/impl/imap-mailbox/cassandra/pom.xml
index 124b887..d2f44c0 100644
--- a/mpt/impl/imap-mailbox/cassandra/pom.xml
+++ b/mpt/impl/imap-mailbox/cassandra/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt-imapmailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-mpt-imapmailbox-cassandra</artifactId>
diff --git a/mpt/impl/imap-mailbox/core/pom.xml b/mpt/impl/imap-mailbox/core/pom.xml
index 6b6bd0f..4a5433d 100644
--- a/mpt/impl/imap-mailbox/core/pom.xml
+++ b/mpt/impl/imap-mailbox/core/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt-imapmailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-mpt-imapmailbox-core</artifactId>
diff --git a/mpt/impl/imap-mailbox/cyrus/pom.xml b/mpt/impl/imap-mailbox/cyrus/pom.xml
index b41d420..035fed6 100644
--- a/mpt/impl/imap-mailbox/cyrus/pom.xml
+++ b/mpt/impl/imap-mailbox/cyrus/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt-imapmailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-mpt-imapmailbox-cyrus</artifactId>
diff --git a/mpt/impl/imap-mailbox/elasticsearch/pom.xml b/mpt/impl/imap-mailbox/elasticsearch/pom.xml
index bcc3fe1..1a6a977 100644
--- a/mpt/impl/imap-mailbox/elasticsearch/pom.xml
+++ b/mpt/impl/imap-mailbox/elasticsearch/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt-imapmailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-mpt-imapmailbox-elasticsearch</artifactId>
diff --git a/mpt/impl/imap-mailbox/external-james/pom.xml b/mpt/impl/imap-mailbox/external-james/pom.xml
index ffdf24a..d60b93f 100644
--- a/mpt/impl/imap-mailbox/external-james/pom.xml
+++ b/mpt/impl/imap-mailbox/external-james/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt-imapmailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-mpt-external-james</artifactId>
diff --git a/mpt/impl/imap-mailbox/inmemory/pom.xml b/mpt/impl/imap-mailbox/inmemory/pom.xml
index 8a71713..603ebc7 100644
--- a/mpt/impl/imap-mailbox/inmemory/pom.xml
+++ b/mpt/impl/imap-mailbox/inmemory/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt-imapmailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-mpt-imapmailbox-inmemory</artifactId>
diff --git a/mpt/impl/imap-mailbox/jpa/pom.xml b/mpt/impl/imap-mailbox/jpa/pom.xml
index 1605137..add13bb 100644
--- a/mpt/impl/imap-mailbox/jpa/pom.xml
+++ b/mpt/impl/imap-mailbox/jpa/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt-imapmailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-mpt-imapmailbox-jpa</artifactId>
diff --git a/mpt/impl/imap-mailbox/lucenesearch/pom.xml b/mpt/impl/imap-mailbox/lucenesearch/pom.xml
index e95d969..521e49f 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/pom.xml
+++ b/mpt/impl/imap-mailbox/lucenesearch/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt-imapmailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-mpt-imapmailbox-jpa-lucene</artifactId>
diff --git a/mpt/impl/imap-mailbox/maildir/pom.xml b/mpt/impl/imap-mailbox/maildir/pom.xml
index 6d96db8..09f091c 100644
--- a/mpt/impl/imap-mailbox/maildir/pom.xml
+++ b/mpt/impl/imap-mailbox/maildir/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt-imapmailbox</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-mpt-imapmailbox-maildir</artifactId>
diff --git a/mpt/impl/imap-mailbox/pom.xml b/mpt/impl/imap-mailbox/pom.xml
index 4ee7fed..bda303b 100644
--- a/mpt/impl/imap-mailbox/pom.xml
+++ b/mpt/impl/imap-mailbox/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/mpt/impl/imap-mailbox/rabbitmq/pom.xml b/mpt/impl/imap-mailbox/rabbitmq/pom.xml
index 8f6afc9..d47989f 100644
--- a/mpt/impl/imap-mailbox/rabbitmq/pom.xml
+++ b/mpt/impl/imap-mailbox/rabbitmq/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>apache-james-mpt-imapmailbox</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-mpt-imapmailbox-rabbitmq</artifactId>
diff --git a/mpt/impl/managesieve/cassandra/pom.xml b/mpt/impl/managesieve/cassandra/pom.xml
index 70cbf47..0661885 100644
--- a/mpt/impl/managesieve/cassandra/pom.xml
+++ b/mpt/impl/managesieve/cassandra/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt-managesieve</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/mpt/impl/managesieve/core/pom.xml b/mpt/impl/managesieve/core/pom.xml
index f2008ce..edef1c4 100644
--- a/mpt/impl/managesieve/core/pom.xml
+++ b/mpt/impl/managesieve/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt-managesieve</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-mpt-managesieve-core</artifactId>
diff --git a/mpt/impl/managesieve/file/pom.xml b/mpt/impl/managesieve/file/pom.xml
index 8c1be75..a3e1dd7 100644
--- a/mpt/impl/managesieve/file/pom.xml
+++ b/mpt/impl/managesieve/file/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt-managesieve</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/mpt/impl/managesieve/pom.xml b/mpt/impl/managesieve/pom.xml
index e825e15..aeff0a3 100644
--- a/mpt/impl/managesieve/pom.xml
+++ b/mpt/impl/managesieve/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml
index da52df0..e4d6e63 100644
--- a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml
+++ b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt-smtp</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-mpt-smtp-cassandra-rabbitmq-object-storage</artifactId>
diff --git a/mpt/impl/smtp/cassandra/pom.xml b/mpt/impl/smtp/cassandra/pom.xml
index df09731..81dab33 100644
--- a/mpt/impl/smtp/cassandra/pom.xml
+++ b/mpt/impl/smtp/cassandra/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt-smtp</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-mpt-smtp-cassandra</artifactId>
diff --git a/mpt/impl/smtp/core/pom.xml b/mpt/impl/smtp/core/pom.xml
index 7bdb785..6e2cf48 100644
--- a/mpt/impl/smtp/core/pom.xml
+++ b/mpt/impl/smtp/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt-smtp</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-mpt-smtp-core</artifactId>
diff --git a/mpt/impl/smtp/pom.xml b/mpt/impl/smtp/pom.xml
index ad948ee..6716814 100644
--- a/mpt/impl/smtp/pom.xml
+++ b/mpt/impl/smtp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/mpt/mavenplugin/pom.xml b/mpt/mavenplugin/pom.xml
index 67f472d..c8c8010 100644
--- a/mpt/mavenplugin/pom.xml
+++ b/mpt/mavenplugin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mpt/pom.xml b/mpt/pom.xml
index 08565c7..89141d7 100644
--- a/mpt/pom.xml
+++ b/mpt/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-mpt</artifactId>
diff --git a/pom.xml b/pom.xml
index e69a26a..d57d7be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>org.apache.james</groupId>
     <artifactId>james-project</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.5.0</version>
     <packaging>pom</packaging>
 
     <name>Apache James Project</name>
@@ -545,7 +545,7 @@
     <scm>
         <connection>scm:git:http://git-wip-us.apache.org/repos/asf/james-project.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/james-project.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>james-project-3.5.0</tag>
         <url>http://git-wip-us.apache.org/repos/asf/james-project.git</url>
     </scm>
 
diff --git a/protocols/api/pom.xml b/protocols/api/pom.xml
index 9ac0dce..8e74571 100644
--- a/protocols/api/pom.xml
+++ b/protocols/api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james.protocols</groupId>
         <artifactId>protocols</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml
index 3a7aad5..35315a1 100644
--- a/protocols/imap/pom.xml
+++ b/protocols/imap/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james.protocols</groupId>
         <artifactId>protocols</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/lmtp/pom.xml b/protocols/lmtp/pom.xml
index da1abfb..1458c65 100644
--- a/protocols/lmtp/pom.xml
+++ b/protocols/lmtp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james.protocols</groupId>
         <artifactId>protocols</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/managesieve/pom.xml b/protocols/managesieve/pom.xml
index c45fb1e..65211f6 100644
--- a/protocols/managesieve/pom.xml
+++ b/protocols/managesieve/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james.protocols</groupId>
         <artifactId>protocols</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/netty/pom.xml b/protocols/netty/pom.xml
index 23f5099..de988df 100644
--- a/protocols/netty/pom.xml
+++ b/protocols/netty/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james.protocols</groupId>
         <artifactId>protocols</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/pom.xml b/protocols/pom.xml
index 7b04302..ccda70a 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <groupId>org.apache.james.protocols</groupId>
diff --git a/protocols/pop3/pom.xml b/protocols/pop3/pom.xml
index cdbc272..a8bb321 100644
--- a/protocols/pop3/pom.xml
+++ b/protocols/pop3/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james.protocols</groupId>
         <artifactId>protocols</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/smtp/pom.xml b/protocols/smtp/pom.xml
index cbd1f99..71ef447 100644
--- a/protocols/smtp/pom.xml
+++ b/protocols/smtp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james.protocols</groupId>
         <artifactId>protocols</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/app/pom.xml b/server/app/pom.xml
index 4b4a87b..7f4205e 100644
--- a/server/app/pom.xml
+++ b/server/app/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-api/pom.xml b/server/blob/blob-api/pom.xml
index 8c9182b..4978dfb 100644
--- a/server/blob/blob-api/pom.xml
+++ b/server/blob/blob-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>james-server-blob</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-cassandra/pom.xml b/server/blob/blob-cassandra/pom.xml
index 8894ca6..623a647 100644
--- a/server/blob/blob-cassandra/pom.xml
+++ b/server/blob/blob-cassandra/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>james-server-blob</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-common/pom.xml b/server/blob/blob-common/pom.xml
index 57cf59d..bb146e1 100644
--- a/server/blob/blob-common/pom.xml
+++ b/server/blob/blob-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>james-server-blob</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-export-api/pom.xml b/server/blob/blob-export-api/pom.xml
index 335540d..b7b0324 100644
--- a/server/blob/blob-export-api/pom.xml
+++ b/server/blob/blob-export-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>james-server-blob</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-export-file/pom.xml b/server/blob/blob-export-file/pom.xml
index 2d213a1..e7e30b6 100644
--- a/server/blob/blob-export-file/pom.xml
+++ b/server/blob/blob-export-file/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>james-server-blob</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-memory/pom.xml b/server/blob/blob-memory/pom.xml
index 76f67e3..24e6ec8 100644
--- a/server/blob/blob-memory/pom.xml
+++ b/server/blob/blob-memory/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>james-server-blob</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-objectstorage/pom.xml b/server/blob/blob-objectstorage/pom.xml
index 287b193..693a0b1 100644
--- a/server/blob/blob-objectstorage/pom.xml
+++ b/server/blob/blob-objectstorage/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>james-server-blob</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-union/pom.xml b/server/blob/blob-union/pom.xml
index 9809d22..3b0f2d9 100644
--- a/server/blob/blob-union/pom.xml
+++ b/server/blob/blob-union/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>james-server-blob</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/mail-store/pom.xml b/server/blob/mail-store/pom.xml
index 198faa5..a2fc852 100644
--- a/server/blob/mail-store/pom.xml
+++ b/server/blob/mail-store/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>james-server-blob</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/pom.xml b/server/blob/pom.xml
index 7385bfb..6d31fc2 100644
--- a/server/blob/pom.xml
+++ b/server/blob/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/cli-integration/pom.xml b/server/container/cli-integration/pom.xml
index b78c433..f95dd0d 100644
--- a/server/container/cli-integration/pom.xml
+++ b/server/container/cli-integration/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/cli/pom.xml b/server/container/cli/pom.xml
index 40806d9..ebb6b6c 100644
--- a/server/container/cli/pom.xml
+++ b/server/container/cli/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml
index fdcb290..64d297b 100644
--- a/server/container/core/pom.xml
+++ b/server/container/core/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/filesystem-api/pom.xml b/server/container/filesystem-api/pom.xml
index b13b587..62e5a44 100644
--- a/server/container/filesystem-api/pom.xml
+++ b/server/container/filesystem-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/activemq/pom.xml b/server/container/guice/activemq/pom.xml
index d3f7df5..8454094 100644
--- a/server/container/guice/activemq/pom.xml
+++ b/server/container/guice/activemq/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/blob-api-guice/pom.xml b/server/container/guice/blob-api-guice/pom.xml
index 812bb45..1e3b6ef 100644
--- a/server/container/guice/blob-api-guice/pom.xml
+++ b/server/container/guice/blob-api-guice/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/blob-export-guice/pom.xml b/server/container/guice/blob-export-guice/pom.xml
index 2077277..7a4589a 100644
--- a/server/container/guice/blob-export-guice/pom.xml
+++ b/server/container/guice/blob-export-guice/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/blob-memory-guice/pom.xml b/server/container/guice/blob-memory-guice/pom.xml
index b250197..d31dfcc 100644
--- a/server/container/guice/blob-memory-guice/pom.xml
+++ b/server/container/guice/blob-memory-guice/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/blob-objectstorage-guice/pom.xml b/server/container/guice/blob-objectstorage-guice/pom.xml
index 6d14a4b..bd02602 100644
--- a/server/container/guice/blob-objectstorage-guice/pom.xml
+++ b/server/container/guice/blob-objectstorage-guice/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml
index 71649de..3905812 100644
--- a/server/container/guice/cassandra-guice/pom.xml
+++ b/server/container/guice/cassandra-guice/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/cassandra-ldap-guice/pom.xml b/server/container/guice/cassandra-ldap-guice/pom.xml
index 2e7d859..88eea06 100644
--- a/server/container/guice/cassandra-ldap-guice/pom.xml
+++ b/server/container/guice/cassandra-ldap-guice/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/cassandra-rabbitmq-guice/pom.xml b/server/container/guice/cassandra-rabbitmq-guice/pom.xml
index c35cc74..6c4e1da 100644
--- a/server/container/guice/cassandra-rabbitmq-guice/pom.xml
+++ b/server/container/guice/cassandra-rabbitmq-guice/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml
index 955d20a..33ebc54 100644
--- a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml
+++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>james-server-guice</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/container/guice/configuration/pom.xml b/server/container/guice/configuration/pom.xml
index 809cbc5..c384aa6 100644
--- a/server/container/guice/configuration/pom.xml
+++ b/server/container/guice/configuration/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/es-metric-reporter/pom.xml b/server/container/guice/es-metric-reporter/pom.xml
index 96a75e6..d8a6c8a 100644
--- a/server/container/guice/es-metric-reporter/pom.xml
+++ b/server/container/guice/es-metric-reporter/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml
index f3622a6..436b9ad 100644
--- a/server/container/guice/guice-common/pom.xml
+++ b/server/container/guice/guice-common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/guice-utils/pom.xml b/server/container/guice/guice-utils/pom.xml
index adc8f23..dc8ee95 100644
--- a/server/container/guice/guice-utils/pom.xml
+++ b/server/container/guice/guice-utils/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/jmx/pom.xml b/server/container/guice/jmx/pom.xml
index 6690a1e..948828d 100644
--- a/server/container/guice/jmx/pom.xml
+++ b/server/container/guice/jmx/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/jpa-common-guice/pom.xml b/server/container/guice/jpa-common-guice/pom.xml
index b3c0b29..ea7d97b 100644
--- a/server/container/guice/jpa-common-guice/pom.xml
+++ b/server/container/guice/jpa-common-guice/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/jpa-guice/pom.xml b/server/container/guice/jpa-guice/pom.xml
index 37d05ef..a8f05b0 100644
--- a/server/container/guice/jpa-guice/pom.xml
+++ b/server/container/guice/jpa-guice/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/jpa-smtp-common/pom.xml b/server/container/guice/jpa-smtp-common/pom.xml
index 1883d95..9aa9be6 100644
--- a/server/container/guice/jpa-smtp-common/pom.xml
+++ b/server/container/guice/jpa-smtp-common/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/jpa-smtp-mariadb/pom.xml b/server/container/guice/jpa-smtp-mariadb/pom.xml
index 1bc50cd..009da4e 100644
--- a/server/container/guice/jpa-smtp-mariadb/pom.xml
+++ b/server/container/guice/jpa-smtp-mariadb/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/container/guice/jpa-smtp/pom.xml
index a2cd4a4..4838b3e 100644
--- a/server/container/guice/jpa-smtp/pom.xml
+++ b/server/container/guice/jpa-smtp/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/pom.xml b/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/pom.xml
index 0ae9efc..9c76f23 100644
--- a/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/pom.xml
+++ b/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/mailbox-plugin-spamassassin/pom.xml b/server/container/guice/mailbox-plugin-spamassassin/pom.xml
index db9d445..149ebb4 100644
--- a/server/container/guice/mailbox-plugin-spamassassin/pom.xml
+++ b/server/container/guice/mailbox-plugin-spamassassin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/mailbox/pom.xml b/server/container/guice/mailbox/pom.xml
index ab283e7..ad31c23 100644
--- a/server/container/guice/mailbox/pom.xml
+++ b/server/container/guice/mailbox/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/mailet/pom.xml b/server/container/guice/mailet/pom.xml
index 4f1f9fc..5fc8dc7 100644
--- a/server/container/guice/mailet/pom.xml
+++ b/server/container/guice/mailet/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/memory-guice/pom.xml b/server/container/guice/memory-guice/pom.xml
index 34e4b4a..6551ba3 100644
--- a/server/container/guice/memory-guice/pom.xml
+++ b/server/container/guice/memory-guice/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/onami/pom.xml b/server/container/guice/onami/pom.xml
index d388e2d..7f7149c 100644
--- a/server/container/guice/onami/pom.xml
+++ b/server/container/guice/onami/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>james-server-onami</artifactId>
diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml
index a7d55fd..f3bbbbe 100644
--- a/server/container/guice/pom.xml
+++ b/server/container/guice/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/imap/pom.xml b/server/container/guice/protocols/imap/pom.xml
index b495c3e..00da3e3 100644
--- a/server/container/guice/protocols/imap/pom.xml
+++ b/server/container/guice/protocols/imap/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/jmap-draft/pom.xml b/server/container/guice/protocols/jmap-draft/pom.xml
index 5979be9..4cfde4e 100644
--- a/server/container/guice/protocols/jmap-draft/pom.xml
+++ b/server/container/guice/protocols/jmap-draft/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/lmtp/pom.xml b/server/container/guice/protocols/lmtp/pom.xml
index cc95306..5b15a25 100644
--- a/server/container/guice/protocols/lmtp/pom.xml
+++ b/server/container/guice/protocols/lmtp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/managedsieve/pom.xml b/server/container/guice/protocols/managedsieve/pom.xml
index 3d7ead0..4283994 100644
--- a/server/container/guice/protocols/managedsieve/pom.xml
+++ b/server/container/guice/protocols/managedsieve/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/netty/pom.xml b/server/container/guice/protocols/netty/pom.xml
index 5902f0d..7942045 100644
--- a/server/container/guice/protocols/netty/pom.xml
+++ b/server/container/guice/protocols/netty/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/pop/pom.xml b/server/container/guice/protocols/pop/pom.xml
index de4dbf1..58f1344 100644
--- a/server/container/guice/protocols/pop/pom.xml
+++ b/server/container/guice/protocols/pop/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/smtp/pom.xml b/server/container/guice/protocols/smtp/pom.xml
index 660f10b..f7ced35 100644
--- a/server/container/guice/protocols/smtp/pom.xml
+++ b/server/container/guice/protocols/smtp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/webadmin-data/pom.xml b/server/container/guice/protocols/webadmin-data/pom.xml
index bb802b2..bf34d74 100644
--- a/server/container/guice/protocols/webadmin-data/pom.xml
+++ b/server/container/guice/protocols/webadmin-data/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/webadmin-jmap/pom.xml b/server/container/guice/protocols/webadmin-jmap/pom.xml
index 39cc21a..1fb5858 100644
--- a/server/container/guice/protocols/webadmin-jmap/pom.xml
+++ b/server/container/guice/protocols/webadmin-jmap/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/webadmin-mailbox/pom.xml b/server/container/guice/protocols/webadmin-mailbox/pom.xml
index ec479d4..8b9b103 100644
--- a/server/container/guice/protocols/webadmin-mailbox/pom.xml
+++ b/server/container/guice/protocols/webadmin-mailbox/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/webadmin-mailqueue/pom.xml b/server/container/guice/protocols/webadmin-mailqueue/pom.xml
index 36db02e..5e49c99 100644
--- a/server/container/guice/protocols/webadmin-mailqueue/pom.xml
+++ b/server/container/guice/protocols/webadmin-mailqueue/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>james-server-guice</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/webadmin-mailrepository/pom.xml b/server/container/guice/protocols/webadmin-mailrepository/pom.xml
index 88fa446..e654883 100644
--- a/server/container/guice/protocols/webadmin-mailrepository/pom.xml
+++ b/server/container/guice/protocols/webadmin-mailrepository/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>james-server-guice</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/webadmin-swagger/pom.xml b/server/container/guice/protocols/webadmin-swagger/pom.xml
index 69c254f..1626666 100644
--- a/server/container/guice/protocols/webadmin-swagger/pom.xml
+++ b/server/container/guice/protocols/webadmin-swagger/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/webadmin/pom.xml b/server/container/guice/protocols/webadmin/pom.xml
index 0f4e1ac..233cb64 100644
--- a/server/container/guice/protocols/webadmin/pom.xml
+++ b/server/container/guice/protocols/webadmin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/rabbitmq/pom.xml b/server/container/guice/rabbitmq/pom.xml
index 686666c..7c43c18 100644
--- a/server/container/guice/rabbitmq/pom.xml
+++ b/server/container/guice/rabbitmq/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/sieve-file/pom.xml b/server/container/guice/sieve-file/pom.xml
index 426c795..af51a82 100644
--- a/server/container/guice/sieve-file/pom.xml
+++ b/server/container/guice/sieve-file/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>james-server-guice-sieve-file</artifactId>
diff --git a/server/container/guice/sieve-jpa/pom.xml b/server/container/guice/sieve-jpa/pom.xml
index afb9795..4702a6a 100644
--- a/server/container/guice/sieve-jpa/pom.xml
+++ b/server/container/guice/sieve-jpa/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>james-server-guice-sieve-jpa</artifactId>
diff --git a/server/container/guice/testing/custom-mailets-implementation/pom.xml b/server/container/guice/testing/custom-mailets-implementation/pom.xml
index 6132e7f..603ef9f 100644
--- a/server/container/guice/testing/custom-mailets-implementation/pom.xml
+++ b/server/container/guice/testing/custom-mailets-implementation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice-testing</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/testing/custom-mailets/pom.xml b/server/container/guice/testing/custom-mailets/pom.xml
index 353fe59..35d5673 100644
--- a/server/container/guice/testing/custom-mailets/pom.xml
+++ b/server/container/guice/testing/custom-mailets/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice-testing</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/testing/dependency/pom.xml b/server/container/guice/testing/dependency/pom.xml
index a91670d..18918ac 100644
--- a/server/container/guice/testing/dependency/pom.xml
+++ b/server/container/guice/testing/dependency/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice-testing</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/testing/pom.xml b/server/container/guice/testing/pom.xml
index 6b561ce..eadbdcb 100644
--- a/server/container/guice/testing/pom.xml
+++ b/server/container/guice/testing/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/lifecycle-api/pom.xml b/server/container/lifecycle-api/pom.xml
index dabda94..8a7d7b4 100644
--- a/server/container/lifecycle-api/pom.xml
+++ b/server/container/lifecycle-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/mailbox-adapter/pom.xml b/server/container/mailbox-adapter/pom.xml
index bacc97d..425abf5 100644
--- a/server/container/mailbox-adapter/pom.xml
+++ b/server/container/mailbox-adapter/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/mailbox-jmx/pom.xml b/server/container/mailbox-jmx/pom.xml
index 72fceba..46c5bfa 100644
--- a/server/container/mailbox-jmx/pom.xml
+++ b/server/container/mailbox-jmx/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/metrics/metrics-es-reporter/pom.xml b/server/container/metrics/metrics-es-reporter/pom.xml
index 3414cd3..2cc7169 100644
--- a/server/container/metrics/metrics-es-reporter/pom.xml
+++ b/server/container/metrics/metrics-es-reporter/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml
index 678c4f8..2663cfa 100644
--- a/server/container/spring/pom.xml
+++ b/server/container/spring/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/util/pom.xml b/server/container/util/pom.xml
index aea0142..f9617ef 100644
--- a/server/container/util/pom.xml
+++ b/server/container/util/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-api/pom.xml b/server/data/data-api/pom.xml
index 94f8b62..9ece851 100644
--- a/server/data/data-api/pom.xml
+++ b/server/data/data-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-cassandra/pom.xml b/server/data/data-cassandra/pom.xml
index a6e6356..7da4f42 100644
--- a/server/data/data-cassandra/pom.xml
+++ b/server/data/data-cassandra/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-file/pom.xml b/server/data/data-file/pom.xml
index b3158b1..1c5c2bb 100644
--- a/server/data/data-file/pom.xml
+++ b/server/data/data-file/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-jdbc/pom.xml b/server/data/data-jdbc/pom.xml
index 01d2583..818231c 100644
--- a/server/data/data-jdbc/pom.xml
+++ b/server/data/data-jdbc/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-jmap-cassandra/pom.xml b/server/data/data-jmap-cassandra/pom.xml
index 0c2a413..5ed2856 100644
--- a/server/data/data-jmap-cassandra/pom.xml
+++ b/server/data/data-jmap-cassandra/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-jmap/pom.xml b/server/data/data-jmap/pom.xml
index cc74155..9d2fd36 100644
--- a/server/data/data-jmap/pom.xml
+++ b/server/data/data-jmap/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml
index bf78bb3..3b1d154 100644
--- a/server/data/data-jpa/pom.xml
+++ b/server/data/data-jpa/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-ldap/pom.xml b/server/data/data-ldap/pom.xml
index 6eb5460..c0d8ba2 100644
--- a/server/data/data-ldap/pom.xml
+++ b/server/data/data-ldap/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-library/pom.xml b/server/data/data-library/pom.xml
index 1946e83..e329657 100644
--- a/server/data/data-library/pom.xml
+++ b/server/data/data-library/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-memory/pom.xml b/server/data/data-memory/pom.xml
index cf8bd37..76d89e3 100644
--- a/server/data/data-memory/pom.xml
+++ b/server/data/data-memory/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/dns-service/dnsservice-api/pom.xml b/server/dns-service/dnsservice-api/pom.xml
index 975384b..817130f 100644
--- a/server/dns-service/dnsservice-api/pom.xml
+++ b/server/dns-service/dnsservice-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/dns-service/dnsservice-dnsjava/pom.xml b/server/dns-service/dnsservice-dnsjava/pom.xml
index e3b9a39..e1d4eb6 100644
--- a/server/dns-service/dnsservice-dnsjava/pom.xml
+++ b/server/dns-service/dnsservice-dnsjava/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/dns-service/dnsservice-library/pom.xml b/server/dns-service/dnsservice-library/pom.xml
index 01e620c..bdb9ab8 100644
--- a/server/dns-service/dnsservice-library/pom.xml
+++ b/server/dns-service/dnsservice-library/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/dns-service/dnsservice-test/pom.xml b/server/dns-service/dnsservice-test/pom.xml
index 50b66aa..55ac797 100644
--- a/server/dns-service/dnsservice-test/pom.xml
+++ b/server/dns-service/dnsservice-test/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailet/dkim/pom.xml b/server/mailet/dkim/pom.xml
index 544404b..64c2aed 100644
--- a/server/mailet/dkim/pom.xml
+++ b/server/mailet/dkim/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml
index 8549f10..34d9fcf 100644
--- a/server/mailet/integration-testing/pom.xml
+++ b/server/mailet/integration-testing/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailet/mailetcontainer-api/pom.xml b/server/mailet/mailetcontainer-api/pom.xml
index 126dc7a..965b249 100644
--- a/server/mailet/mailetcontainer-api/pom.xml
+++ b/server/mailet/mailetcontainer-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailet/mailetcontainer-camel/pom.xml b/server/mailet/mailetcontainer-camel/pom.xml
index 6369b32..d284812 100644
--- a/server/mailet/mailetcontainer-camel/pom.xml
+++ b/server/mailet/mailetcontainer-camel/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml
index 7f17e11..7c4a772 100644
--- a/server/mailet/mailets/pom.xml
+++ b/server/mailet/mailets/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailet/mock-smtp-server/pom.xml b/server/mailet/mock-smtp-server/pom.xml
index 2c59171..82b223b 100644
--- a/server/mailet/mock-smtp-server/pom.xml
+++ b/server/mailet/mock-smtp-server/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailrepository/mailrepository-api/pom.xml b/server/mailrepository/mailrepository-api/pom.xml
index ccded56..c6117e3 100644
--- a/server/mailrepository/mailrepository-api/pom.xml
+++ b/server/mailrepository/mailrepository-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailrepository/mailrepository-cassandra/pom.xml b/server/mailrepository/mailrepository-cassandra/pom.xml
index 96686b9..c949ced 100644
--- a/server/mailrepository/mailrepository-cassandra/pom.xml
+++ b/server/mailrepository/mailrepository-cassandra/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailrepository/mailrepository-memory/pom.xml b/server/mailrepository/mailrepository-memory/pom.xml
index 61864f0..ee5b0ee 100644
--- a/server/mailrepository/mailrepository-memory/pom.xml
+++ b/server/mailrepository/mailrepository-memory/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/pom.xml b/server/pom.xml
index a261703..e0b4fcd 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>james-server</artifactId>
diff --git a/server/protocols/fetchmail/pom.xml b/server/protocols/fetchmail/pom.xml
index 9f4a12f..6f91ae3 100644
--- a/server/protocols/fetchmail/pom.xml
+++ b/server/protocols/fetchmail/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/pom.xml b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/pom.xml
index ffd1d39..3914caf 100644
--- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/pom.xml
+++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>jmap-draft-integration-testing</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/pom.xml b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/pom.xml
index 101fd2b..5ed7dbc 100644
--- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/pom.xml
+++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>jmap-draft-integration-testing</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml
index 37fe1f4..7bc8301 100644
--- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml
+++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>jmap-draft-integration-testing</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/jmap-draft-integration-testing/pom.xml b/server/protocols/jmap-draft-integration-testing/pom.xml
index 045e981..9305f1f 100644
--- a/server/protocols/jmap-draft-integration-testing/pom.xml
+++ b/server/protocols/jmap-draft-integration-testing/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
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 904ff8b..026a6b3 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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jmap-draft-integration-testing</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/jmap-draft/pom.xml b/server/protocols/jmap-draft/pom.xml
index 56999dd..443f109 100644
--- a/server/protocols/jmap-draft/pom.xml
+++ b/server/protocols/jmap-draft/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/jmap-rfc-8621/pom.xml b/server/protocols/jmap-rfc-8621/pom.xml
index 56b421d..0799475 100644
--- a/server/protocols/jmap-rfc-8621/pom.xml
+++ b/server/protocols/jmap-rfc-8621/pom.xml
@@ -17,14 +17,13 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml
index 6116486..6765753 100644
--- a/server/protocols/jmap/pom.xml
+++ b/server/protocols/jmap/pom.xml
@@ -18,13 +18,11 @@
   * under the License.                                           *
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>james-server</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/server/protocols/jwt/pom.xml b/server/protocols/jwt/pom.xml
index 78afc02..3ce0280 100644
--- a/server/protocols/jwt/pom.xml
+++ b/server/protocols/jwt/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/protocols-imap4/pom.xml b/server/protocols/protocols-imap4/pom.xml
index 635d0d4..cebd787 100644
--- a/server/protocols/protocols-imap4/pom.xml
+++ b/server/protocols/protocols-imap4/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/protocols-library/pom.xml b/server/protocols/protocols-library/pom.xml
index 1ba9320..c8eb324 100644
--- a/server/protocols/protocols-library/pom.xml
+++ b/server/protocols/protocols-library/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/protocols-lmtp/pom.xml b/server/protocols/protocols-lmtp/pom.xml
index 68fbe03..2dbbe41 100644
--- a/server/protocols/protocols-lmtp/pom.xml
+++ b/server/protocols/protocols-lmtp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/protocols-managesieve/pom.xml b/server/protocols/protocols-managesieve/pom.xml
index dfab5b9..d96e7d4 100644
--- a/server/protocols/protocols-managesieve/pom.xml
+++ b/server/protocols/protocols-managesieve/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/protocols-pop3/pom.xml b/server/protocols/protocols-pop3/pom.xml
index b41c6ed..fb93aaf 100644
--- a/server/protocols/protocols-pop3/pom.xml
+++ b/server/protocols/protocols-pop3/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml
index 548bc12..5572490 100644
--- a/server/protocols/protocols-smtp/pom.xml
+++ b/server/protocols/protocols-smtp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
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 47eff5a..2c03ff8 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
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>webadmin-integration-test</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/pom.xml
index a7c1310..5484b65 100644
--- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/pom.xml
+++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>webadmin-integration-test</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/pom.xml
index e48ce2f..0778334 100644
--- a/server/protocols/webadmin-integration-test/pom.xml
+++ b/server/protocols/webadmin-integration-test/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/pom.xml b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/pom.xml
index 9f3a8a2..af2dec0 100644
--- a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/pom.xml
+++ b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>webadmin-integration-test</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/pom.xml b/server/protocols/webadmin/pom.xml
index 38dca23..dbcf6d4 100644
--- a/server/protocols/webadmin/pom.xml
+++ b/server/protocols/webadmin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/webadmin-cassandra-data/pom.xml b/server/protocols/webadmin/webadmin-cassandra-data/pom.xml
index 5168932..5b3944d 100644
--- a/server/protocols/webadmin/webadmin-cassandra-data/pom.xml
+++ b/server/protocols/webadmin/webadmin-cassandra-data/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/webadmin-cassandra/pom.xml b/server/protocols/webadmin/webadmin-cassandra/pom.xml
index e2187ca..1fb1146 100644
--- a/server/protocols/webadmin/webadmin-cassandra/pom.xml
+++ b/server/protocols/webadmin/webadmin-cassandra/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml
index 2b8680b..195a2bb 100644
--- a/server/protocols/webadmin/webadmin-core/pom.xml
+++ b/server/protocols/webadmin/webadmin-core/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml
index b902073..6440940 100644
--- a/server/protocols/webadmin/webadmin-data/pom.xml
+++ b/server/protocols/webadmin/webadmin-data/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/webadmin-jmap/pom.xml b/server/protocols/webadmin/webadmin-jmap/pom.xml
index 5913715..75f1ab5 100644
--- a/server/protocols/webadmin/webadmin-jmap/pom.xml
+++ b/server/protocols/webadmin/webadmin-jmap/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/pom.xml b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/pom.xml
index d7e179c..f5ee567 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml
index cb3c161..7e40973 100644
--- a/server/protocols/webadmin/webadmin-mailbox/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/webadmin-mailqueue/pom.xml b/server/protocols/webadmin/webadmin-mailqueue/pom.xml
index 3b135f4..3c283af 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailqueue/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/webadmin-mailrepository/pom.xml b/server/protocols/webadmin/webadmin-mailrepository/pom.xml
index 2d1da28..48ff520 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailrepository/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/webadmin-swagger/pom.xml b/server/protocols/webadmin/webadmin-swagger/pom.xml
index 60e10fb..161c1c7 100644
--- a/server/protocols/webadmin/webadmin-swagger/pom.xml
+++ b/server/protocols/webadmin/webadmin-swagger/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/queue/queue-activemq/pom.xml b/server/queue/queue-activemq/pom.xml
index e961296..45cb767 100644
--- a/server/queue/queue-activemq/pom.xml
+++ b/server/queue/queue-activemq/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/queue/queue-api/pom.xml b/server/queue/queue-api/pom.xml
index f0bab70..1fe2b90 100644
--- a/server/queue/queue-api/pom.xml
+++ b/server/queue/queue-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/queue/queue-file/pom.xml b/server/queue/queue-file/pom.xml
index 33d70e5..c80c555 100644
--- a/server/queue/queue-file/pom.xml
+++ b/server/queue/queue-file/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml
index 44404db..8a12030 100644
--- a/server/queue/queue-jms/pom.xml
+++ b/server/queue/queue-jms/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/queue/queue-memory/pom.xml b/server/queue/queue-memory/pom.xml
index 0b4b896..3e61550 100644
--- a/server/queue/queue-memory/pom.xml
+++ b/server/queue/queue-memory/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>james-server</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/queue/queue-rabbitmq/pom.xml b/server/queue/queue-rabbitmq/pom.xml
index dc2494c..474c929 100644
--- a/server/queue/queue-rabbitmq/pom.xml
+++ b/server/queue/queue-rabbitmq/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/task/task-api/pom.xml b/server/task/task-api/pom.xml
index 61daaec..89dd8aa 100644
--- a/server/task/task-api/pom.xml
+++ b/server/task/task-api/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>james-server</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/task/task-distributed/pom.xml b/server/task/task-distributed/pom.xml
index 8ede6b3..07cfda8 100644
--- a/server/task/task-distributed/pom.xml
+++ b/server/task/task-distributed/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>james-server</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/task/task-json/pom.xml b/server/task/task-json/pom.xml
index 4782d4d..552df6d 100644
--- a/server/task/task-json/pom.xml
+++ b/server/task/task-json/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>james-server</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/task/task-memory/pom.xml b/server/task/task-memory/pom.xml
index e6dccd7..78355e3 100644
--- a/server/task/task-memory/pom.xml
+++ b/server/task/task-memory/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>james-server</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/testing/pom.xml b/server/testing/pom.xml
index 20fc034..d5aaa2b 100644
--- a/server/testing/pom.xml
+++ b/server/testing/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/testing/base/pom.xml b/testing/base/pom.xml
index e0d2473..7fa1e6c 100644
--- a/testing/base/pom.xml
+++ b/testing/base/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>james-project</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/third-party/linshare/pom.xml b/third-party/linshare/pom.xml
index 50237a3..60ba07f 100644
--- a/third-party/linshare/pom.xml
+++ b/third-party/linshare/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>third-party</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-linshare</artifactId>
diff --git a/third-party/pom.xml b/third-party/pom.xml
index 438ffc3..6204e83 100644
--- a/third-party/pom.xml
+++ b/third-party/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>third-party</artifactId>
diff --git a/third-party/spamassassin/pom.xml b/third-party/spamassassin/pom.xml
index 03a095f..6d8ab34 100644
--- a/third-party/spamassassin/pom.xml
+++ b/third-party/spamassassin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>third-party</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.5.0</version>
     </parent>
 
     <artifactId>apache-james-spamassassin</artifactId>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 03/05: JAMES-3197 Mailet processing should handle NoClassDefFoundError

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch 3.5.x
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit f0c65767603d8c81b6e4a8b52a9022704dad97f3
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri May 29 12:19:07 2020 +0700

    JAMES-3197 Mailet processing should handle NoClassDefFoundError
    
    Due to JAMES-3176, we ended up having ExtractMDNOriginalJMAPMessageId throwing NoClassDefFoundError.
    
    This error is not handled by the mailet processor, resulting in a mailqueue nack, and generated an infinite loop on top of RabbitMQ.
    
    This error can happen too when a user specifies a custom mailet with unsatisfied dependencies.
    
    Thus, when a mailet, or a matcher throws a `NoClassDefFoundError` we should execute mailet error handling normally, and prevent that infinite loop.
---
 .../org/apache/james/mailets/MailetErrorsTest.java | 22 +++++++++++++++
 .../mailets/NoClassDefFoundErrorMailet.java        | 32 ++++++++++++++++++++++
 .../james/mailetcontainer/impl/ProcessorUtil.java  |  4 +--
 .../mailetcontainer/impl/camel/CamelProcessor.java |  4 +--
 .../impl/jmx/JMXStateMailetProcessorListener.java  |  2 +-
 .../lib/AbstractStateMailetProcessor.java          |  2 +-
 .../lib/AbstractStateMailetProcessorTest.java      | 10 +++----
 7 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java
index c5e13dc..175b4c4 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java
@@ -32,8 +32,10 @@ import org.apache.james.mailets.configuration.MailetContainer;
 import org.apache.james.mailets.configuration.ProcessorConfiguration;
 import org.apache.james.mailrepository.api.MailRepositoryUrl;
 import org.apache.james.modules.protocols.SmtpGuiceProbe;
+import org.apache.james.transport.mailets.NoClassDefFoundErrorMailet;
 import org.apache.james.transport.mailets.ErrorMailet;
 import org.apache.james.transport.mailets.ErrorMatcher;
+import org.apache.james.transport.mailets.NoClassDefFoundErrorMatcher;
 import org.apache.james.transport.mailets.NoopMailet;
 import org.apache.james.transport.mailets.Null;
 import org.apache.james.transport.mailets.RuntimeErrorMailet;
@@ -86,6 +88,26 @@ public class MailetErrorsTest {
     }
 
     @Test
+    public void mailetProcessingShouldHandleClassNotFoundException() throws Exception {
+        jamesServer = TemporaryJamesServer.builder()
+            .withBase(SMTP_ONLY_MODULE)
+            .withMailetContainer(MailetContainer.builder()
+                .putProcessor(CommonProcessors.deliverOnlyTransport())
+                .putProcessor(errorProcessor())
+                .putProcessor(ProcessorConfiguration.root()
+                    .addMailet(MailetConfiguration.builder()
+                        .matcher(All.class)
+                        .mailet(NoClassDefFoundErrorMailet.class))))
+            .build(temporaryFolder.newFolder());
+        MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
+
+        smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
+
+        awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1);
+    }
+    
+
+    @Test
     public void mailetProcessorsShouldHandleRuntimeException() throws Exception {
         jamesServer = TemporaryJamesServer.builder()
             .withBase(SMTP_ONLY_MODULE)
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/NoClassDefFoundErrorMailet.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/NoClassDefFoundErrorMailet.java
new file mode 100644
index 0000000..b173183
--- /dev/null
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/NoClassDefFoundErrorMailet.java
@@ -0,0 +1,32 @@
+/****************************************************************
+ * 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.transport.mailets;
+
+import javax.mail.MessagingException;
+
+import org.apache.mailet.Mail;
+import org.apache.mailet.base.GenericMailet;
+
+public class NoClassDefFoundErrorMailet extends GenericMailet {
+    @Override
+    public void service(Mail mail) throws MessagingException {
+        throw new NoClassDefFoundError();
+    }
+}
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java
index 7f1786b..5d1b761 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java
@@ -47,13 +47,13 @@ public class ProcessorUtil {
      * @param nextState
      *            the next state to set
      */
-    public static void handleException(Exception me, Mail mail, String offendersName, String nextState, Logger logger) {
+    public static void handleException(Throwable me, Mail mail, String offendersName, String nextState, Logger logger) {
         mail.setState(nextState);
         StringWriter sout = new StringWriter();
         PrintWriter out = new PrintWriter(sout, true);
         String exceptionBuffer = "Exception calling " + offendersName + ": " + me.getMessage();
         out.println(exceptionBuffer);
-        Exception e = me;
+        Throwable e = me;
         while (e != null) {
             e.printStackTrace(out);
             if (e instanceof MessagingException) {
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
index 678b938..a46001a 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
@@ -61,7 +61,7 @@ public class CamelProcessor {
     public void process(Mail mail) throws Exception {
         long start = System.currentTimeMillis();
         TimeMetric timeMetric = metricFactory.timer(mailet.getClass().getSimpleName());
-        Exception ex = null;
+        Throwable ex = null;
         try (Closeable closeable =
                  MDCBuilder.create()
                      .addContext(MDCBuilder.PROTOCOL, "MAILET")
@@ -75,7 +75,7 @@ public class CamelProcessor {
                      .build()) {
             MailetPipelineLogging.logBeginOfMailetProcess(mailet, mail);
             mailet.service(mail);
-        } catch (Exception me) {
+        } catch (Exception | NoClassDefFoundError me) {
             ex = me;
             String onMailetException = null;
 
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
index 38fe438..7840c4d 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
@@ -61,7 +61,7 @@ public class JMXStateMailetProcessorListener implements MailetProcessorListener,
     }
 
     @Override
-    public void afterMailet(Mailet m, String mailName, String state, long processTime, Exception e) {
+    public void afterMailet(Mailet m, String mailName, String state, long processTime, Throwable e) {
         MailetManagement mgmt = mailetMap.get(m);
         if (mgmt != null) {
             mgmt.update(processTime, e == null);
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
index 45db8ad..0d6a399 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
@@ -404,7 +404,7 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con
          * @param e
          *            or null if no Exception was thrown
          */
-        void afterMailet(Mailet m, String mailName, String state, long processTime, Exception e);
+        void afterMailet(Mailet m, String mailName, String state, long processTime, Throwable e);
 
         /**
          * Get called after each {@link Matcher} call was complete
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
index 4894fa7..c76a019 100644
--- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
+++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
@@ -85,7 +85,7 @@ public abstract class AbstractStateMailetProcessorTest {
             }
 
             @Override
-            public void afterMailet(Mailet m, String mailName, String state, long processTime, Exception e) {
+            public void afterMailet(Mailet m, String mailName, String state, long processTime, Throwable e) {
                 // check for class name as the terminating  mailet will kick in too
 
                 if (MockMailet.class.equals(m.getClass())) {
@@ -130,7 +130,7 @@ public abstract class AbstractStateMailetProcessorTest {
             }
 
             @Override
-            public void afterMailet(Mailet m, String mailName, String state, long processTime, Exception e) {
+            public void afterMailet(Mailet m, String mailName, String state, long processTime, Throwable e) {
                 // check for class name as the terminating  mailet will kick in too
 
                 if (MockMailet.class.equals(m.getClass())) {
@@ -177,7 +177,7 @@ public abstract class AbstractStateMailetProcessorTest {
             }
 
             @Override
-            public void afterMailet(Mailet m, String mailName, String state, long processTime, Exception e) {
+            public void afterMailet(Mailet m, String mailName, String state, long processTime, Throwable e) {
                 throw new RuntimeException("Should not call any mailet!");
             }
         });
@@ -212,7 +212,7 @@ public abstract class AbstractStateMailetProcessorTest {
             }
 
             @Override
-            public void afterMailet(Mailet m, String mailName, String state, long processTime, Exception e) {
+            public void afterMailet(Mailet m, String mailName, String state, long processTime, Throwable e) {
                 throw new RuntimeException("Should not call any mailet!");
             }
         });
@@ -249,7 +249,7 @@ public abstract class AbstractStateMailetProcessorTest {
             }
 
             @Override
-            public void afterMailet(Mailet m, String mailName, String state, long processTime, Exception e) {
+            public void afterMailet(Mailet m, String mailName, String state, long processTime, Throwable e) {
                 if (ExceptionThrowingMailet.class.equals(m.getClass())) {
                     // the name should be not the same as we have a part match
                     assertThat(mail.getName()).isNotEqualTo(mailName);


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 02/05: JAMES-3195 Avoid loosing stacktrace when fails to delete a file

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch 3.5.x
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 5ad068e2da4eca059f2143369504a3f37e859c0f
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu May 28 09:51:18 2020 +0700

    JAMES-3195 Avoid loosing stacktrace when fails to delete a file
---
 .../java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java
index 297c613..538fa2e 100644
--- a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java
+++ b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java
@@ -59,7 +59,7 @@ public class ActiveMQMailQueueItem extends JMSMailQueueItem implements ActiveMQS
                 try {
                     ((ActiveMQBlobMessage) message).deleteFile();
                 } catch (IOException | JMSException e) {
-                    LOGGER.warn("Unable to delete blob message file for mail {}", getMail().getName());
+                    LOGGER.warn("Unable to delete blob message file for mail {}", getMail().getName(), e);
                 }
             }
             getMail().removeAttribute(JAMES_REUSE_BLOB_URL);


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[james-project] 04/05: JAMES-3197 Matcher processing should handle NoClassDefFoundError

Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch 3.5.x
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 64d2270a23cc5a6a89de5e73a791fca40ad7775d
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri May 29 12:21:34 2020 +0700

    JAMES-3197 Matcher processing should handle NoClassDefFoundError
---
 .../org/apache/james/mailets/MailetErrorsTest.java | 20 +++++++++++-
 .../mailets/NoClassDefFoundErrorMatcher.java       | 36 ++++++++++++++++++++++
 .../impl/camel/MatcherSplitter.java                |  4 +--
 .../impl/jmx/JMXStateMailetProcessorListener.java  |  2 +-
 .../lib/AbstractStateMailetProcessor.java          |  2 +-
 .../lib/AbstractStateMailetProcessorTest.java      | 10 +++---
 6 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java
index 175b4c4..b1cc490 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/MailetErrorsTest.java
@@ -105,7 +105,25 @@ public class MailetErrorsTest {
 
         awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1);
     }
-    
+
+    @Test
+    public void matcherProcessingShouldHandleClassNotFoundException() throws Exception {
+        jamesServer = TemporaryJamesServer.builder()
+            .withBase(SMTP_ONLY_MODULE)
+            .withMailetContainer(MailetContainer.builder()
+                .putProcessor(CommonProcessors.deliverOnlyTransport())
+                .putProcessor(errorProcessor())
+                .putProcessor(ProcessorConfiguration.root()
+                    .addMailet(MailetConfiguration.builder()
+                        .matcher(NoClassDefFoundErrorMatcher.class)
+                        .mailet(Null.class))))
+            .build(temporaryFolder.newFolder());
+        MailRepositoryProbeImpl probe = jamesServer.getProbe(MailRepositoryProbeImpl.class);
+
+        smtpMessageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort()).sendMessage(FROM, FROM);
+
+        awaitAtMostOneMinute.until(() -> probe.getRepositoryMailCount(ERROR_REPOSITORY) == 1);
+    }
 
     @Test
     public void mailetProcessorsShouldHandleRuntimeException() throws Exception {
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/NoClassDefFoundErrorMatcher.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/NoClassDefFoundErrorMatcher.java
new file mode 100644
index 0000000..c03d8ca
--- /dev/null
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/NoClassDefFoundErrorMatcher.java
@@ -0,0 +1,36 @@
+/****************************************************************
+ * 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.transport.mailets;
+
+import java.util.Collection;
+
+import javax.mail.MessagingException;
+
+import org.apache.james.core.MailAddress;
+import org.apache.mailet.Mail;
+import org.apache.mailet.base.GenericMailet;
+import org.apache.mailet.base.GenericMatcher;
+
+public class NoClassDefFoundErrorMatcher extends GenericMatcher {
+    @Override
+    public Collection<MailAddress> match(Mail mail) throws MessagingException {
+        throw new NoClassDefFoundError();
+    }
+}
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
index 89c8b61..1fb6116 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
@@ -90,7 +90,7 @@ public class MatcherSplitter {
         Collection<MailAddress> matchedRcpts = null;
         Collection<MailAddress> origRcpts = new ArrayList<>(mail.getRecipients());
         long start = System.currentTimeMillis();
-        Exception ex = null;
+        Throwable ex = null;
         TimeMetric timeMetric = metricFactory.timer(matcher.getClass().getSimpleName());
 
         try {
@@ -121,7 +121,7 @@ public class MatcherSplitter {
                     ProcessorUtil.verifyMailAddresses(matchedRcpts);
                 }
 
-            } catch (Exception me) {
+            } catch (Exception | NoClassDefFoundError me) {
                 ex = me;
                 if (onMatchException.equalsIgnoreCase("nomatch")) {
                     // In case the matcher returned null, create an empty
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
index 7840c4d..bc4bdbc 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
@@ -69,7 +69,7 @@ public class JMXStateMailetProcessorListener implements MailetProcessorListener,
     }
 
     @Override
-    public void afterMatcher(Matcher m, String mailName, Collection<MailAddress> rcpts, Collection<MailAddress> matches, long processTime, Exception e) {
+    public void afterMatcher(Matcher m, String mailName, Collection<MailAddress> rcpts, Collection<MailAddress> matches, long processTime, Throwable e) {
         MatcherManagement mgmt = matcherMap.get(m);
 
         if (mgmt != null) {
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
index 0d6a399..70574bc 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
@@ -414,7 +414,7 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con
          * @param e
          *            or null if no Exception was thrown
          */
-        void afterMatcher(Matcher m, String mailName, Collection<MailAddress> recipients, Collection<MailAddress> matches, long processTime, Exception e);
+        void afterMatcher(Matcher m, String mailName, Collection<MailAddress> recipients, Collection<MailAddress> matches, long processTime, Throwable e);
 
     }
 
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
index c76a019..8cea067 100644
--- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
+++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessorTest.java
@@ -73,7 +73,7 @@ public abstract class AbstractStateMailetProcessorTest {
 
             @Override
             public void afterMatcher(Matcher m, String mailName, Collection<MailAddress> recipients,
-                                     Collection<MailAddress> matches, long processTime, Exception e) {
+                                     Collection<MailAddress> matches, long processTime, Throwable e) {
                 if (MockMatcher.class.equals(m.getClass())) {
                     assertThat(mailName).isEqualTo(mail.getName());
                     // match one recipient
@@ -118,7 +118,7 @@ public abstract class AbstractStateMailetProcessorTest {
 
             @Override
             public void afterMatcher(Matcher m, String mailName, Collection<MailAddress> recipients,
-                                     Collection<MailAddress> matches, long processTime, Exception e) {
+                                     Collection<MailAddress> matches, long processTime, Throwable e) {
                 if (MockMatcher.class.equals(m.getClass())) {
                     assertThat(mailName).isEqualTo(mail.getName());
                     // match all recipient
@@ -165,7 +165,7 @@ public abstract class AbstractStateMailetProcessorTest {
 
             @Override
             public void afterMatcher(Matcher m, String mailName, Collection<MailAddress> recipients,
-                                     Collection<MailAddress> matches, long processTime, Exception e) {
+                                     Collection<MailAddress> matches, long processTime, Throwable e) {
                 if (ExceptionThrowingMatcher.class.equals(m.getClass())) {
                     assertThat(mailName).isEqualTo(mail.getName());
                     // match no recipient because of the error
@@ -204,7 +204,7 @@ public abstract class AbstractStateMailetProcessorTest {
 
             @Override
             public void afterMatcher(Matcher m, String mailName, Collection<MailAddress> recipients,
-                                     Collection<MailAddress> matches, long processTime, Exception e) {
+                                     Collection<MailAddress> matches, long processTime, Throwable e) {
                 if (ExceptionThrowingMatcher.class.equals(m.getClass())) {
                     latch.countDown();
                 }
@@ -237,7 +237,7 @@ public abstract class AbstractStateMailetProcessorTest {
 
             @Override
             public void afterMatcher(Matcher m, String mailName, Collection<MailAddress> recipients,
-                                     Collection<MailAddress> matches, long processTime, Exception e) {
+                                     Collection<MailAddress> matches, long processTime, Throwable e) {
                 if (MockMatcher.class.equals(m.getClass())) {
                     assertThat(mailName).isEqualTo(mail.getName());
                     // match one recipient


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org