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 fef130adc06b15eebddf0f5479344615ad8e97c5 Author: Jean Helou <[email protected]> AuthorDate: Wed Nov 18 11:25:31 2020 +0100 JAMES-2124 Sorts modelversion, parent and artifact --- core/pom.xml | 4 ++-- event-sourcing/pom.xml | 2 +- json/pom.xml | 4 ++-- mailbox/backup/pom.xml | 2 +- mailbox/event/event-cassandra/pom.xml | 2 +- mailbox/event/event-memory/pom.xml | 2 +- mailbox/event/event-rabbitmq/pom.xml | 2 +- mailbox/event/json/pom.xml | 2 +- mailbox/plugin/deleted-messages-vault-cassandra/pom.xml | 2 +- mailbox/plugin/deleted-messages-vault/pom.xml | 2 +- mailbox/plugin/quota-mailing-cassandra/pom.xml | 2 +- mailbox/plugin/quota-mailing-memory/pom.xml | 2 +- mailbox/plugin/quota-mailing/pom.xml | 2 +- mailbox/plugin/quota-search-elasticsearch/pom.xml | 2 +- mailbox/plugin/quota-search-scanning/pom.xml | 2 +- mailbox/plugin/quota-search/pom.xml | 2 +- mdn/pom.xml | 4 ++-- metrics/metrics-tests/pom.xml | 4 ++-- mpt/impl/imap-mailbox/rabbitmq/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 | 10 +++++----- server/blob/blob-storage-strategy/pom.xml | 2 +- server/blob/mail-store/pom.xml | 2 +- .../container/guice/cassandra-rabbitmq-ldap-guice/pom.xml | 8 ++++---- .../guice/protocols/webadmin-mail-over-web/pom.xml | 2 +- .../container/guice/protocols/webadmin-mailqueue/pom.xml | 4 ++-- .../guice/protocols/webadmin-mailrepository/pom.xml | 4 ++-- .../guice/protocols/webadmin-rabbitmq-mailqueue/pom.xml | 4 ++-- .../cassandra-jmap-draft-integration-testing/pom.xml | 2 +- .../memory-jmap-draft-integration-testing/pom.xml | 2 +- .../rabbitmq-jmap-draft-integration-testing/pom.xml | 2 +- .../distributed-jmap-rfc-8621-integration-tests/pom.xml | 12 +++++------- .../jmap-rfc-8621-integration-tests-common/pom.xml | 12 +++++------- .../memory-jmap-rfc-8621-integration-tests/pom.xml | 12 +++++------- server/protocols/jmap-rfc-8621-integration-tests/pom.xml | 10 ++++------ server/protocols/jmap-rfc-8621/pom.xml | 3 +-- server/protocols/jmap/pom.xml | 5 ++--- server/protocols/webadmin-cli/pom.xml | 14 +++++--------- server/protocols/webadmin/webadmin-mail-over-web/pom.xml | 2 +- server/queue/queue-memory/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 +- testing/base/pom.xml | 4 ++-- 51 files changed, 86 insertions(+), 100 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 48f4e33..9e4d461 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -18,12 +18,12 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-project</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-project</artifactId> <version>3.6.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>james-core</artifactId> diff --git a/event-sourcing/pom.xml b/event-sourcing/pom.xml index 257446d..fb2f814 100644 --- a/event-sourcing/pom.xml +++ b/event-sourcing/pom.xml @@ -25,9 +25,9 @@ <artifactId>james-project</artifactId> <version>3.6.0-SNAPSHOT</version> </parent> + <artifactId>event-sourcing</artifactId> <packaging>pom</packaging> - <artifactId>event-sourcing</artifactId> <name>Apache James :: Event Sourcing</name> diff --git a/json/pom.xml b/json/pom.xml index 50bd13e..e744e1b 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -18,12 +18,12 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-project</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-project</artifactId> <version>3.6.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>james-json</artifactId> diff --git a/mailbox/backup/pom.xml b/mailbox/backup/pom.xml index c530b9f..9f1cf45 100644 --- a/mailbox/backup/pom.xml +++ b/mailbox/backup/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>apache-james-mailbox</artifactId> <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox</artifactId> <version>3.6.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/mailbox/event/event-cassandra/pom.xml b/mailbox/event/event-cassandra/pom.xml index ff304ad..1aaa04d 100644 --- a/mailbox/event/event-cassandra/pom.xml +++ b/mailbox/event/event-cassandra/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>apache-james-mailbox</artifactId> <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox</artifactId> <version>3.6.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/mailbox/event/event-memory/pom.xml b/mailbox/event/event-memory/pom.xml index 04534ef..1069502 100644 --- a/mailbox/event/event-memory/pom.xml +++ b/mailbox/event/event-memory/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>apache-james-mailbox</artifactId> <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox</artifactId> <version>3.6.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/mailbox/event/event-rabbitmq/pom.xml b/mailbox/event/event-rabbitmq/pom.xml index 29fbacf..84be4e9 100644 --- a/mailbox/event/event-rabbitmq/pom.xml +++ b/mailbox/event/event-rabbitmq/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>apache-james-mailbox</artifactId> <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox</artifactId> <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 161b77d..8d88ee8 100644 --- a/mailbox/event/json/pom.xml +++ b/mailbox/event/json/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>apache-james-mailbox</artifactId> <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox</artifactId> <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 801def9..b8b7547 100644 --- a/mailbox/plugin/deleted-messages-vault-cassandra/pom.xml +++ b/mailbox/plugin/deleted-messages-vault-cassandra/pom.xml @@ -18,8 +18,8 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>apache-james-mailbox</artifactId> <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox</artifactId> <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 26db1a7..3317bd8 100644 --- a/mailbox/plugin/deleted-messages-vault/pom.xml +++ b/mailbox/plugin/deleted-messages-vault/pom.xml @@ -19,8 +19,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>apache-james-mailbox</artifactId> <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox</artifactId> <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 0b42ce1..91e1616 100644 --- a/mailbox/plugin/quota-mailing-cassandra/pom.xml +++ b/mailbox/plugin/quota-mailing-cassandra/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>apache-james-mailbox</artifactId> <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox</artifactId> <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 5d6c02f..53d3f95 100644 --- a/mailbox/plugin/quota-mailing-memory/pom.xml +++ b/mailbox/plugin/quota-mailing-memory/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>apache-james-mailbox</artifactId> <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox</artifactId> <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 d0a69b6..bdd619a 100644 --- a/mailbox/plugin/quota-mailing/pom.xml +++ b/mailbox/plugin/quota-mailing/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>apache-james-mailbox</artifactId> <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox</artifactId> <version>3.6.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/mailbox/plugin/quota-search-elasticsearch/pom.xml b/mailbox/plugin/quota-search-elasticsearch/pom.xml index d0c40a5..d3051cd 100644 --- a/mailbox/plugin/quota-search-elasticsearch/pom.xml +++ b/mailbox/plugin/quota-search-elasticsearch/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>apache-james-mailbox</artifactId> <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox</artifactId> <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 289580e..bd6a4d4 100644 --- a/mailbox/plugin/quota-search-scanning/pom.xml +++ b/mailbox/plugin/quota-search-scanning/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>apache-james-mailbox</artifactId> <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox</artifactId> <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 687ad8b..bd4cff5 100644 --- a/mailbox/plugin/quota-search/pom.xml +++ b/mailbox/plugin/quota-search/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>apache-james-mailbox</artifactId> <groupId>org.apache.james</groupId> + <artifactId>apache-james-mailbox</artifactId> <version>3.6.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/mdn/pom.xml b/mdn/pom.xml index 61a91da..77fc8cf 100644 --- a/mdn/pom.xml +++ b/mdn/pom.xml @@ -18,12 +18,12 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-project</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-project</artifactId> <version>3.6.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>james-mdn</artifactId> diff --git a/metrics/metrics-tests/pom.xml b/metrics/metrics-tests/pom.xml index de47e55..b692fcd 100644 --- a/metrics/metrics-tests/pom.xml +++ b/metrics/metrics-tests/pom.xml @@ -18,12 +18,12 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>metrics</artifactId> <groupId>org.apache.james</groupId> + <artifactId>metrics</artifactId> <version>3.6.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>metrics-tests</artifactId> diff --git a/mpt/impl/imap-mailbox/rabbitmq/pom.xml b/mpt/impl/imap-mailbox/rabbitmq/pom.xml index 127d191..4944fce 100644 --- a/mpt/impl/imap-mailbox/rabbitmq/pom.xml +++ b/mpt/impl/imap-mailbox/rabbitmq/pom.xml @@ -22,8 +22,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>apache-james-mpt-imapmailbox</artifactId> <groupId>org.apache.james</groupId> + <artifactId>apache-james-mpt-imapmailbox</artifactId> <version>3.6.0-SNAPSHOT</version> </parent> diff --git a/server/blob/blob-api/pom.xml b/server/blob/blob-api/pom.xml index e0c935c..557e2e3 100644 --- a/server/blob/blob-api/pom.xml +++ b/server/blob/blob-api/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server-blob</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server-blob</artifactId> <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 3a07679..b395e6e 100644 --- a/server/blob/blob-cassandra/pom.xml +++ b/server/blob/blob-cassandra/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server-blob</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server-blob</artifactId> <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 acd254a..d383468 100644 --- a/server/blob/blob-common/pom.xml +++ b/server/blob/blob-common/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server-blob</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server-blob</artifactId> <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 8e9f5b0..a979624 100644 --- a/server/blob/blob-export-api/pom.xml +++ b/server/blob/blob-export-api/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server-blob</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server-blob</artifactId> <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 8f82f46..0c44fe1 100644 --- a/server/blob/blob-export-file/pom.xml +++ b/server/blob/blob-export-file/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server-blob</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server-blob</artifactId> <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 44e3d1b..a396e74 100644 --- a/server/blob/blob-gc/pom.xml +++ b/server/blob/blob-gc/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server-blob</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server-blob</artifactId> <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 cb002cb..f6b1d34 100644 --- a/server/blob/blob-memory/pom.xml +++ b/server/blob/blob-memory/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server-blob</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server-blob</artifactId> <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 b87695e..8d35903 100644 --- a/server/blob/blob-s3/pom.xml +++ b/server/blob/blob-s3/pom.xml @@ -20,13 +20,9 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <properties> - <s3-sdk.version>2.14.12</s3-sdk.version> - </properties> - <parent> - <artifactId>james-server-blob</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server-blob</artifactId> <version>3.6.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -36,6 +32,10 @@ <name>Apache James :: Server :: Blob :: S3</name> + <properties> + <s3-sdk.version>2.14.12</s3-sdk.version> + </properties> + <dependencies> <dependency> <groupId>${james.groupId}</groupId> diff --git a/server/blob/blob-storage-strategy/pom.xml b/server/blob/blob-storage-strategy/pom.xml index e2ba795..c462b0b 100644 --- a/server/blob/blob-storage-strategy/pom.xml +++ b/server/blob/blob-storage-strategy/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server-blob</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server-blob</artifactId> <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 c1df268..2dd459d 100644 --- a/server/blob/mail-store/pom.xml +++ b/server/blob/mail-store/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server-blob</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server-blob</artifactId> <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 579bc8b..6ed69e7 100644 --- a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml +++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml @@ -18,18 +18,18 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server-guice</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server-guice</artifactId> <version>3.6.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> + + <artifactId>james-server-cassandra-rabbitmq-ldap-guice</artifactId> <name>Apache James :: Server :: Cassandra/Ldap with RabbitMQ - guice injection</name> <description>An advanced email server - Cassandra/Ldap backend and RabbitMQ messaging with guice injection</description> - - <artifactId>james-server-cassandra-rabbitmq-ldap-guice</artifactId> <dependencies> <dependency> <groupId>${james.groupId}</groupId> 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 25278ea..e8190bb 100644 --- a/server/container/guice/protocols/webadmin-mail-over-web/pom.xml +++ b/server/container/guice/protocols/webadmin-mail-over-web/pom.xml @@ -18,13 +18,13 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.james</groupId> <artifactId>james-server-guice</artifactId> <version>3.6.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>james-server-guice-webadmin-mail-over-web</artifactId> <packaging>jar</packaging> diff --git a/server/container/guice/protocols/webadmin-mailqueue/pom.xml b/server/container/guice/protocols/webadmin-mailqueue/pom.xml index ec8b246..2a4290c 100644 --- a/server/container/guice/protocols/webadmin-mailqueue/pom.xml +++ b/server/container/guice/protocols/webadmin-mailqueue/pom.xml @@ -20,10 +20,10 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - + <parent> - <artifactId>james-server-guice</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server-guice</artifactId> <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 1527a81..4ff4e21 100644 --- a/server/container/guice/protocols/webadmin-mailrepository/pom.xml +++ b/server/container/guice/protocols/webadmin-mailrepository/pom.xml @@ -20,10 +20,10 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - + <parent> - <artifactId>james-server-guice</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server-guice</artifactId> <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 9d625f4..7689d3e 100644 --- a/server/container/guice/protocols/webadmin-rabbitmq-mailqueue/pom.xml +++ b/server/container/guice/protocols/webadmin-rabbitmq-mailqueue/pom.xml @@ -20,10 +20,10 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - + <parent> - <artifactId>james-server-guice</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server-guice</artifactId> <version>3.6.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/pom.xml b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/pom.xml index ccb1b97..1069813 100644 --- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/pom.xml +++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/pom.xml @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>jmap-draft-integration-testing</artifactId> <groupId>org.apache.james</groupId> + <artifactId>jmap-draft-integration-testing</artifactId> <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 f452e7f..83edc18 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 @@ -21,8 +21,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>jmap-draft-integration-testing</artifactId> <groupId>org.apache.james</groupId> + <artifactId>jmap-draft-integration-testing</artifactId> <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 682a117..7cd5490 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 @@ -3,8 +3,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>jmap-draft-integration-testing</artifactId> <groupId>org.apache.james</groupId> + <artifactId>jmap-draft-integration-testing</artifactId> <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 c1092ac..cd9674a 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 @@ -17,19 +17,17 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>jmap-rfc-8621-integration-tests</artifactId> <groupId>org.apache.james</groupId> + <artifactId>jmap-rfc-8621-integration-tests</artifactId> <version>3.6.0-SNAPSHOT</version> </parent> - - <modelVersion>4.0.0</modelVersion> <artifactId>distributed-jmap-rfc-8621-integration-tests</artifactId> - <description>Distributed Integration testing for JMAP RFC-8621</description> <name>Apache James :: Server :: JMAP RFC-8621 :: Distributed Integration Testing</name> + <description>Distributed Integration testing for JMAP RFC-8621</description> <dependencies> <dependency> 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 e024ff5..3fb6359 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 @@ -17,19 +17,17 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>jmap-rfc-8621-integration-tests</artifactId> <groupId>org.apache.james</groupId> + <artifactId>jmap-rfc-8621-integration-tests</artifactId> <version>3.6.0-SNAPSHOT</version> </parent> - - <modelVersion>4.0.0</modelVersion> <artifactId>jmap-rfc-8621-integration-tests-common</artifactId> - <description>JMAP RFC-8621 integration test suite common to all products</description> <name>Apache James :: Server :: JMAP RFC-8621 :: Contract for Integration Testing</name> + <description>JMAP RFC-8621 integration test suite common to all products</description> <dependencies> <dependency> 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 97bc022..6d61d42 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 @@ -17,19 +17,17 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>jmap-rfc-8621-integration-tests</artifactId> <groupId>org.apache.james</groupId> + <artifactId>jmap-rfc-8621-integration-tests</artifactId> <version>3.6.0-SNAPSHOT</version> </parent> - - <modelVersion>4.0.0</modelVersion> <artifactId>memory-jmap-rfc-8621-integration-tests</artifactId> - <description>JMAP RFC-8621 integration test for memory product</description> <name>Apache James :: Server :: JMAP RFC-8621 :: Memory Integration Testing</name> + <description>JMAP RFC-8621 integration test for memory product</description> <dependencies> <dependency> diff --git a/server/protocols/jmap-rfc-8621-integration-tests/pom.xml b/server/protocols/jmap-rfc-8621-integration-tests/pom.xml index 1208634..afd061e 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/pom.xml +++ b/server/protocols/jmap-rfc-8621-integration-tests/pom.xml @@ -17,17 +17,15 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.6.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - - <modelVersion>4.0.0</modelVersion> <artifactId>jmap-rfc-8621-integration-tests</artifactId> <packaging>pom</packaging> <name>Apache James :: Server :: JMAP RFC-8621 :: Integration Testing</name> diff --git a/server/protocols/jmap-rfc-8621/pom.xml b/server/protocols/jmap-rfc-8621/pom.xml index c7b3a4e..9692da3 100644 --- a/server/protocols/jmap-rfc-8621/pom.xml +++ b/server/protocols/jmap-rfc-8621/pom.xml @@ -17,8 +17,7 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml index 33e0e04..3180a0d 100644 --- a/server/protocols/jmap/pom.xml +++ b/server/protocols/jmap/pom.xml @@ -17,15 +17,14 @@ * specific language governing permissions and limitations * * under the License. * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.6.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>james-server-jmap</artifactId> diff --git a/server/protocols/webadmin-cli/pom.xml b/server/protocols/webadmin-cli/pom.xml index 97bb4c7..fcf926b 100644 --- a/server/protocols/webadmin-cli/pom.xml +++ b/server/protocols/webadmin-cli/pom.xml @@ -17,22 +17,18 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.6.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - - <modelVersion>4.0.0</modelVersion> + <artifactId>webadmin-cli</artifactId> <name>Apache James :: Server :: Web Admin CLI</name> <description>James Webadmin based CLI</description> - <artifactId>webadmin-cli</artifactId> - - <dependencies> <dependency> diff --git a/server/protocols/webadmin/webadmin-mail-over-web/pom.xml b/server/protocols/webadmin/webadmin-mail-over-web/pom.xml index 27e6dd5..624f1eb 100644 --- a/server/protocols/webadmin/webadmin-mail-over-web/pom.xml +++ b/server/protocols/webadmin/webadmin-mail-over-web/pom.xml @@ -18,13 +18,13 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.james</groupId> <artifactId>james-server</artifactId> <version>3.6.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>james-server-webadmin-mail-over-web</artifactId> <packaging>jar</packaging> diff --git a/server/queue/queue-memory/pom.xml b/server/queue/queue-memory/pom.xml index b6525aa..4c34652 100644 --- a/server/queue/queue-memory/pom.xml +++ b/server/queue/queue-memory/pom.xml @@ -3,8 +3,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <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 2b18578..09a15d9 100644 --- a/server/task/task-api/pom.xml +++ b/server/task/task-api/pom.xml @@ -22,8 +22,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <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 ef1abd1..f152981 100644 --- a/server/task/task-distributed/pom.xml +++ b/server/task/task-distributed/pom.xml @@ -22,8 +22,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <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 631fd76..637011d 100644 --- a/server/task/task-json/pom.xml +++ b/server/task/task-json/pom.xml @@ -22,8 +22,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <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 0085afd..7bdd962 100644 --- a/server/task/task-memory/pom.xml +++ b/server/task/task-memory/pom.xml @@ -22,8 +22,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-server</artifactId> <version>3.6.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/testing/base/pom.xml b/testing/base/pom.xml index 5a14231..5f9325b 100644 --- a/testing/base/pom.xml +++ b/testing/base/pom.xml @@ -18,13 +18,13 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>james-project</artifactId> <groupId>org.apache.james</groupId> + <artifactId>james-project</artifactId> <version>3.6.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>testing-base</artifactId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
