You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/03/19 11:22:20 UTC

[james-project] branch master updated (b3ea0e9 -> ca1b63b)

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

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


    from b3ea0e9  [maven-release-plugin] prepare for next development iteration
     new 0d41025  Revert "[maven-release-plugin] prepare for next development iteration"
     new ca1b63b  Revert "[maven-release-plugin] prepare release james-project-3.6.0"

The 2 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-v7/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-bus/api/pom.xml                                                 | 2 +-
 event-bus/cassandra/pom.xml                                           | 2 +-
 event-bus/distributed/pom.xml                                         | 2 +-
 event-bus/in-vm/pom.xml                                               | 2 +-
 event-bus/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                                                      | 4 ++--
 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-v7/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-v7/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/quota-recompute/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/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                                                               | 2 +-
 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-gc/pom.xml                                           | 2 +-
 server/blob/blob-memory/pom.xml                                       | 2 +-
 server/blob/blob-s3/pom.xml                                           | 2 +-
 server/blob/blob-storage-strategy/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/blob/api/pom.xml                               | 2 +-
 server/container/guice/blob/export/pom.xml                            | 2 +-
 server/container/guice/blob/memory/pom.xml                            | 2 +-
 server/container/guice/blob/s3/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/cassandra/pom.xml                              | 2 +-
 server/container/guice/configuration/pom.xml                          | 2 +-
 server/container/guice/data-cassandra/pom.xml                         | 2 +-
 server/container/guice/data-ldap/pom.xml                              | 2 +-
 server/container/guice/distributed/pom.xml                            | 2 +-
 server/container/guice/elasticsearch/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/mailrepository-cassandra/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/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-mail-over-web/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-rabbitmq-mailqueue/pom.xml  | 2 +-
 server/container/guice/protocols/webadmin-swagger/pom.xml             | 2 +-
 server/container/guice/protocols/webadmin/pom.xml                     | 2 +-
 server/container/guice/queue/activemq/pom.xml                         | 2 +-
 server/container/guice/queue/memory/pom.xml                           | 2 +-
 server/container/guice/queue/rabbitmq/pom.xml                         | 2 +-
 server/container/guice/sieve-file/pom.xml                             | 2 +-
 server/container/guice/sieve-jpa/pom.xml                              | 2 +-
 server/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-v7/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/mailet/remote-delivery-integration-testing/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 +-
 .../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 +-
 .../distributed-jmap-rfc-8621-integration-tests/pom.xml               | 2 +-
 .../jmap-rfc-8621-integration-tests-common/pom.xml                    | 2 +-
 .../memory-jmap-rfc-8621-integration-tests/pom.xml                    | 2 +-
 server/protocols/jmap-rfc-8621-integration-tests/pom.xml              | 2 +-
 server/protocols/jmap-rfc-8621/pom.xml                                | 2 +-
 server/protocols/jmap/pom.xml                                         | 2 +-
 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 +-
 server/protocols/webadmin-cli/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-dropwizard-metrics/pom.xml         | 2 +-
 server/protocols/webadmin/webadmin-jmap/pom.xml                       | 2 +-
 server/protocols/webadmin/webadmin-mail-over-web/pom.xml              | 2 +-
 .../protocols/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-rabbitmq/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 +-
 253 files changed, 254 insertions(+), 254 deletions(-)

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

[james-project] 02/02: Revert "[maven-release-plugin] prepare release james-project-3.6.0"

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

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

commit ca1b63b9ebf1da6fa3a6aee9144681ea0be4653f
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Mar 19 18:21:48 2021 +0700

    Revert "[maven-release-plugin] prepare release james-project-3.6.0"
    
    This reverts commit 7ceb0d527b250c6740eb30983b312a7be6266eb6.
---
 backends-common/cassandra/pom.xml                                 | 2 +-
 backends-common/elasticsearch-v7/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-bus/api/pom.xml                                             | 2 +-
 event-bus/cassandra/pom.xml                                       | 2 +-
 event-bus/distributed/pom.xml                                     | 2 +-
 event-bus/in-vm/pom.xml                                           | 2 +-
 event-bus/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                                                  | 8 ++------
 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-v7/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-v7/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/quota-recompute/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/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-gc/pom.xml                                       | 2 +-
 server/blob/blob-memory/pom.xml                                   | 2 +-
 server/blob/blob-s3/pom.xml                                       | 2 +-
 server/blob/blob-storage-strategy/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/blob/api/pom.xml                           | 2 +-
 server/container/guice/blob/export/pom.xml                        | 2 +-
 server/container/guice/blob/memory/pom.xml                        | 2 +-
 server/container/guice/blob/s3/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/cassandra/pom.xml                          | 2 +-
 server/container/guice/configuration/pom.xml                      | 2 +-
 server/container/guice/data-cassandra/pom.xml                     | 2 +-
 server/container/guice/data-ldap/pom.xml                          | 2 +-
 server/container/guice/distributed/pom.xml                        | 2 +-
 server/container/guice/elasticsearch/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/mailrepository-cassandra/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/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-mail-over-web/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 +-
 .../container/guice/protocols/webadmin-rabbitmq-mailqueue/pom.xml | 2 +-
 server/container/guice/protocols/webadmin-swagger/pom.xml         | 2 +-
 server/container/guice/protocols/webadmin/pom.xml                 | 2 +-
 server/container/guice/queue/activemq/pom.xml                     | 2 +-
 server/container/guice/queue/memory/pom.xml                       | 2 +-
 server/container/guice/queue/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-v7/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/mailet/remote-delivery-integration-testing/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 +-
 .../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 +-
 .../distributed-jmap-rfc-8621-integration-tests/pom.xml           | 2 +-
 .../jmap-rfc-8621-integration-tests-common/pom.xml                | 2 +-
 .../memory-jmap-rfc-8621-integration-tests/pom.xml                | 2 +-
 server/protocols/jmap-rfc-8621-integration-tests/pom.xml          | 2 +-
 server/protocols/jmap-rfc-8621/pom.xml                            | 2 +-
 server/protocols/jmap/pom.xml                                     | 2 +-
 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 +-
 server/protocols/webadmin-cli/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-dropwizard-metrics/pom.xml     | 2 +-
 server/protocols/webadmin/webadmin-jmap/pom.xml                   | 2 +-
 server/protocols/webadmin/webadmin-mail-over-web/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-rabbitmq/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 +-
 253 files changed, 255 insertions(+), 259 deletions(-)

diff --git a/backends-common/cassandra/pom.xml b/backends-common/cassandra/pom.xml
index 86643bd..361dd64 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apache-james-backends-cassandra</artifactId>
diff --git a/backends-common/elasticsearch-v7/pom.xml b/backends-common/elasticsearch-v7/pom.xml
index 705874a..8b6b5e9 100644
--- a/backends-common/elasticsearch-v7/pom.xml
+++ b/backends-common/elasticsearch-v7/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-backends-common</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apache-james-backends-es-v7</artifactId>
diff --git a/backends-common/jpa/pom.xml b/backends-common/jpa/pom.xml
index d67f7bf..225edeb 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apache-james-backends-jpa</artifactId>
diff --git a/backends-common/pom.xml b/backends-common/pom.xml
index 9501dce..46f9986 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>james-backends-common</artifactId>
diff --git a/backends-common/rabbitmq/pom.xml b/backends-common/rabbitmq/pom.xml
index 7edc3ad..6fb173c 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apache-james-backends-rabbitmq</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index d36d0b7..9e4d461 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>james-core</artifactId>
diff --git a/event-bus/api/pom.xml b/event-bus/api/pom.xml
index 8175dcd..36cfa78 100644
--- a/event-bus/api/pom.xml
+++ b/event-bus/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>event-bus</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>event-bus-api</artifactId>
diff --git a/event-bus/cassandra/pom.xml b/event-bus/cassandra/pom.xml
index 6b105d0..c65d376 100644
--- a/event-bus/cassandra/pom.xml
+++ b/event-bus/cassandra/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>event-bus</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dead-letter-cassandra</artifactId>
diff --git a/event-bus/distributed/pom.xml b/event-bus/distributed/pom.xml
index 9b95680..0efc066 100644
--- a/event-bus/distributed/pom.xml
+++ b/event-bus/distributed/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>event-bus</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>event-bus-distributed</artifactId>
diff --git a/event-bus/in-vm/pom.xml b/event-bus/in-vm/pom.xml
index 821994b..5124273 100644
--- a/event-bus/in-vm/pom.xml
+++ b/event-bus/in-vm/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>event-bus</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>event-bus-in-vm</artifactId>
diff --git a/event-bus/pom.xml b/event-bus/pom.xml
index 9b5adcc..49f19b9 100644
--- a/event-bus/pom.xml
+++ b/event-bus/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>event-bus</artifactId>
diff --git a/event-sourcing/event-sourcing-core/pom.xml b/event-sourcing/event-sourcing-core/pom.xml
index 9d832da..6f27fdd 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 229ffbf..0a3977a 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 c63795c..19b01d4 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 160c96d..163f46b 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 d65129c..8e58626 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>event-sourcing-event-store-memory</artifactId>
diff --git a/event-sourcing/pom.xml b/event-sourcing/pom.xml
index 1f64115..ecf64ee 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
     <artifactId>event-sourcing</artifactId>
 
diff --git a/examples/custom-listeners/pom.xml b/examples/custom-listeners/pom.xml
index 8541cc3..1491ef5 100644
--- a/examples/custom-listeners/pom.xml
+++ b/examples/custom-listeners/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.james.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>3.6.0</version>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <artifactId>custom-listeners</artifactId>
   <name>Apache James :: Examples :: Custom Listeners</name>
diff --git a/examples/custom-mailets/pom.xml b/examples/custom-mailets/pom.xml
index bd17645..812c6a4 100644
--- a/examples/custom-mailets/pom.xml
+++ b/examples/custom-mailets/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.james.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>3.6.0</version>
+    <version>3.6.0-SNAPSHOT</version>
   </parent>
   <artifactId>custom-mailets</artifactId>
   <name>Apache James :: Examples :: Custom Mailets</name>
diff --git a/examples/pom.xml b/examples/pom.xml
index 0af6745..843f552 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -23,11 +23,11 @@
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
     <version>23</version>
-    <relativePath />
+    <relativePath></relativePath>
   </parent>
   <groupId>org.apache.james.examples</groupId>
   <artifactId>examples</artifactId>
-  <version>3.6.0</version>
+  <version>3.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Apache James :: Examples</name>
   <modules>
@@ -40,8 +40,4 @@
     <maven.compiler.target>1.11</maven.compiler.target>
     <maven.compiler.source>1.11</maven.compiler.source>
   </properties>
-
-  <scm>
-    <tag>james-project-3.6.0</tag>
-  </scm>
 </project>
diff --git a/javax-mail-extension/pom.xml b/javax-mail-extension/pom.xml
index c920614..0d16da3 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/json/pom.xml b/json/pom.xml
index 41b0756..e744e1b 100644
--- a/json/pom.xml
+++ b/json/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>james-json</artifactId>
diff --git a/mailbox/api/pom.xml b/mailbox/api/pom.xml
index 4677be6..ff31374 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/mailbox/backup/pom.xml b/mailbox/backup/pom.xml
index 7688e41..854b934 100644
--- a/mailbox/backup/pom.xml
+++ b/mailbox/backup/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml
index a00dbe7..ef3566d 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/elasticsearch-v7/pom.xml b/mailbox/elasticsearch-v7/pom.xml
index c4ca661..97218db 100644
--- a/mailbox/elasticsearch-v7/pom.xml
+++ b/mailbox/elasticsearch-v7/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/event/json/pom.xml b/mailbox/event/json/pom.xml
index c8ffd24..fadfddb 100644
--- a/mailbox/event/json/pom.xml
+++ b/mailbox/event/json/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/jpa/pom.xml b/mailbox/jpa/pom.xml
index 8dd38dd..3a61146 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/lucene/pom.xml b/mailbox/lucene/pom.xml
index fc6bac8..badf286 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/maildir/pom.xml b/mailbox/maildir/pom.xml
index 43224e7..f42b5e8 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/memory/pom.xml b/mailbox/memory/pom.xml
index 4f27caa..3a78ac7 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 84bc43a..66861fa 100644
--- a/mailbox/plugin/deleted-messages-vault-cassandra/pom.xml
+++ b/mailbox/plugin/deleted-messages-vault-cassandra/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 0ed0f88..54672cd 100644
--- a/mailbox/plugin/deleted-messages-vault/pom.xml
+++ b/mailbox/plugin/deleted-messages-vault/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 85c7919..d23df63 100644
--- a/mailbox/plugin/quota-mailing-cassandra/pom.xml
+++ b/mailbox/plugin/quota-mailing-cassandra/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 bf77466..f5f064f 100644
--- a/mailbox/plugin/quota-mailing-memory/pom.xml
+++ b/mailbox/plugin/quota-mailing-memory/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/plugin/quota-mailing/pom.xml b/mailbox/plugin/quota-mailing/pom.xml
index 5bc60f3..bae4953 100644
--- a/mailbox/plugin/quota-mailing/pom.xml
+++ b/mailbox/plugin/quota-mailing/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/plugin/quota-search-elasticsearch-v7/pom.xml b/mailbox/plugin/quota-search-elasticsearch-v7/pom.xml
index f46b753..1193484 100644
--- a/mailbox/plugin/quota-search-elasticsearch-v7/pom.xml
+++ b/mailbox/plugin/quota-search-elasticsearch-v7/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 9c6a8e2..9bb57bc 100644
--- a/mailbox/plugin/quota-search-scanning/pom.xml
+++ b/mailbox/plugin/quota-search-scanning/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/plugin/quota-search/pom.xml b/mailbox/plugin/quota-search/pom.xml
index d50f4c4..24f9145 100644
--- a/mailbox/plugin/quota-search/pom.xml
+++ b/mailbox/plugin/quota-search/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/plugin/spamassassin/pom.xml b/mailbox/plugin/spamassassin/pom.xml
index 63e0978..43b9952 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index 67ebb06..5239b8a 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apache-james-mailbox</artifactId>
diff --git a/mailbox/scanning-search/pom.xml b/mailbox/scanning-search/pom.xml
index 148e7e9..76b4054 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/spring/pom.xml b/mailbox/spring/pom.xml
index cb22d8c..7281651 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/store/pom.xml b/mailbox/store/pom.xml
index 0b5f2de..7d64df7 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml
index 6c3e822..a2e53e4 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
 
     </parent>
 
diff --git a/mailbox/tools/copier/pom.xml b/mailbox/tools/copier/pom.xml
index 34dd351..bfd40a1 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/tools/indexer/pom.xml b/mailbox/tools/indexer/pom.xml
index 9b55c35..fd7e836 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/tools/jpa-migrator/pom.xml b/mailbox/tools/jpa-migrator/pom.xml
index 437fc12..68bb553 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/tools/quota-recompute/pom.xml b/mailbox/tools/quota-recompute/pom.xml
index 319c9a6..1f42af1 100644
--- a/mailbox/tools/quota-recompute/pom.xml
+++ b/mailbox/tools/quota-recompute/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailet/ai/pom.xml b/mailet/ai/pom.xml
index d539e34..177fcc2 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailet/api/pom.xml b/mailet/api/pom.xml
index 9d89f8c..558261f 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/mailet/base/pom.xml b/mailet/base/pom.xml
index ea4fe72..b856620 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/mailet/crypto/pom.xml b/mailet/crypto/pom.xml
index fac1243..dd9a4f0 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/mailet/icalendar/pom.xml b/mailet/icalendar/pom.xml
index db7dd1d..d7de898 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apache-mailet-icalendar</artifactId>
diff --git a/mailet/mailetdocs-maven-plugin/pom.xml b/mailet/mailetdocs-maven-plugin/pom.xml
index 0c7cf47..4f19572 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/mailet/pom.xml b/mailet/pom.xml
index fae60a1..df88f95 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apache-mailet</artifactId>
diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml
index 4b0f5e3..a46de03 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/mailet/test/pom.xml b/mailet/test/pom.xml
index 3fa59bb..411e7fd 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/mdn/pom.xml b/mdn/pom.xml
index b8a1c5b..68e15ea 100644
--- a/mdn/pom.xml
+++ b/mdn/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>james-mdn</artifactId>
diff --git a/metrics/metrics-api/pom.xml b/metrics/metrics-api/pom.xml
index 76a390d..943fe86 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>metrics-api</artifactId>
diff --git a/metrics/metrics-dropwizard/pom.xml b/metrics/metrics-dropwizard/pom.xml
index d4bb896..e4df4ff 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>metrics-dropwizard</artifactId>
diff --git a/metrics/metrics-logger/pom.xml b/metrics/metrics-logger/pom.xml
index ab48944..6deb5df 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>metrics-logger</artifactId>
diff --git a/metrics/metrics-tests/pom.xml b/metrics/metrics-tests/pom.xml
index ef04a49..275e811 100644
--- a/metrics/metrics-tests/pom.xml
+++ b/metrics/metrics-tests/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>metrics</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>metrics-tests</artifactId>
diff --git a/metrics/pom.xml b/metrics/pom.xml
index c9cc29b..7f64469 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>metrics</artifactId>
diff --git a/mpt/all/pom.xml b/mpt/all/pom.xml
index 39f04fb..0b52562 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>apache-james-mpt-all</artifactId>
diff --git a/mpt/app/pom.xml b/mpt/app/pom.xml
index 28a66f7..5054953 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mpt/core/pom.xml b/mpt/core/pom.xml
index b3ca1c4..298b700 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 a0becb8..92b88bd 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 a11aa50..30bf0f6 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 a73d337..22c01a8 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 b2dae38..f9fd93e 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 4123118..b3b81fa 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 9152183..0edd035 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 e5ed05e..77e815a 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 9a96468..0111b39 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 0b6c016..f9293bd 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 dc2b284..1fb35ab 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/mpt/impl/imap-mailbox/rabbitmq/pom.xml b/mpt/impl/imap-mailbox/rabbitmq/pom.xml
index f1b6868..2a9a2a4 100644
--- a/mpt/impl/imap-mailbox/rabbitmq/pom.xml
+++ b/mpt/impl/imap-mailbox/rabbitmq/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt-imapmailbox</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 fa19c1f..027fa5f 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/mpt/impl/managesieve/core/pom.xml b/mpt/impl/managesieve/core/pom.xml
index 545c180..aea0941 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 4ba00b5..d23fcc7 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/mpt/impl/managesieve/pom.xml b/mpt/impl/managesieve/pom.xml
index 8763e23..37f6837 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 57da703..5836f1d 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 82c4fee..db2a28a 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 7c2ed23..9982a4f 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apache-james-mpt-smtp-core</artifactId>
diff --git a/mpt/impl/smtp/pom.xml b/mpt/impl/smtp/pom.xml
index ed39dfb..8cbd697 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/mpt/mavenplugin/pom.xml b/mpt/mavenplugin/pom.xml
index 98f7aae..3aa9ff0 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mpt/pom.xml b/mpt/pom.xml
index 7d60d23..296a9fe 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apache-james-mpt</artifactId>
diff --git a/pom.xml b/pom.xml
index fcaa8eb..4e863ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>org.apache.james</groupId>
     <artifactId>james-project</artifactId>
-    <version>3.6.0</version>
+    <version>3.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Apache James Project</name>
@@ -546,7 +546,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>james-project-3.6.0</tag>
+        <tag>HEAD</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 d069756..99cae1d 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml
index db2631d..91bd67c 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/lmtp/pom.xml b/protocols/lmtp/pom.xml
index af7f967..f5b7c7f 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/managesieve/pom.xml b/protocols/managesieve/pom.xml
index 9724b46..dfd8fe7 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/netty/pom.xml b/protocols/netty/pom.xml
index 12d3880..2de20ee 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/pom.xml b/protocols/pom.xml
index 11aacba..50d4929 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.james.protocols</groupId>
diff --git a/protocols/pop3/pom.xml b/protocols/pop3/pom.xml
index e206274..784c795 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/smtp/pom.xml b/protocols/smtp/pom.xml
index e578f09..88b524e 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/app/pom.xml b/server/app/pom.xml
index 6fd2e55..0d96ef9 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-api/pom.xml b/server/blob/blob-api/pom.xml
index 8d1d1b3..9074e92 100644
--- a/server/blob/blob-api/pom.xml
+++ b/server/blob/blob-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-cassandra/pom.xml b/server/blob/blob-cassandra/pom.xml
index 17032cc..b98c929 100644
--- a/server/blob/blob-cassandra/pom.xml
+++ b/server/blob/blob-cassandra/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-common/pom.xml b/server/blob/blob-common/pom.xml
index 02fa796..2b11b69 100644
--- a/server/blob/blob-common/pom.xml
+++ b/server/blob/blob-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 95efff7..1de4ad0 100644
--- a/server/blob/blob-export-api/pom.xml
+++ b/server/blob/blob-export-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 a02d58d..595735b 100644
--- a/server/blob/blob-export-file/pom.xml
+++ b/server/blob/blob-export-file/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-gc/pom.xml b/server/blob/blob-gc/pom.xml
index 5c88a65..75d5a58 100644
--- a/server/blob/blob-gc/pom.xml
+++ b/server/blob/blob-gc/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-memory/pom.xml b/server/blob/blob-memory/pom.xml
index 6ad9f74..5284361 100644
--- a/server/blob/blob-memory/pom.xml
+++ b/server/blob/blob-memory/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-s3/pom.xml b/server/blob/blob-s3/pom.xml
index 218ccc3..a481878 100644
--- a/server/blob/blob-s3/pom.xml
+++ b/server/blob/blob-s3/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-storage-strategy/pom.xml b/server/blob/blob-storage-strategy/pom.xml
index fce8240..f191251 100644
--- a/server/blob/blob-storage-strategy/pom.xml
+++ b/server/blob/blob-storage-strategy/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/mail-store/pom.xml b/server/blob/mail-store/pom.xml
index 3907af1..dbb7261 100644
--- a/server/blob/mail-store/pom.xml
+++ b/server/blob/mail-store/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/pom.xml b/server/blob/pom.xml
index ccaee68..a704045 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/cli-integration/pom.xml b/server/container/cli-integration/pom.xml
index 5021dfc..ccb62bf 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/cli/pom.xml b/server/container/cli/pom.xml
index 8c27fe0..6a27690 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml
index 6724f66..76dc73c 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/filesystem-api/pom.xml b/server/container/filesystem-api/pom.xml
index 8504cd3..024298f 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/blob/api/pom.xml b/server/container/guice/blob/api/pom.xml
index 0a3b214..eacf1a4 100644
--- a/server/container/guice/blob/api/pom.xml
+++ b/server/container/guice/blob/api/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/blob/export/pom.xml b/server/container/guice/blob/export/pom.xml
index ee1c98b..7890354 100644
--- a/server/container/guice/blob/export/pom.xml
+++ b/server/container/guice/blob/export/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/blob/memory/pom.xml b/server/container/guice/blob/memory/pom.xml
index 65d2bc3..3c1f6d9 100644
--- a/server/container/guice/blob/memory/pom.xml
+++ b/server/container/guice/blob/memory/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/blob/s3/pom.xml b/server/container/guice/blob/s3/pom.xml
index 5f78a28..0c2c853 100644
--- a/server/container/guice/blob/s3/pom.xml
+++ b/server/container/guice/blob/s3/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 b203a28..5660b98 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 8a15ddb..0b9e06a 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 58c1afc..cb1675a 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 80df6eb..a0ea947 100644
--- a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml
+++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/cassandra/pom.xml b/server/container/guice/cassandra/pom.xml
index 34b54a9..909c120 100644
--- a/server/container/guice/cassandra/pom.xml
+++ b/server/container/guice/cassandra/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/configuration/pom.xml b/server/container/guice/configuration/pom.xml
index 296001b..ac19ac0 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/data-cassandra/pom.xml b/server/container/guice/data-cassandra/pom.xml
index d513719..87cdb77 100644
--- a/server/container/guice/data-cassandra/pom.xml
+++ b/server/container/guice/data-cassandra/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/data-ldap/pom.xml b/server/container/guice/data-ldap/pom.xml
index 25fcc03..61220c7 100644
--- a/server/container/guice/data-ldap/pom.xml
+++ b/server/container/guice/data-ldap/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/distributed/pom.xml b/server/container/guice/distributed/pom.xml
index 86850d2..85f7a29 100644
--- a/server/container/guice/distributed/pom.xml
+++ b/server/container/guice/distributed/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/elasticsearch/pom.xml b/server/container/guice/elasticsearch/pom.xml
index 2642807..9084f82 100644
--- a/server/container/guice/elasticsearch/pom.xml
+++ b/server/container/guice/elasticsearch/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 7a8f99b..6330bf9 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 3e57c02..39f711f 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 9c80631..dced445 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/jmx/pom.xml b/server/container/guice/jmx/pom.xml
index 9437d08..cd46fc4 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 accf4bb..6e22c07 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 8e3e8c7..315c612 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 240fdb6..b8609ba 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 c69a1d0..e8a6828 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 83d8e5c..1f7979d 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 e24afc5..387ad29 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 6168304..8a480ce 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/mailbox/pom.xml b/server/container/guice/mailbox/pom.xml
index 3f5553b..18fef20 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/mailet/pom.xml b/server/container/guice/mailet/pom.xml
index 6843d57..54ef8ce 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/mailrepository-cassandra/pom.xml b/server/container/guice/mailrepository-cassandra/pom.xml
index 54109df..ce88ad0 100644
--- a/server/container/guice/mailrepository-cassandra/pom.xml
+++ b/server/container/guice/mailrepository-cassandra/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 8e75939..d8da68d 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/onami/pom.xml b/server/container/guice/onami/pom.xml
index 914f94a..32d8be0 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>james-server-onami</artifactId>
diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml
index 5d9187c..9eed54c 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 9ce8de1..74b2916 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/jmap/pom.xml b/server/container/guice/protocols/jmap/pom.xml
index d711500..9568cd0 100644
--- a/server/container/guice/protocols/jmap/pom.xml
+++ b/server/container/guice/protocols/jmap/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 6440476..6c51f0c 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 b35b6f5..0fa7074 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 46f323b..13cf8c5 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 6be76c5..f110a64 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 3b3cbef..62ded28 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 c6de75b..d4a3c63 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 360aa54..be7a0ce 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/webadmin-mail-over-web/pom.xml b/server/container/guice/protocols/webadmin-mail-over-web/pom.xml
index 9fe91ef..ae61524 100644
--- a/server/container/guice/protocols/webadmin-mail-over-web/pom.xml
+++ b/server/container/guice/protocols/webadmin-mail-over-web/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 70d2ce0..c684522 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 d30c8d6..2a4290c 100644
--- a/server/container/guice/protocols/webadmin-mailqueue/pom.xml
+++ b/server/container/guice/protocols/webadmin-mailqueue/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 0da34eb..2ec7dca 100644
--- a/server/container/guice/protocols/webadmin-mailrepository/pom.xml
+++ b/server/container/guice/protocols/webadmin-mailrepository/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/webadmin-rabbitmq-mailqueue/pom.xml b/server/container/guice/protocols/webadmin-rabbitmq-mailqueue/pom.xml
index a3349f3..7689d3e 100644
--- a/server/container/guice/protocols/webadmin-rabbitmq-mailqueue/pom.xml
+++ b/server/container/guice/protocols/webadmin-rabbitmq-mailqueue/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 de59819..24f6d16 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 f4844c8..cedd56d 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/queue/activemq/pom.xml b/server/container/guice/queue/activemq/pom.xml
index dc0428d..60fe58d 100644
--- a/server/container/guice/queue/activemq/pom.xml
+++ b/server/container/guice/queue/activemq/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/queue/memory/pom.xml b/server/container/guice/queue/memory/pom.xml
index 837f2fd..c4e3aa7 100644
--- a/server/container/guice/queue/memory/pom.xml
+++ b/server/container/guice/queue/memory/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/queue/rabbitmq/pom.xml b/server/container/guice/queue/rabbitmq/pom.xml
index 91accf6..35752dd 100644
--- a/server/container/guice/queue/rabbitmq/pom.xml
+++ b/server/container/guice/queue/rabbitmq/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 b950668..cbe5211 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 9a76c71..ad106f9 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 a92e70e..ec81bcb 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 d01a0fd..28f8eff 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 0eee5d9..a49f20d 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/testing/pom.xml b/server/container/guice/testing/pom.xml
index 1144d55..f0a3fb0 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/lifecycle-api/pom.xml b/server/container/lifecycle-api/pom.xml
index f578c54..b5885b2 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/mailbox-adapter/pom.xml b/server/container/mailbox-adapter/pom.xml
index 29389b6..d69d296 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/mailbox-jmx/pom.xml b/server/container/mailbox-jmx/pom.xml
index c40ef02..eb436ca 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/metrics/metrics-es-reporter-v7/pom.xml b/server/container/metrics/metrics-es-reporter-v7/pom.xml
index 2ebe72b..49a01cc 100644
--- a/server/container/metrics/metrics-es-reporter-v7/pom.xml
+++ b/server/container/metrics/metrics-es-reporter-v7/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml
index baf722f..c0c4803 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/util/pom.xml b/server/container/util/pom.xml
index 621c912..b3fed4e 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-api/pom.xml b/server/data/data-api/pom.xml
index f079175..ffe0382 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-cassandra/pom.xml b/server/data/data-cassandra/pom.xml
index a49533f..d3ae891 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-file/pom.xml b/server/data/data-file/pom.xml
index d6b0356..5c1cf2e 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-jdbc/pom.xml b/server/data/data-jdbc/pom.xml
index d35fb7d..270e53b 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 178a9a5..c9154fd 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-jmap/pom.xml b/server/data/data-jmap/pom.xml
index 0685e3f..f2ad98d 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml
index 4bcea26..9d90d6f 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-ldap/pom.xml b/server/data/data-ldap/pom.xml
index 2ba6477..f9a2798 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-library/pom.xml b/server/data/data-library/pom.xml
index 7637ba6..1f8725e 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-memory/pom.xml b/server/data/data-memory/pom.xml
index 2fcabad..8546b26 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 f8e87e2..3b6357f 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 46992f6..d76f4db 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 4a8a9a9..9052085 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 b34be79..d3bac67 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailet/dkim/pom.xml b/server/mailet/dkim/pom.xml
index de34794..be32d89 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml
index 3c799e8..f93bd7d 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailet/mailetcontainer-api/pom.xml b/server/mailet/mailetcontainer-api/pom.xml
index 83772cf..132088e 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailet/mailetcontainer-camel/pom.xml b/server/mailet/mailetcontainer-camel/pom.xml
index 483610d..25c0a97 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml
index 79ebd51..e7b9659 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 2d23336..f550851 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailet/remote-delivery-integration-testing/pom.xml b/server/mailet/remote-delivery-integration-testing/pom.xml
index 46629f5..34fb786 100644
--- a/server/mailet/remote-delivery-integration-testing/pom.xml
+++ b/server/mailet/remote-delivery-integration-testing/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailrepository/mailrepository-api/pom.xml b/server/mailrepository/mailrepository-api/pom.xml
index 8d644e2..b7faf1a 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailrepository/mailrepository-cassandra/pom.xml b/server/mailrepository/mailrepository-cassandra/pom.xml
index 8c1100c..0b5c0f0 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailrepository/mailrepository-memory/pom.xml b/server/mailrepository/mailrepository-memory/pom.xml
index c3f1fc8..f4ed89c 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/pom.xml b/server/pom.xml
index 6d63be2..786a868 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>james-server</artifactId>
diff --git a/server/protocols/fetchmail/pom.xml b/server/protocols/fetchmail/pom.xml
index 82928bf..edbe655 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 7ebc3dd..2ea7df7 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 26d18c6..30f2d2f 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>
         <groupId>org.apache.james</groupId>
         <artifactId>jmap-draft-integration-testing</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 f8dd298..e7a9470 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 061729f..cf7f235 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>
         <groupId>org.apache.james</groupId>
         <artifactId>jmap-draft-integration-testing</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/jmap-draft/pom.xml b/server/protocols/jmap-draft/pom.xml
index cc07a98..faf106a 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml
index ac789f8..aca843e 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>jmap-rfc-8621-integration-tests</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>distributed-jmap-rfc-8621-integration-tests</artifactId>
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/pom.xml b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/pom.xml
index 11981f9..8f11f0b 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/pom.xml
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>jmap-rfc-8621-integration-tests</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
     <artifactId>jmap-rfc-8621-integration-tests-common</artifactId>
     <name>Apache James :: Server :: JMAP RFC-8621 :: Contract for Integration Testing</name>
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml
index 90f7256..06d250b 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml
+++ b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>jmap-rfc-8621-integration-tests</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
     <artifactId>memory-jmap-rfc-8621-integration-tests</artifactId>
     <name>Apache James :: Server :: JMAP RFC-8621 :: Memory Integration Testing</name>
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/pom.xml b/server/protocols/jmap-rfc-8621-integration-tests/pom.xml
index bebfbd2..4964751 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/pom.xml
+++ b/server/protocols/jmap-rfc-8621-integration-tests/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>jmap-rfc-8621-integration-tests</artifactId>
diff --git a/server/protocols/jmap-rfc-8621/pom.xml b/server/protocols/jmap-rfc-8621/pom.xml
index 3cb8610..9a6058e 100644
--- a/server/protocols/jmap-rfc-8621/pom.xml
+++ b/server/protocols/jmap-rfc-8621/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml
index 52868b4..5623136 100644
--- a/server/protocols/jmap/pom.xml
+++ b/server/protocols/jmap/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/jwt/pom.xml b/server/protocols/jwt/pom.xml
index f78a29e..f0c0eae 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/protocols-imap4/pom.xml b/server/protocols/protocols-imap4/pom.xml
index d30c163..d052ace 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/protocols-library/pom.xml b/server/protocols/protocols-library/pom.xml
index 3037cf3..fa3bfad 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/protocols-lmtp/pom.xml b/server/protocols/protocols-lmtp/pom.xml
index 23200b4..2e275dd 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/protocols-managesieve/pom.xml b/server/protocols/protocols-managesieve/pom.xml
index 18c3f9d..38cd4f4 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/protocols-pop3/pom.xml b/server/protocols/protocols-pop3/pom.xml
index eced4da..2c2e801 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml
index 71f6dbd..1e2e4c8 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin-cli/pom.xml b/server/protocols/webadmin-cli/pom.xml
index 30bd604..ee31404 100644
--- a/server/protocols/webadmin-cli/pom.xml
+++ b/server/protocols/webadmin-cli/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>webadmin-cli</artifactId>
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 a660b87..fcb60e2 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 1cf0c51..73c485a 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 974549b..bbda129 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 e53736a..60c0728 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/pom.xml b/server/protocols/webadmin/pom.xml
index 106dc07..3752508 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 e12ca7f..0da0f37 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 4c3de72..4e92a46 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 8e73002..a96e356 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 cfc09b9..13cf9a5 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/webadmin-dropwizard-metrics/pom.xml b/server/protocols/webadmin/webadmin-dropwizard-metrics/pom.xml
index bddf88f..52a00e0 100644
--- a/server/protocols/webadmin/webadmin-dropwizard-metrics/pom.xml
+++ b/server/protocols/webadmin/webadmin-dropwizard-metrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 a7c78db..5155bd2 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/webadmin-mail-over-web/pom.xml b/server/protocols/webadmin/webadmin-mail-over-web/pom.xml
index 481fcc2..cd3ef74 100644
--- a/server/protocols/webadmin/webadmin-mail-over-web/pom.xml
+++ b/server/protocols/webadmin/webadmin-mail-over-web/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 8eb93cf..3caae80 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 78dc749..b9038b4 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 1a88f69..34e3027 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 84754ef..3fff970 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/webadmin-rabbitmq/pom.xml b/server/protocols/webadmin/webadmin-rabbitmq/pom.xml
index 8797c80..d4940c1 100644
--- a/server/protocols/webadmin/webadmin-rabbitmq/pom.xml
+++ b/server/protocols/webadmin/webadmin-rabbitmq/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</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 26f3530..706beba 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/queue/queue-activemq/pom.xml b/server/queue/queue-activemq/pom.xml
index bb26d50..75b96a0 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/queue/queue-api/pom.xml b/server/queue/queue-api/pom.xml
index b980d64..acf8df4 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/queue/queue-file/pom.xml b/server/queue/queue-file/pom.xml
index adfe6dd..24a514d 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml
index e76e351..9f73c85 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/queue/queue-memory/pom.xml b/server/queue/queue-memory/pom.xml
index 885fe9f..cecd8db 100644
--- a/server/queue/queue-memory/pom.xml
+++ b/server/queue/queue-memory/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/queue/queue-rabbitmq/pom.xml b/server/queue/queue-rabbitmq/pom.xml
index b434eec..2b54b55 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/task/task-api/pom.xml b/server/task/task-api/pom.xml
index 00cbaea..8b8ab76 100644
--- a/server/task/task-api/pom.xml
+++ b/server/task/task-api/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/task/task-distributed/pom.xml b/server/task/task-distributed/pom.xml
index c48987b..f152981 100644
--- a/server/task/task-distributed/pom.xml
+++ b/server/task/task-distributed/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/task/task-json/pom.xml b/server/task/task-json/pom.xml
index ffed8da..637011d 100644
--- a/server/task/task-json/pom.xml
+++ b/server/task/task-json/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/task/task-memory/pom.xml b/server/task/task-memory/pom.xml
index 4e397b4..e88811f 100644
--- a/server/task/task-memory/pom.xml
+++ b/server/task/task-memory/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/testing/pom.xml b/server/testing/pom.xml
index cb2e17d..c5c8a57 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/testing/base/pom.xml b/testing/base/pom.xml
index 446d723..5f9325b 100644
--- a/testing/base/pom.xml
+++ b/testing/base/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/third-party/linshare/pom.xml b/third-party/linshare/pom.xml
index af152f2..5aad1c3 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apache-james-linshare</artifactId>
diff --git a/third-party/pom.xml b/third-party/pom.xml
index 0ac65d8..b456b16 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>third-party</artifactId>
diff --git a/third-party/spamassassin/pom.xml b/third-party/spamassassin/pom.xml
index c983638..c8f0fc5 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.6.0</version>
+        <version>3.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>apache-james-spamassassin</artifactId>

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

[james-project] 01/02: Revert "[maven-release-plugin] prepare for next development iteration"

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

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

commit 0d410259b6ee03cbb21e3d20c9e4b3b8249ac8fa
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Mar 19 18:21:45 2021 +0700

    Revert "[maven-release-plugin] prepare for next development iteration"
    
    This reverts commit b3ea0e9e29cc19e53ca25780b245fcc613f8572d.
---
 backends-common/cassandra/pom.xml                                   | 2 +-
 backends-common/elasticsearch-v7/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-bus/api/pom.xml                                               | 2 +-
 event-bus/cassandra/pom.xml                                         | 2 +-
 event-bus/distributed/pom.xml                                       | 2 +-
 event-bus/in-vm/pom.xml                                             | 2 +-
 event-bus/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                                                    | 6 +++++-
 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-v7/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-v7/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/quota-recompute/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/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-gc/pom.xml                                         | 2 +-
 server/blob/blob-memory/pom.xml                                     | 2 +-
 server/blob/blob-s3/pom.xml                                         | 2 +-
 server/blob/blob-storage-strategy/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/blob/api/pom.xml                             | 2 +-
 server/container/guice/blob/export/pom.xml                          | 2 +-
 server/container/guice/blob/memory/pom.xml                          | 2 +-
 server/container/guice/blob/s3/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/cassandra/pom.xml                            | 2 +-
 server/container/guice/configuration/pom.xml                        | 2 +-
 server/container/guice/data-cassandra/pom.xml                       | 2 +-
 server/container/guice/data-ldap/pom.xml                            | 2 +-
 server/container/guice/distributed/pom.xml                          | 2 +-
 server/container/guice/elasticsearch/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/mailrepository-cassandra/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/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-mail-over-web/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 +-
 .../container/guice/protocols/webadmin-rabbitmq-mailqueue/pom.xml   | 2 +-
 server/container/guice/protocols/webadmin-swagger/pom.xml           | 2 +-
 server/container/guice/protocols/webadmin/pom.xml                   | 2 +-
 server/container/guice/queue/activemq/pom.xml                       | 2 +-
 server/container/guice/queue/memory/pom.xml                         | 2 +-
 server/container/guice/queue/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-v7/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/mailet/remote-delivery-integration-testing/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 +-
 .../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 +-
 .../distributed-jmap-rfc-8621-integration-tests/pom.xml             | 2 +-
 .../jmap-rfc-8621-integration-tests-common/pom.xml                  | 2 +-
 .../memory-jmap-rfc-8621-integration-tests/pom.xml                  | 2 +-
 server/protocols/jmap-rfc-8621-integration-tests/pom.xml            | 2 +-
 server/protocols/jmap-rfc-8621/pom.xml                              | 2 +-
 server/protocols/jmap/pom.xml                                       | 2 +-
 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 +-
 server/protocols/webadmin-cli/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-dropwizard-metrics/pom.xml       | 2 +-
 server/protocols/webadmin/webadmin-jmap/pom.xml                     | 2 +-
 server/protocols/webadmin/webadmin-mail-over-web/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-rabbitmq/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 +-
 253 files changed, 258 insertions(+), 254 deletions(-)

diff --git a/backends-common/cassandra/pom.xml b/backends-common/cassandra/pom.xml
index edf24b9..86643bd 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>apache-james-backends-cassandra</artifactId>
diff --git a/backends-common/elasticsearch-v7/pom.xml b/backends-common/elasticsearch-v7/pom.xml
index 7dd9d18..705874a 100644
--- a/backends-common/elasticsearch-v7/pom.xml
+++ b/backends-common/elasticsearch-v7/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-backends-common</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>apache-james-backends-es-v7</artifactId>
diff --git a/backends-common/jpa/pom.xml b/backends-common/jpa/pom.xml
index aec6426..d67f7bf 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>apache-james-backends-jpa</artifactId>
diff --git a/backends-common/pom.xml b/backends-common/pom.xml
index b94b15c..9501dce 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>james-backends-common</artifactId>
diff --git a/backends-common/rabbitmq/pom.xml b/backends-common/rabbitmq/pom.xml
index 3041441..7edc3ad 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>apache-james-backends-rabbitmq</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index c61733f..d36d0b7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>james-core</artifactId>
diff --git a/event-bus/api/pom.xml b/event-bus/api/pom.xml
index e1da2f7..8175dcd 100644
--- a/event-bus/api/pom.xml
+++ b/event-bus/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>event-bus</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>event-bus-api</artifactId>
diff --git a/event-bus/cassandra/pom.xml b/event-bus/cassandra/pom.xml
index c4162f9..6b105d0 100644
--- a/event-bus/cassandra/pom.xml
+++ b/event-bus/cassandra/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>event-bus</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>dead-letter-cassandra</artifactId>
diff --git a/event-bus/distributed/pom.xml b/event-bus/distributed/pom.xml
index bbf0baf..9b95680 100644
--- a/event-bus/distributed/pom.xml
+++ b/event-bus/distributed/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>event-bus</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>event-bus-distributed</artifactId>
diff --git a/event-bus/in-vm/pom.xml b/event-bus/in-vm/pom.xml
index 5e419df..821994b 100644
--- a/event-bus/in-vm/pom.xml
+++ b/event-bus/in-vm/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>event-bus</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>event-bus-in-vm</artifactId>
diff --git a/event-bus/pom.xml b/event-bus/pom.xml
index daa5f50..9b5adcc 100644
--- a/event-bus/pom.xml
+++ b/event-bus/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>event-bus</artifactId>
diff --git a/event-sourcing/event-sourcing-core/pom.xml b/event-sourcing/event-sourcing-core/pom.xml
index f843e5a..9d832da 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 a6c5cc6..229ffbf 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 f28d59d..c63795c 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 3683a68..160c96d 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 293438c..d65129c 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>event-sourcing-event-store-memory</artifactId>
diff --git a/event-sourcing/pom.xml b/event-sourcing/pom.xml
index b53971b..1f64115 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
     <artifactId>event-sourcing</artifactId>
 
diff --git a/examples/custom-listeners/pom.xml b/examples/custom-listeners/pom.xml
index 867c7f4..8541cc3 100644
--- a/examples/custom-listeners/pom.xml
+++ b/examples/custom-listeners/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.james.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.6.0</version>
   </parent>
   <artifactId>custom-listeners</artifactId>
   <name>Apache James :: Examples :: Custom Listeners</name>
diff --git a/examples/custom-mailets/pom.xml b/examples/custom-mailets/pom.xml
index f1e75c4..bd17645 100644
--- a/examples/custom-mailets/pom.xml
+++ b/examples/custom-mailets/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.james.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.6.0</version>
   </parent>
   <artifactId>custom-mailets</artifactId>
   <name>Apache James :: Examples :: Custom Mailets</name>
diff --git a/examples/pom.xml b/examples/pom.xml
index ca2e0de..0af6745 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -27,7 +27,7 @@
   </parent>
   <groupId>org.apache.james.examples</groupId>
   <artifactId>examples</artifactId>
-  <version>3.7.0-SNAPSHOT</version>
+  <version>3.6.0</version>
   <packaging>pom</packaging>
   <name>Apache James :: Examples</name>
   <modules>
@@ -40,4 +40,8 @@
     <maven.compiler.target>1.11</maven.compiler.target>
     <maven.compiler.source>1.11</maven.compiler.source>
   </properties>
+
+  <scm>
+    <tag>james-project-3.6.0</tag>
+  </scm>
 </project>
diff --git a/javax-mail-extension/pom.xml b/javax-mail-extension/pom.xml
index 9a10ed6..c920614 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/json/pom.xml b/json/pom.xml
index ed42323..41b0756 100644
--- a/json/pom.xml
+++ b/json/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>james-json</artifactId>
diff --git a/mailbox/api/pom.xml b/mailbox/api/pom.xml
index 2f868f0..4677be6 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/mailbox/backup/pom.xml b/mailbox/backup/pom.xml
index 75b07c3..7688e41 100644
--- a/mailbox/backup/pom.xml
+++ b/mailbox/backup/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml
index 6f6b504..a00dbe7 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/elasticsearch-v7/pom.xml b/mailbox/elasticsearch-v7/pom.xml
index 7525909..c4ca661 100644
--- a/mailbox/elasticsearch-v7/pom.xml
+++ b/mailbox/elasticsearch-v7/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/event/json/pom.xml b/mailbox/event/json/pom.xml
index e232ab8..c8ffd24 100644
--- a/mailbox/event/json/pom.xml
+++ b/mailbox/event/json/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/jpa/pom.xml b/mailbox/jpa/pom.xml
index 0d001ee..8dd38dd 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/lucene/pom.xml b/mailbox/lucene/pom.xml
index 266c691..fc6bac8 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/maildir/pom.xml b/mailbox/maildir/pom.xml
index 961d181..43224e7 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/memory/pom.xml b/mailbox/memory/pom.xml
index b6224f1..4f27caa 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 ebe3589..84bc43a 100644
--- a/mailbox/plugin/deleted-messages-vault-cassandra/pom.xml
+++ b/mailbox/plugin/deleted-messages-vault-cassandra/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 a5f6bba..0ed0f88 100644
--- a/mailbox/plugin/deleted-messages-vault/pom.xml
+++ b/mailbox/plugin/deleted-messages-vault/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 1a3eb27..85c7919 100644
--- a/mailbox/plugin/quota-mailing-cassandra/pom.xml
+++ b/mailbox/plugin/quota-mailing-cassandra/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 c7ebc9b..bf77466 100644
--- a/mailbox/plugin/quota-mailing-memory/pom.xml
+++ b/mailbox/plugin/quota-mailing-memory/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/plugin/quota-mailing/pom.xml b/mailbox/plugin/quota-mailing/pom.xml
index 8b2e347..5bc60f3 100644
--- a/mailbox/plugin/quota-mailing/pom.xml
+++ b/mailbox/plugin/quota-mailing/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/plugin/quota-search-elasticsearch-v7/pom.xml b/mailbox/plugin/quota-search-elasticsearch-v7/pom.xml
index 9efb1df..f46b753 100644
--- a/mailbox/plugin/quota-search-elasticsearch-v7/pom.xml
+++ b/mailbox/plugin/quota-search-elasticsearch-v7/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 5f79ee8..9c6a8e2 100644
--- a/mailbox/plugin/quota-search-scanning/pom.xml
+++ b/mailbox/plugin/quota-search-scanning/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/plugin/quota-search/pom.xml b/mailbox/plugin/quota-search/pom.xml
index 4b634e3..d50f4c4 100644
--- a/mailbox/plugin/quota-search/pom.xml
+++ b/mailbox/plugin/quota-search/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/plugin/spamassassin/pom.xml b/mailbox/plugin/spamassassin/pom.xml
index 0c92903..63e0978 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index f8c1b44..67ebb06 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>apache-james-mailbox</artifactId>
diff --git a/mailbox/scanning-search/pom.xml b/mailbox/scanning-search/pom.xml
index 749482b..148e7e9 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/spring/pom.xml b/mailbox/spring/pom.xml
index 2832e4b..cb22d8c 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/store/pom.xml b/mailbox/store/pom.xml
index 202ba8d..0b5f2de 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml
index 74fa2b7..6c3e822 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
 
     </parent>
 
diff --git a/mailbox/tools/copier/pom.xml b/mailbox/tools/copier/pom.xml
index 11f3b44..34dd351 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/tools/indexer/pom.xml b/mailbox/tools/indexer/pom.xml
index ab6d31d..9b55c35 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/tools/jpa-migrator/pom.xml b/mailbox/tools/jpa-migrator/pom.xml
index 6eaf314..437fc12 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailbox/tools/quota-recompute/pom.xml b/mailbox/tools/quota-recompute/pom.xml
index ee9d24f..319c9a6 100644
--- a/mailbox/tools/quota-recompute/pom.xml
+++ b/mailbox/tools/quota-recompute/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mailbox</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/mailet/ai/pom.xml b/mailet/ai/pom.xml
index 30381a5..d539e34 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mailet/api/pom.xml b/mailet/api/pom.xml
index 4e62c08..9d89f8c 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/mailet/base/pom.xml b/mailet/base/pom.xml
index f1402bf..ea4fe72 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/mailet/crypto/pom.xml b/mailet/crypto/pom.xml
index 06ba631..fac1243 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/mailet/icalendar/pom.xml b/mailet/icalendar/pom.xml
index af840a9..db7dd1d 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 38c63ca..0c7cf47 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/mailet/pom.xml b/mailet/pom.xml
index 7036499..fae60a1 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>apache-mailet</artifactId>
diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml
index ddd5455..4b0f5e3 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/mailet/test/pom.xml b/mailet/test/pom.xml
index ca861ef..3fa59bb 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/mdn/pom.xml b/mdn/pom.xml
index 735a372..b8a1c5b 100644
--- a/mdn/pom.xml
+++ b/mdn/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>james-mdn</artifactId>
diff --git a/metrics/metrics-api/pom.xml b/metrics/metrics-api/pom.xml
index 0f32ffc..76a390d 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>metrics-api</artifactId>
diff --git a/metrics/metrics-dropwizard/pom.xml b/metrics/metrics-dropwizard/pom.xml
index 338540d..d4bb896 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>metrics-dropwizard</artifactId>
diff --git a/metrics/metrics-logger/pom.xml b/metrics/metrics-logger/pom.xml
index f8281f2..ab48944 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>metrics-logger</artifactId>
diff --git a/metrics/metrics-tests/pom.xml b/metrics/metrics-tests/pom.xml
index 0ec67a6..ef04a49 100644
--- a/metrics/metrics-tests/pom.xml
+++ b/metrics/metrics-tests/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>metrics</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>metrics-tests</artifactId>
diff --git a/metrics/pom.xml b/metrics/pom.xml
index 2712b47..c9cc29b 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>metrics</artifactId>
diff --git a/mpt/all/pom.xml b/mpt/all/pom.xml
index 746aeb1..39f04fb 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>apache-james-mpt-all</artifactId>
diff --git a/mpt/app/pom.xml b/mpt/app/pom.xml
index c959a6e..28a66f7 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mpt/core/pom.xml b/mpt/core/pom.xml
index 8fda65e..b3ca1c4 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 999f614..a0becb8 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 96967f2..a11aa50 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 3351e60..a73d337 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 ef11695..b2dae38 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 c9bc90c..4123118 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 e56cff0..9152183 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 81d68e2..e5ed05e 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 3a0c066..9a96468 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 73b14bf..0b6c016 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 d3fa201..dc2b284 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/mpt/impl/imap-mailbox/rabbitmq/pom.xml b/mpt/impl/imap-mailbox/rabbitmq/pom.xml
index 45fe472..f1b6868 100644
--- a/mpt/impl/imap-mailbox/rabbitmq/pom.xml
+++ b/mpt/impl/imap-mailbox/rabbitmq/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-james-mpt-imapmailbox</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 e9cb54b..fa19c1f 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/mpt/impl/managesieve/core/pom.xml b/mpt/impl/managesieve/core/pom.xml
index 2bab4b1..545c180 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 9cbabb0..4ba00b5 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/mpt/impl/managesieve/pom.xml b/mpt/impl/managesieve/pom.xml
index 1af8082..8763e23 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 490a9f9..57da703 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 4542d5b..82c4fee 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 99d2897..7c2ed23 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 5a82848..ed39dfb 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/mpt/mavenplugin/pom.xml b/mpt/mavenplugin/pom.xml
index 29e9a35..98f7aae 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mpt/pom.xml b/mpt/pom.xml
index 89030e2..7d60d23 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>apache-james-mpt</artifactId>
diff --git a/pom.xml b/pom.xml
index 6f3480f..fcaa8eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>org.apache.james</groupId>
     <artifactId>james-project</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.6.0</version>
     <packaging>pom</packaging>
 
     <name>Apache James Project</name>
@@ -546,7 +546,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.6.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 d54619c..d069756 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml
index 92e5b4f..db2631d 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/lmtp/pom.xml b/protocols/lmtp/pom.xml
index c555021..af7f967 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/managesieve/pom.xml b/protocols/managesieve/pom.xml
index 5d74113..9724b46 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/netty/pom.xml b/protocols/netty/pom.xml
index be0d3e8..12d3880 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/pom.xml b/protocols/pom.xml
index 5a46f9f..11aacba 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <groupId>org.apache.james.protocols</groupId>
diff --git a/protocols/pop3/pom.xml b/protocols/pop3/pom.xml
index 96b4297..e206274 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/smtp/pom.xml b/protocols/smtp/pom.xml
index d50cc37..e578f09 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/app/pom.xml b/server/app/pom.xml
index 510f7b0..6fd2e55 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-api/pom.xml b/server/blob/blob-api/pom.xml
index c57244e..8d1d1b3 100644
--- a/server/blob/blob-api/pom.xml
+++ b/server/blob/blob-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-cassandra/pom.xml b/server/blob/blob-cassandra/pom.xml
index 68835a4..17032cc 100644
--- a/server/blob/blob-cassandra/pom.xml
+++ b/server/blob/blob-cassandra/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-common/pom.xml b/server/blob/blob-common/pom.xml
index af396c1..02fa796 100644
--- a/server/blob/blob-common/pom.xml
+++ b/server/blob/blob-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 e747e4a..95efff7 100644
--- a/server/blob/blob-export-api/pom.xml
+++ b/server/blob/blob-export-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 621f120..a02d58d 100644
--- a/server/blob/blob-export-file/pom.xml
+++ b/server/blob/blob-export-file/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-gc/pom.xml b/server/blob/blob-gc/pom.xml
index e687ab2..5c88a65 100644
--- a/server/blob/blob-gc/pom.xml
+++ b/server/blob/blob-gc/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-memory/pom.xml b/server/blob/blob-memory/pom.xml
index 1938dae..6ad9f74 100644
--- a/server/blob/blob-memory/pom.xml
+++ b/server/blob/blob-memory/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-s3/pom.xml b/server/blob/blob-s3/pom.xml
index 063e3fa..218ccc3 100644
--- a/server/blob/blob-s3/pom.xml
+++ b/server/blob/blob-s3/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/blob-storage-strategy/pom.xml b/server/blob/blob-storage-strategy/pom.xml
index e1e4920..fce8240 100644
--- a/server/blob/blob-storage-strategy/pom.xml
+++ b/server/blob/blob-storage-strategy/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/mail-store/pom.xml b/server/blob/mail-store/pom.xml
index 7281edc..3907af1 100644
--- a/server/blob/mail-store/pom.xml
+++ b/server/blob/mail-store/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-blob</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/blob/pom.xml b/server/blob/pom.xml
index 59e22a2..ccaee68 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/cli-integration/pom.xml b/server/container/cli-integration/pom.xml
index 93e69c0..5021dfc 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/cli/pom.xml b/server/container/cli/pom.xml
index beeae4a..8c27fe0 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml
index 50a2688..6724f66 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/filesystem-api/pom.xml b/server/container/filesystem-api/pom.xml
index c663731..8504cd3 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/blob/api/pom.xml b/server/container/guice/blob/api/pom.xml
index efd9bd6..0a3b214 100644
--- a/server/container/guice/blob/api/pom.xml
+++ b/server/container/guice/blob/api/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/blob/export/pom.xml b/server/container/guice/blob/export/pom.xml
index e28e132..ee1c98b 100644
--- a/server/container/guice/blob/export/pom.xml
+++ b/server/container/guice/blob/export/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/blob/memory/pom.xml b/server/container/guice/blob/memory/pom.xml
index 5209723..65d2bc3 100644
--- a/server/container/guice/blob/memory/pom.xml
+++ b/server/container/guice/blob/memory/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/blob/s3/pom.xml b/server/container/guice/blob/s3/pom.xml
index 22aeaee..5f78a28 100644
--- a/server/container/guice/blob/s3/pom.xml
+++ b/server/container/guice/blob/s3/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 766f94a..b203a28 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 57e1eda..8a15ddb 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 124e8df..58c1afc 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 b1e070c..80df6eb 100644
--- a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml
+++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/cassandra/pom.xml b/server/container/guice/cassandra/pom.xml
index af2aa92..34b54a9 100644
--- a/server/container/guice/cassandra/pom.xml
+++ b/server/container/guice/cassandra/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/configuration/pom.xml b/server/container/guice/configuration/pom.xml
index e4c79f0..296001b 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/data-cassandra/pom.xml b/server/container/guice/data-cassandra/pom.xml
index 08ff850..d513719 100644
--- a/server/container/guice/data-cassandra/pom.xml
+++ b/server/container/guice/data-cassandra/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/data-ldap/pom.xml b/server/container/guice/data-ldap/pom.xml
index 5bc6f60..25fcc03 100644
--- a/server/container/guice/data-ldap/pom.xml
+++ b/server/container/guice/data-ldap/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/distributed/pom.xml b/server/container/guice/distributed/pom.xml
index 74d47fa..86850d2 100644
--- a/server/container/guice/distributed/pom.xml
+++ b/server/container/guice/distributed/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/elasticsearch/pom.xml b/server/container/guice/elasticsearch/pom.xml
index 1872903..2642807 100644
--- a/server/container/guice/elasticsearch/pom.xml
+++ b/server/container/guice/elasticsearch/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 961c7eb..7a8f99b 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 9a9566c..3e57c02 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 8f4a08a..9c80631 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/jmx/pom.xml b/server/container/guice/jmx/pom.xml
index 4a4660f..9437d08 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 7c16177..accf4bb 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 5267b98..8e3e8c7 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 9bd128b..240fdb6 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 2d59b39..c69a1d0 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 d4b3efa..83d8e5c 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 4beb6ff..e24afc5 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 dabbade..6168304 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/mailbox/pom.xml b/server/container/guice/mailbox/pom.xml
index d31320a..3f5553b 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/mailet/pom.xml b/server/container/guice/mailet/pom.xml
index f301808..6843d57 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/mailrepository-cassandra/pom.xml b/server/container/guice/mailrepository-cassandra/pom.xml
index 53a9e97..54109df 100644
--- a/server/container/guice/mailrepository-cassandra/pom.xml
+++ b/server/container/guice/mailrepository-cassandra/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 f066516..8e75939 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/onami/pom.xml b/server/container/guice/onami/pom.xml
index 122df49..914f94a 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>james-server-onami</artifactId>
diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml
index 7ef0017..5d9187c 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 9deb7f2..9ce8de1 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/jmap/pom.xml b/server/container/guice/protocols/jmap/pom.xml
index 32751b3..d711500 100644
--- a/server/container/guice/protocols/jmap/pom.xml
+++ b/server/container/guice/protocols/jmap/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 e7ee99c..6440476 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 3ebcc4f..b35b6f5 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 7c7b996..46f323b 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 c45d92a..6be76c5 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 403399a..3b3cbef 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 73042ca..c6de75b 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 3519bb7..360aa54 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/webadmin-mail-over-web/pom.xml b/server/container/guice/protocols/webadmin-mail-over-web/pom.xml
index bbb958e..9fe91ef 100644
--- a/server/container/guice/protocols/webadmin-mail-over-web/pom.xml
+++ b/server/container/guice/protocols/webadmin-mail-over-web/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 3fea372..70d2ce0 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 40ced73..d30c8d6 100644
--- a/server/container/guice/protocols/webadmin-mailqueue/pom.xml
+++ b/server/container/guice/protocols/webadmin-mailqueue/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 f3fc452..0da34eb 100644
--- a/server/container/guice/protocols/webadmin-mailrepository/pom.xml
+++ b/server/container/guice/protocols/webadmin-mailrepository/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/protocols/webadmin-rabbitmq-mailqueue/pom.xml b/server/container/guice/protocols/webadmin-rabbitmq-mailqueue/pom.xml
index 500dd35..a3349f3 100644
--- a/server/container/guice/protocols/webadmin-rabbitmq-mailqueue/pom.xml
+++ b/server/container/guice/protocols/webadmin-rabbitmq-mailqueue/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 7c658ab..de59819 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 9e06afb..f4844c8 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/queue/activemq/pom.xml b/server/container/guice/queue/activemq/pom.xml
index a391f79..dc0428d 100644
--- a/server/container/guice/queue/activemq/pom.xml
+++ b/server/container/guice/queue/activemq/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/queue/memory/pom.xml b/server/container/guice/queue/memory/pom.xml
index 19e1e37..837f2fd 100644
--- a/server/container/guice/queue/memory/pom.xml
+++ b/server/container/guice/queue/memory/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/queue/rabbitmq/pom.xml b/server/container/guice/queue/rabbitmq/pom.xml
index c5f5048..91accf6 100644
--- a/server/container/guice/queue/rabbitmq/pom.xml
+++ b/server/container/guice/queue/rabbitmq/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server-guice</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 9ddcec1..b950668 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 cba9b25..9a76c71 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 c6e826c..a92e70e 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 ce3ad62..d01a0fd 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 24e3b4f..0eee5d9 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/guice/testing/pom.xml b/server/container/guice/testing/pom.xml
index ecf45ac..1144d55 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/lifecycle-api/pom.xml b/server/container/lifecycle-api/pom.xml
index 6304812..f578c54 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/mailbox-adapter/pom.xml b/server/container/mailbox-adapter/pom.xml
index c389773..29389b6 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/mailbox-jmx/pom.xml b/server/container/mailbox-jmx/pom.xml
index 326b5ff..c40ef02 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/metrics/metrics-es-reporter-v7/pom.xml b/server/container/metrics/metrics-es-reporter-v7/pom.xml
index 6cb8891..2ebe72b 100644
--- a/server/container/metrics/metrics-es-reporter-v7/pom.xml
+++ b/server/container/metrics/metrics-es-reporter-v7/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml
index 36add15..baf722f 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/container/util/pom.xml b/server/container/util/pom.xml
index deb1390..621c912 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-api/pom.xml b/server/data/data-api/pom.xml
index 22d6942..f079175 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-cassandra/pom.xml b/server/data/data-cassandra/pom.xml
index 6ff6ba2..a49533f 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-file/pom.xml b/server/data/data-file/pom.xml
index 4e8cef5..d6b0356 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-jdbc/pom.xml b/server/data/data-jdbc/pom.xml
index eb5d5e1..d35fb7d 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 567591d..178a9a5 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-jmap/pom.xml b/server/data/data-jmap/pom.xml
index 8456e56..0685e3f 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml
index 71b601b..4bcea26 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-ldap/pom.xml b/server/data/data-ldap/pom.xml
index 88492e1..2ba6477 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-library/pom.xml b/server/data/data-library/pom.xml
index 7a771ee..7637ba6 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/data/data-memory/pom.xml b/server/data/data-memory/pom.xml
index a9c9c61..2fcabad 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 80a6ebb..f8e87e2 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 b0a2788..46992f6 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 9050e67..4a8a9a9 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 fb4af26..b34be79 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailet/dkim/pom.xml b/server/mailet/dkim/pom.xml
index eb4a5ce..de34794 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml
index 6e6da97..3c799e8 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailet/mailetcontainer-api/pom.xml b/server/mailet/mailetcontainer-api/pom.xml
index 2f748c9..83772cf 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailet/mailetcontainer-camel/pom.xml b/server/mailet/mailetcontainer-camel/pom.xml
index 5cdaa67..483610d 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml
index 93e6d43..79ebd51 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 58c725f..2d23336 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailet/remote-delivery-integration-testing/pom.xml b/server/mailet/remote-delivery-integration-testing/pom.xml
index 922cec5..46629f5 100644
--- a/server/mailet/remote-delivery-integration-testing/pom.xml
+++ b/server/mailet/remote-delivery-integration-testing/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailrepository/mailrepository-api/pom.xml b/server/mailrepository/mailrepository-api/pom.xml
index e518bc7..8d644e2 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailrepository/mailrepository-cassandra/pom.xml b/server/mailrepository/mailrepository-cassandra/pom.xml
index 42f4ffc..8c1100c 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/mailrepository/mailrepository-memory/pom.xml b/server/mailrepository/mailrepository-memory/pom.xml
index f2507c4..c3f1fc8 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/pom.xml b/server/pom.xml
index f620f6d..6d63be2 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>james-server</artifactId>
diff --git a/server/protocols/fetchmail/pom.xml b/server/protocols/fetchmail/pom.xml
index 5d12254..82928bf 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 4899a45..7ebc3dd 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 5454281..26d18c6 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>
         <groupId>org.apache.james</groupId>
         <artifactId>jmap-draft-integration-testing</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 8f4f77a..f8dd298 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 a4a277d..061729f 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>
         <groupId>org.apache.james</groupId>
         <artifactId>jmap-draft-integration-testing</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/jmap-draft/pom.xml b/server/protocols/jmap-draft/pom.xml
index 22c372f..cc07a98 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml
index f4f2d25..ac789f8 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml
+++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>jmap-rfc-8621-integration-tests</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>distributed-jmap-rfc-8621-integration-tests</artifactId>
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/pom.xml b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/pom.xml
index 4463737..11981f9 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/pom.xml
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>jmap-rfc-8621-integration-tests</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
     <artifactId>jmap-rfc-8621-integration-tests-common</artifactId>
     <name>Apache James :: Server :: JMAP RFC-8621 :: Contract for Integration Testing</name>
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml
index 4ff51f5..90f7256 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml
+++ b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>jmap-rfc-8621-integration-tests</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
     <artifactId>memory-jmap-rfc-8621-integration-tests</artifactId>
     <name>Apache James :: Server :: JMAP RFC-8621 :: Memory Integration Testing</name>
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/pom.xml b/server/protocols/jmap-rfc-8621-integration-tests/pom.xml
index 129e04c..bebfbd2 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/pom.xml
+++ b/server/protocols/jmap-rfc-8621-integration-tests/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>jmap-rfc-8621-integration-tests</artifactId>
diff --git a/server/protocols/jmap-rfc-8621/pom.xml b/server/protocols/jmap-rfc-8621/pom.xml
index 526270c..3cb8610 100644
--- a/server/protocols/jmap-rfc-8621/pom.xml
+++ b/server/protocols/jmap-rfc-8621/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml
index 0363064..52868b4 100644
--- a/server/protocols/jmap/pom.xml
+++ b/server/protocols/jmap/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/jwt/pom.xml b/server/protocols/jwt/pom.xml
index 79e0d1d..f78a29e 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/protocols-imap4/pom.xml b/server/protocols/protocols-imap4/pom.xml
index 937f2e7..d30c163 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/protocols-library/pom.xml b/server/protocols/protocols-library/pom.xml
index e1dcfe7..3037cf3 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/protocols-lmtp/pom.xml b/server/protocols/protocols-lmtp/pom.xml
index 8090e67..23200b4 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/protocols-managesieve/pom.xml b/server/protocols/protocols-managesieve/pom.xml
index 2328239..18c3f9d 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/protocols-pop3/pom.xml b/server/protocols/protocols-pop3/pom.xml
index 03946c3..eced4da 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml
index 936450b..71f6dbd 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin-cli/pom.xml b/server/protocols/webadmin-cli/pom.xml
index 8d52aac..30bd604 100644
--- a/server/protocols/webadmin-cli/pom.xml
+++ b/server/protocols/webadmin-cli/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>webadmin-cli</artifactId>
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 ad8527a..a660b87 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 79c1fa7..1cf0c51 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 9e8b351..974549b 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 3a1b2a2..e53736a 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/pom.xml b/server/protocols/webadmin/pom.xml
index 4cef572..106dc07 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 afc95ca..e12ca7f 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 41d9ad3..4c3de72 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 eb2fa1e..8e73002 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 d9ce9c9..cfc09b9 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/webadmin-dropwizard-metrics/pom.xml b/server/protocols/webadmin/webadmin-dropwizard-metrics/pom.xml
index ab10e5c..bddf88f 100644
--- a/server/protocols/webadmin/webadmin-dropwizard-metrics/pom.xml
+++ b/server/protocols/webadmin/webadmin-dropwizard-metrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 c12e1af..a7c78db 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/webadmin-mail-over-web/pom.xml b/server/protocols/webadmin/webadmin-mail-over-web/pom.xml
index 0536bb2..481fcc2 100644
--- a/server/protocols/webadmin/webadmin-mail-over-web/pom.xml
+++ b/server/protocols/webadmin/webadmin-mail-over-web/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 e899db6..8eb93cf 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 06098fc..78dc749 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 2f4c584..1a88f69 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.7.0-SNAPSHOT</version>
+        <version>3.6.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 0a8451e..84754ef 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/protocols/webadmin/webadmin-rabbitmq/pom.xml b/server/protocols/webadmin/webadmin-rabbitmq/pom.xml
index 2e1d80d..8797c80 100644
--- a/server/protocols/webadmin/webadmin-rabbitmq/pom.xml
+++ b/server/protocols/webadmin/webadmin-rabbitmq/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.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 43b124c..26f3530 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/queue/queue-activemq/pom.xml b/server/queue/queue-activemq/pom.xml
index 2969f3a..bb26d50 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/queue/queue-api/pom.xml b/server/queue/queue-api/pom.xml
index 1d67586..b980d64 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/queue/queue-file/pom.xml b/server/queue/queue-file/pom.xml
index 984ef6c..adfe6dd 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml
index 24bbad2..e76e351 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/queue/queue-memory/pom.xml b/server/queue/queue-memory/pom.xml
index 9bc09ec..885fe9f 100644
--- a/server/queue/queue-memory/pom.xml
+++ b/server/queue/queue-memory/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/queue/queue-rabbitmq/pom.xml b/server/queue/queue-rabbitmq/pom.xml
index 78da8c9..b434eec 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/task/task-api/pom.xml b/server/task/task-api/pom.xml
index 715ddd1..00cbaea 100644
--- a/server/task/task-api/pom.xml
+++ b/server/task/task-api/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/task/task-distributed/pom.xml b/server/task/task-distributed/pom.xml
index 98559cb..c48987b 100644
--- a/server/task/task-distributed/pom.xml
+++ b/server/task/task-distributed/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/task/task-json/pom.xml b/server/task/task-json/pom.xml
index a5a7f10..ffed8da 100644
--- a/server/task/task-json/pom.xml
+++ b/server/task/task-json/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/task/task-memory/pom.xml b/server/task/task-memory/pom.xml
index 0763985..4e397b4 100644
--- a/server/task/task-memory/pom.xml
+++ b/server/task/task-memory/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-server</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/server/testing/pom.xml b/server/testing/pom.xml
index c5362ef..cb2e17d 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/testing/base/pom.xml b/testing/base/pom.xml
index e9d6328..446d723 100644
--- a/testing/base/pom.xml
+++ b/testing/base/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>james-project</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/third-party/linshare/pom.xml b/third-party/linshare/pom.xml
index 675f176..af152f2 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>apache-james-linshare</artifactId>
diff --git a/third-party/pom.xml b/third-party/pom.xml
index 158a685..0ac65d8 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>third-party</artifactId>
diff --git a/third-party/spamassassin/pom.xml b/third-party/spamassassin/pom.xml
index c2251d6..c983638 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.7.0-SNAPSHOT</version>
+        <version>3.6.0</version>
     </parent>
 
     <artifactId>apache-james-spamassassin</artifactId>

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