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 369e6c1a047323663228124b4b78b316df30a394 Author: Benoit Tellier <[email protected]> AuthorDate: Thu Sep 12 15:53:07 2019 +0700 JAMES-2855 Cleanup dependencies --- backends-common/cassandra/pom.xml | 19 ++++----- core/pom.xml | 5 --- event-sourcing/event-sourcing-pojo/pom.xml | 9 +--- event-sourcing/event-store-api/pom.xml | 4 -- examples/custom-listeners/pom.xml | 4 -- mailbox/api/pom.xml | 5 --- mailbox/cassandra/pom.xml | 17 -------- mailbox/event/event-cassandra/pom.xml | 2 +- mailbox/maildir/pom.xml | 6 --- mailbox/plugin/quota-mailing-cassandra/pom.xml | 6 --- mailbox/plugin/quota-mailing/pom.xml | 4 -- mailbox/store/pom.xml | 9 ---- mailbox/tika/pom.xml | 10 +---- mailbox/tools/copier/pom.xml | 15 ------- mailbox/tools/indexer/pom.xml | 6 --- mailet/api/pom.xml | 8 ---- mailet/base/pom.xml | 19 --------- mailet/icalendar/pom.xml | 6 --- mailet/standard/pom.xml | 6 --- mailet/test/pom.xml | 26 ------------ metrics/metrics-dropwizard/pom.xml | 4 -- metrics/metrics-tests/pom.xml | 4 -- mpt/all/pom.xml | 5 --- mpt/app/pom.xml | 10 ----- mpt/core/pom.xml | 21 ---------- mpt/impl/imap-mailbox/cassandra/pom.xml | 4 ++ mpt/impl/imap-mailbox/core/pom.xml | 17 -------- mpt/impl/imap-mailbox/cyrus/pom.xml | 4 ++ mpt/impl/imap-mailbox/external-james/pom.xml | 12 ------ mpt/impl/managesieve/core/pom.xml | 4 -- .../smtp/cassandra-rabbitmq-object-storage/pom.xml | 18 ++++++++ mpt/impl/smtp/cassandra/pom.xml | 4 -- mpt/impl/smtp/core/pom.xml | 17 -------- mpt/mavenplugin/pom.xml | 11 ----- mpt/pom.xml | 1 - pom.xml | 20 ++++----- protocols/imap/pom.xml | 5 --- protocols/managesieve/pom.xml | 5 --- server/blob/blob-api/pom.xml | 1 - server/blob/blob-export-api/pom.xml | 8 ++-- server/container/cli-integration/pom.xml | 4 -- server/container/core/pom.xml | 14 ++----- server/container/filesystem-api/pom.xml | 4 -- server/container/guice/activemq/pom.xml | 4 -- server/container/guice/blob-api-guice/pom.xml | 4 +- server/container/guice/blob-export-guice/pom.xml | 2 +- server/container/guice/blob-memory-guice/pom.xml | 4 +- .../guice/blob-objectstorage-guice/pom.xml | 2 +- server/container/guice/cassandra-guice/pom.xml | 26 ++---------- .../guice/cassandra-rabbitmq-guice/pom.xml | 21 ++++++++++ .../guice/cassandra-rabbitmq-ldap-guice/pom.xml | 14 +++++++ server/container/guice/es-metric-reporter/pom.xml | 2 +- server/container/guice/guice-common/pom.xml | 49 ---------------------- .../james/modules/MailetProcessingModule.java | 2 - server/container/guice/jpa-guice/pom.xml | 12 ++++-- server/container/guice/jpa-smtp-mariadb/pom.xml | 8 ++++ server/container/guice/jpa-smtp/pom.xml | 4 ++ .../pom.xml | 2 +- server/container/guice/mailet/pom.xml | 4 -- server/container/guice/memory-guice/pom.xml | 18 +++++--- server/container/guice/protocols/imap/pom.xml | 4 -- .../container/guice/protocols/jmap-draft/pom.xml | 4 -- .../container/guice/protocols/managedsieve/pom.xml | 4 -- .../modules/protocols/ManageSieveServerModule.java | 1 + .../james/modules/protocols/SieveModule.java} | 18 ++++---- server/container/guice/protocols/netty/pom.xml | 4 -- .../protocols/webadmin-cassandra-data/pom.xml | 4 -- .../guice/protocols/webadmin-cassandra/pom.xml | 4 -- .../guice/protocols/webadmin-data/pom.xml | 4 -- .../guice/protocols/webadmin-mailbox/pom.xml | 4 -- .../guice/protocols/webadmin-mailqueue/pom.xml | 4 -- .../protocols/webadmin-mailrepository/pom.xml | 4 -- .../guice/protocols/webadmin-swagger/pom.xml | 4 -- server/container/jetty/pom.xml | 12 ------ server/container/lifecycle-api/pom.xml | 4 -- server/container/mailbox-adapter/pom.xml | 12 ------ server/container/util/pom.xml | 6 --- server/data/data-api/pom.xml | 5 --- server/data/data-cassandra/pom.xml | 4 -- server/data/data-jmap/pom.xml | 2 +- server/data/data-jpa/pom.xml | 5 --- server/data/data-library/pom.xml | 10 ----- server/data/data-memory/pom.xml | 5 +++ server/dns-service/dnsservice-api/pom.xml | 13 ------ server/mailet/integration-testing/pom.xml | 20 --------- server/mailet/mailetcontainer-camel/pom.xml | 15 ------- server/mailet/mailets/pom.xml | 28 ------------- server/mailrepository/mailrepository-api/pom.xml | 6 --- .../mailrepository/mailrepository-memory/pom.xml | 9 ---- .../pom.xml | 14 +++++++ .../jmap-draft-integration-testing-common/pom.xml | 22 ++++------ .../pom.xml | 14 +++++++ server/protocols/jmap-draft/pom.xml | 45 -------------------- server/protocols/protocols-imap4/pom.xml | 9 ---- server/protocols/protocols-lmtp/pom.xml | 16 ------- server/protocols/protocols-managesieve/pom.xml | 4 -- server/protocols/protocols-pop3/pom.xml | 19 --------- server/protocols/protocols-smtp/pom.xml | 33 --------------- .../webadmin/webadmin-cassandra-data/pom.xml | 5 --- .../protocols/webadmin/webadmin-cassandra/pom.xml | 5 --- server/protocols/webadmin/webadmin-core/pom.xml | 9 ---- server/protocols/webadmin/webadmin-data/pom.xml | 9 ---- .../webadmin-mailbox-deleted-message-vault/pom.xml | 16 ------- server/protocols/webadmin/webadmin-mailbox/pom.xml | 11 ----- .../webadmin/webadmin-mailrepository/pom.xml | 6 --- server/queue/queue-activemq/pom.xml | 21 ---------- server/queue/queue-api/pom.xml | 21 ---------- server/queue/queue-file/pom.xml | 12 ------ server/queue/queue-jms/pom.xml | 19 --------- server/queue/queue-memory/pom.xml | 13 ++---- server/task-distributed/pom.xml | 15 ++----- server/task-json/pom.xml | 11 ----- server/testing/pom.xml | 23 ---------- third-party/spamassassin/pom.xml | 6 --- 114 files changed, 194 insertions(+), 964 deletions(-) diff --git a/backends-common/cassandra/pom.xml b/backends-common/cassandra/pom.xml index be9786e..8447c97 100644 --- a/backends-common/cassandra/pom.xml +++ b/backends-common/cassandra/pom.xml @@ -41,10 +41,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-task</artifactId> </dependency> <dependency> @@ -57,12 +53,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-util</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> @@ -84,6 +74,11 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>io.projectreactor</groupId> <artifactId>reactor-core</artifactId> @@ -104,6 +99,10 @@ </dependency> <dependency> <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> <dependency> diff --git a/core/pom.xml b/core/pom.xml index ac28299..e8035f4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -38,11 +38,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>javax-mail-extension</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> diff --git a/event-sourcing/event-sourcing-pojo/pom.xml b/event-sourcing/event-sourcing-pojo/pom.xml index 9f2784a..9740849 100644 --- a/event-sourcing/event-sourcing-pojo/pom.xml +++ b/event-sourcing/event-sourcing-pojo/pom.xml @@ -38,13 +38,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.github.steveash.guavate</groupId> - <artifactId>guavate</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> </dependencies> - </project> diff --git a/event-sourcing/event-store-api/pom.xml b/event-sourcing/event-store-api/pom.xml index 1794c7d..96329bf 100644 --- a/event-sourcing/event-store-api/pom.xml +++ b/event-sourcing/event-store-api/pom.xml @@ -51,10 +51,6 @@ <groupId>com.github.steveash.guavate</groupId> <artifactId>guavate</artifactId> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> </dependencies> </project> \ No newline at end of file diff --git a/examples/custom-listeners/pom.xml b/examples/custom-listeners/pom.xml index 5c76082..fe13eec 100644 --- a/examples/custom-listeners/pom.xml +++ b/examples/custom-listeners/pom.xml @@ -33,10 +33,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-util</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> diff --git a/mailbox/api/pom.xml b/mailbox/api/pom.xml index 2ead49b..e5c912c 100644 --- a/mailbox/api/pom.xml +++ b/mailbox/api/pom.xml @@ -91,11 +91,6 @@ <artifactId>commons-text</artifactId> </dependency> <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-guava</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> <scope>test</scope> diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml index d3cb872..1446d40 100644 --- a/mailbox/cassandra/pom.xml +++ b/mailbox/cassandra/pom.xml @@ -78,12 +78,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-data-api</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-task</artifactId> </dependency> <dependency> @@ -96,12 +90,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>javax-mail-extension</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> @@ -136,11 +124,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-guava</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> <scope>test</scope> diff --git a/mailbox/event/event-cassandra/pom.xml b/mailbox/event/event-cassandra/pom.xml index c123775..6e0d0f6 100644 --- a/mailbox/event/event-cassandra/pom.xml +++ b/mailbox/event/event-cassandra/pom.xml @@ -54,7 +54,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-cassandra</artifactId> + <artifactId>apache-james-mailbox-store</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/mailbox/maildir/pom.xml b/mailbox/maildir/pom.xml index 005cfca..282845c 100644 --- a/mailbox/maildir/pom.xml +++ b/mailbox/maildir/pom.xml @@ -53,12 +53,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mailbox-store</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>apache-mime4j-core</artifactId> </dependency> <dependency> diff --git a/mailbox/plugin/quota-mailing-cassandra/pom.xml b/mailbox/plugin/quota-mailing-cassandra/pom.xml index 1cbdc68..86f67d9 100644 --- a/mailbox/plugin/quota-mailing-cassandra/pom.xml +++ b/mailbox/plugin/quota-mailing-cassandra/pom.xml @@ -65,12 +65,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-base</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>apache-mailet-test</artifactId> <scope>test</scope> </dependency> diff --git a/mailbox/plugin/quota-mailing/pom.xml b/mailbox/plugin/quota-mailing/pom.xml index e21a570..432fc55 100644 --- a/mailbox/plugin/quota-mailing/pom.xml +++ b/mailbox/plugin/quota-mailing/pom.xml @@ -89,10 +89,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-util</artifactId> </dependency> <dependency> diff --git a/mailbox/store/pom.xml b/mailbox/store/pom.xml index 934d82f..0eba595 100644 --- a/mailbox/store/pom.xml +++ b/mailbox/store/pom.xml @@ -90,10 +90,6 @@ <artifactId>jackson-databind</artifactId> </dependency> <dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-jdk8</artifactId> - </dependency> - <dependency> <groupId>com.github.steveash.guavate</groupId> <artifactId>guavate</artifactId> </dependency> @@ -123,11 +119,6 @@ <artifactId>commons-lang3</artifactId> </dependency> <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-guava</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> <scope>test</scope> diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml index 8a786dc..cb8ac1b 100644 --- a/mailbox/tika/pom.xml +++ b/mailbox/tika/pom.xml @@ -34,7 +34,7 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mailbox-store</artifactId> + <artifactId>apache-james-mailbox-api</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> @@ -55,10 +55,6 @@ <artifactId>jackson-databind</artifactId> </dependency> <dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-guava</artifactId> - </dependency> - <dependency> <groupId>com.github.steveash.guavate</groupId> <artifactId>guavate</artifactId> </dependency> @@ -68,10 +64,6 @@ </dependency> <dependency> <groupId>org.apache.commons</groupId> - <artifactId>commons-configuration2</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> <dependency> diff --git a/mailbox/tools/copier/pom.xml b/mailbox/tools/copier/pom.xml index e7ed389..4f453f1 100644 --- a/mailbox/tools/copier/pom.xml +++ b/mailbox/tools/copier/pom.xml @@ -58,25 +58,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mailbox-store</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> diff --git a/mailbox/tools/indexer/pom.xml b/mailbox/tools/indexer/pom.xml index a64c24c..1551ef3 100644 --- a/mailbox/tools/indexer/pom.xml +++ b/mailbox/tools/indexer/pom.xml @@ -81,12 +81,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mailbox-store</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>blob-cassandra</artifactId> <scope>test</scope> </dependency> diff --git a/mailet/api/pom.xml b/mailet/api/pom.xml index 249eee5..ef689c3 100644 --- a/mailet/api/pom.xml +++ b/mailet/api/pom.xml @@ -64,14 +64,6 @@ <artifactId>jackson-databind</artifactId> </dependency> <dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-guava</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-jdk8</artifactId> - </dependency> - <dependency> <groupId>com.github.steveash.guavate</groupId> <artifactId>guavate</artifactId> </dependency> diff --git a/mailet/base/pom.xml b/mailet/base/pom.xml index 05901a0..6d03fb2 100644 --- a/mailet/base/pom.xml +++ b/mailet/base/pom.xml @@ -82,29 +82,10 @@ <artifactId>javax.mail</artifactId> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-guava</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> diff --git a/mailet/icalendar/pom.xml b/mailet/icalendar/pom.xml index eb896e8..6116672 100644 --- a/mailet/icalendar/pom.xml +++ b/mailet/icalendar/pom.xml @@ -45,12 +45,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>javax-mail-extension</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml index ad7cbc2..8a2f911 100644 --- a/mailet/standard/pom.xml +++ b/mailet/standard/pom.xml @@ -62,12 +62,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>javax-mail-extension</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> diff --git a/mailet/test/pom.xml b/mailet/test/pom.xml index 8751ccf..f1967d2 100644 --- a/mailet/test/pom.xml +++ b/mailet/test/pom.xml @@ -46,18 +46,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-mime4j-core</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-util</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>javax-mail-extension</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> @@ -74,24 +66,6 @@ <artifactId>javax.mail</artifactId> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-guava</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> diff --git a/metrics/metrics-dropwizard/pom.xml b/metrics/metrics-dropwizard/pom.xml index 04c97d8..20e2423 100644 --- a/metrics/metrics-dropwizard/pom.xml +++ b/metrics/metrics-dropwizard/pom.xml @@ -40,10 +40,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-core</artifactId> </dependency> diff --git a/metrics/metrics-tests/pom.xml b/metrics/metrics-tests/pom.xml index 48ddbe0..5408ba9 100644 --- a/metrics/metrics-tests/pom.xml +++ b/metrics/metrics-tests/pom.xml @@ -52,9 +52,5 @@ <groupId>com.github.steveash.guavate</groupId> <artifactId>guavate</artifactId> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> </dependencies> </project> \ No newline at end of file diff --git a/mpt/all/pom.xml b/mpt/all/pom.xml index f27dbda..9aa8886 100644 --- a/mpt/all/pom.xml +++ b/mpt/all/pom.xml @@ -47,11 +47,6 @@ MPT is a functional test framework specialised for the ASCII line-base protocols <artifactId>ant</artifactId> </dependency> <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-antunit</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> </dependency> diff --git a/mpt/app/pom.xml b/mpt/app/pom.xml index cdd779b..f50abb3 100644 --- a/mpt/app/pom.xml +++ b/mpt/app/pom.xml @@ -42,19 +42,9 @@ interfaces to the MPT library.</description> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mpt-core</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </dependency> - <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> </dependency> diff --git a/mpt/core/pom.xml b/mpt/core/pom.xml index 5d6dd28..82d0403 100644 --- a/mpt/core/pom.xml +++ b/mpt/core/pom.xml @@ -38,15 +38,6 @@ <dependency> <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -57,18 +48,6 @@ <artifactId>awaitility</artifactId> </dependency> <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - </dependency> - <dependency> - <groupId>org.junit.platform</groupId> - <artifactId>junit-platform-launcher</artifactId> - </dependency> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> diff --git a/mpt/impl/imap-mailbox/cassandra/pom.xml b/mpt/impl/imap-mailbox/cassandra/pom.xml index 0ec862b..c88c883 100644 --- a/mpt/impl/imap-mailbox/cassandra/pom.xml +++ b/mpt/impl/imap-mailbox/cassandra/pom.xml @@ -70,6 +70,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + </dependency> + <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> <scope>test</scope> diff --git a/mpt/impl/imap-mailbox/core/pom.xml b/mpt/impl/imap-mailbox/core/pom.xml index 36b389b..6b6bd0f 100644 --- a/mpt/impl/imap-mailbox/core/pom.xml +++ b/mpt/impl/imap-mailbox/core/pom.xml @@ -59,23 +59,6 @@ <dependency> <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - </dependency> - <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> </dependency> <dependency> <groupId>${james.protocols.groupId}</groupId> diff --git a/mpt/impl/imap-mailbox/cyrus/pom.xml b/mpt/impl/imap-mailbox/cyrus/pom.xml index 8011b42..b41d420 100644 --- a/mpt/impl/imap-mailbox/cyrus/pom.xml +++ b/mpt/impl/imap-mailbox/cyrus/pom.xml @@ -45,6 +45,10 @@ <artifactId>awaitility</artifactId> </dependency> <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + </dependency> + <dependency> <groupId>com.spotify</groupId> <artifactId>docker-client</artifactId> <version>8.16.0</version> diff --git a/mpt/impl/imap-mailbox/external-james/pom.xml b/mpt/impl/imap-mailbox/external-james/pom.xml index b74d7e3..ffdf24a 100644 --- a/mpt/impl/imap-mailbox/external-james/pom.xml +++ b/mpt/impl/imap-mailbox/external-james/pom.xml @@ -45,10 +45,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>metrics-logger</artifactId> - </dependency> - <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> </dependency> @@ -57,14 +53,6 @@ <artifactId>guice</artifactId> </dependency> <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> diff --git a/mpt/impl/managesieve/core/pom.xml b/mpt/impl/managesieve/core/pom.xml index 6ff6bc3..f2008ce 100644 --- a/mpt/impl/managesieve/core/pom.xml +++ b/mpt/impl/managesieve/core/pom.xml @@ -44,10 +44,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - </dependency> - <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> </dependency> diff --git a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml index 858dfa0..da52df0 100644 --- a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml +++ b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml @@ -52,12 +52,26 @@ <artifactId>blob-objectstorage</artifactId> <type>test-jar</type> <scope>test</scope> + <!-- JCloud switch relies on incompatible guice 3.3.0 for multibindings --> + <exclusions> + <exclusion> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>blob-objectstorage-guice</artifactId> <type>test-jar</type> <scope>test</scope> + <!-- JCloud switch relies on incompatible guice 3.3.0 for multibindings --> + <exclusions> + <exclusion> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${james.groupId}</groupId> @@ -100,5 +114,9 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + </dependency> </dependencies> </project> \ No newline at end of file diff --git a/mpt/impl/smtp/cassandra/pom.xml b/mpt/impl/smtp/cassandra/pom.xml index 3bbb64a..df09731 100644 --- a/mpt/impl/smtp/cassandra/pom.xml +++ b/mpt/impl/smtp/cassandra/pom.xml @@ -39,10 +39,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mpt-core</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>apache-james-mpt-smtp-core</artifactId> </dependency> <dependency> diff --git a/mpt/impl/smtp/core/pom.xml b/mpt/impl/smtp/core/pom.xml index 4727f38..7bdb785 100644 --- a/mpt/impl/smtp/core/pom.xml +++ b/mpt/impl/smtp/core/pom.xml @@ -37,10 +37,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-data-api</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-dnsservice-api</artifactId> </dependency> <dependency> @@ -61,11 +57,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-util</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> @@ -74,14 +65,6 @@ <artifactId>rest-assured</artifactId> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - </dependency> - <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> </dependency> diff --git a/mpt/mavenplugin/pom.xml b/mpt/mavenplugin/pom.xml index 6cdab01..67f472d 100644 --- a/mpt/mavenplugin/pom.xml +++ b/mpt/mavenplugin/pom.xml @@ -42,17 +42,6 @@ to the library requiring no extra coding.</description> <artifactId>apache-james-mpt-core</artifactId> </dependency> <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mpt-core</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>testing-base</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> </dependency> diff --git a/mpt/pom.xml b/mpt/pom.xml index a73ddbd..b4292e0 100644 --- a/mpt/pom.xml +++ b/mpt/pom.xml @@ -55,7 +55,6 @@ <felix.plugin.version>3.3.0</felix.plugin.version> <commons-lang.version>2.6</commons-lang.version> <derby.version>10.14.2.0</derby.version> - <guice.version>4.0</guice.version> <lucene-core.version>3.6.0</lucene-core.version> <slf4j.version>1.7.25</slf4j.version> </properties> diff --git a/pom.xml b/pom.xml index 4bb8902..fa4fa1d 100644 --- a/pom.xml +++ b/pom.xml @@ -1964,6 +1964,16 @@ <version>1.2.0</version> </dependency> <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + <version>2.3.0.1</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>${jaxb.version}</version> + </dependency> + <dependency> <groupId>javax.activation</groupId> <artifactId>javax.activation-api</artifactId> <version>1.2.0</version> @@ -1980,16 +1990,6 @@ </exclusions> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - <version>2.3.0.1</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>${jaxb.version}</version> - </dependency> - <dependency> <groupId>com.thoughtworks.qdox</groupId> <artifactId>qdox</artifactId> <version>${qdox.version}</version> diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml index 2a33c46..000e30b 100644 --- a/protocols/imap/pom.xml +++ b/protocols/imap/pom.xml @@ -90,11 +90,6 @@ <artifactId>commons-lang3</artifactId> </dependency> <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-guava</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> diff --git a/protocols/managesieve/pom.xml b/protocols/managesieve/pom.xml index dcb42ac..c45fb1e 100644 --- a/protocols/managesieve/pom.xml +++ b/protocols/managesieve/pom.xml @@ -58,11 +58,6 @@ <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/server/blob/blob-api/pom.xml b/server/blob/blob-api/pom.xml index c004baf..f4ebecc 100644 --- a/server/blob/blob-api/pom.xml +++ b/server/blob/blob-api/pom.xml @@ -70,5 +70,4 @@ <scope>test</scope> </dependency> </dependencies> - </project> diff --git a/server/blob/blob-export-api/pom.xml b/server/blob/blob-export-api/pom.xml index 5113b94..335540d 100644 --- a/server/blob/blob-export-api/pom.xml +++ b/server/blob/blob-export-api/pom.xml @@ -35,10 +35,6 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-api</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>blob-api</artifactId> </dependency> <dependency> @@ -49,6 +45,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-core</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> diff --git a/server/container/cli-integration/pom.xml b/server/container/cli-integration/pom.xml index 2fc1b12..5fdaaed 100644 --- a/server/container/cli-integration/pom.xml +++ b/server/container/cli-integration/pom.xml @@ -72,10 +72,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.github.fge</groupId> - <artifactId>throwing-lambdas</artifactId> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> </dependency> diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml index 7c48386..fdcb290 100644 --- a/server/container/core/pom.xml +++ b/server/container/core/pom.xml @@ -78,12 +78,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>javax-mail-extension</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> @@ -101,12 +95,12 @@ <artifactId>javax.mail</artifactId> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </dependency> <dependency> <groupId>pl.pragmatists</groupId> diff --git a/server/container/filesystem-api/pom.xml b/server/container/filesystem-api/pom.xml index 69e4337..4a978c4 100644 --- a/server/container/filesystem-api/pom.xml +++ b/server/container/filesystem-api/pom.xml @@ -48,10 +48,6 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - </dependency> - <dependency> <groupId>pl.pragmatists</groupId> <artifactId>JUnitParams</artifactId> <scope>test</scope> diff --git a/server/container/guice/activemq/pom.xml b/server/container/guice/activemq/pom.xml index 98c5a22..d3f7df5 100644 --- a/server/container/guice/activemq/pom.xml +++ b/server/container/guice/activemq/pom.xml @@ -34,10 +34,6 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-configuration</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-queue-activemq</artifactId> </dependency> <dependency> diff --git a/server/container/guice/blob-api-guice/pom.xml b/server/container/guice/blob-api-guice/pom.xml index c1516ac..9efbdfb 100644 --- a/server/container/guice/blob-api-guice/pom.xml +++ b/server/container/guice/blob-api-guice/pom.xml @@ -40,8 +40,8 @@ <artifactId>blob-api</artifactId> </dependency> <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-common</artifactId> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> diff --git a/server/container/guice/blob-export-guice/pom.xml b/server/container/guice/blob-export-guice/pom.xml index f79be7a..2077277 100644 --- a/server/container/guice/blob-export-guice/pom.xml +++ b/server/container/guice/blob-export-guice/pom.xml @@ -58,7 +58,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-common</artifactId> + <artifactId>james-server-guice-configuration</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> diff --git a/server/container/guice/blob-memory-guice/pom.xml b/server/container/guice/blob-memory-guice/pom.xml index bdb04cb..b250197 100644 --- a/server/container/guice/blob-memory-guice/pom.xml +++ b/server/container/guice/blob-memory-guice/pom.xml @@ -44,8 +44,8 @@ <artifactId>blob-memory</artifactId> </dependency> <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-common</artifactId> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> diff --git a/server/container/guice/blob-objectstorage-guice/pom.xml b/server/container/guice/blob-objectstorage-guice/pom.xml index 55f0c93..cc031dc 100644 --- a/server/container/guice/blob-objectstorage-guice/pom.xml +++ b/server/container/guice/blob-objectstorage-guice/pom.xml @@ -52,7 +52,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-common</artifactId> + <artifactId>james-server-guice-configuration</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml index 1dd7ba3..6279769 100644 --- a/server/container/guice/cassandra-guice/pom.xml +++ b/server/container/guice/cassandra-guice/pom.xml @@ -178,6 +178,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-mailbox</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-mailbox-plugin-spamassassin</artifactId> </dependency> <dependency> @@ -240,22 +244,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-task</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-task-json</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-task-json</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-testing</artifactId> <scope>test</scope> </dependency> @@ -265,12 +253,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-util</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-webadmin-core</artifactId> <type>test-jar</type> <scope>test</scope> diff --git a/server/container/guice/cassandra-rabbitmq-guice/pom.xml b/server/container/guice/cassandra-rabbitmq-guice/pom.xml index 55fb205..c35cc74 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/pom.xml +++ b/server/container/guice/cassandra-rabbitmq-guice/pom.xml @@ -90,16 +90,37 @@ <artifactId>blob-objectstorage</artifactId> <type>test-jar</type> <scope>test</scope> + <!-- JCloud switch relies on incompatible guice 3.3.0 for multibindings --> + <exclusions> + <exclusion> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>blob-objectstorage-guice</artifactId> + <!-- JCloud switch relies on incompatible guice 3.3.0 for multibindings --> + <exclusions> + <exclusion> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>blob-objectstorage-guice</artifactId> <type>test-jar</type> <scope>test</scope> + <!-- JCloud switch relies on incompatible guice 3.3.0 for multibindings --> + <exclusions> + <exclusion> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${james.groupId}</groupId> diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml index 822f9da..955d20a 100644 --- a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml +++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml @@ -54,12 +54,26 @@ <artifactId>blob-objectstorage</artifactId> <type>test-jar</type> <scope>test</scope> + <!-- JCloud switch relies on incompatible guice 3.3.0 for multibindings --> + <exclusions> + <exclusion> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>blob-objectstorage-guice</artifactId> <type>test-jar</type> <scope>test</scope> + <!-- JCloud switch relies on incompatible guice 3.3.0 for multibindings --> + <exclusions> + <exclusion> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${james.groupId}</groupId> diff --git a/server/container/guice/es-metric-reporter/pom.xml b/server/container/guice/es-metric-reporter/pom.xml index 34e531f..96a75e6 100644 --- a/server/container/guice/es-metric-reporter/pom.xml +++ b/server/container/guice/es-metric-reporter/pom.xml @@ -37,7 +37,7 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-common</artifactId> + <artifactId>james-server-guice-configuration</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml index ed7fba5..8b8a84c 100644 --- a/server/container/guice/guice-common/pom.xml +++ b/server/container/guice/guice-common/pom.xml @@ -34,11 +34,6 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-core</artifactId> </dependency> <dependency> @@ -63,10 +58,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-dnsservice-library</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-filesystem-api</artifactId> </dependency> <dependency> @@ -103,24 +94,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-webadmin</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-mailet-dkim</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-mailets</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-mailrepository-memory</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-onami</artifactId> </dependency> <dependency> @@ -129,10 +102,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-protocols-smtp</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-queue-api</artifactId> </dependency> <dependency> @@ -167,24 +136,6 @@ <artifactId>guice</artifactId> </dependency> <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> - <dependency> - <groupId>io.rest-assured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/MailetProcessingModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/MailetProcessingModule.java index 507549a..02cdd69 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/MailetProcessingModule.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/MailetProcessingModule.java @@ -20,7 +20,6 @@ package org.apache.james.modules; import org.apache.james.modules.server.CamelMailetContainerModule; import org.apache.james.modules.server.MailStoreRepositoryModule; -import org.apache.james.modules.server.SieveModule; import com.google.inject.AbstractModule; @@ -28,7 +27,6 @@ public class MailetProcessingModule extends AbstractModule { @Override protected void configure() { - install(new SieveModule()); install(new MailStoreRepositoryModule()); install(new CamelMailetContainerModule()); } diff --git a/server/container/guice/jpa-guice/pom.xml b/server/container/guice/jpa-guice/pom.xml index ef8def1..84d47f7 100644 --- a/server/container/guice/jpa-guice/pom.xml +++ b/server/container/guice/jpa-guice/pom.xml @@ -71,6 +71,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-mailbox</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-common</artifactId> <type>test-jar</type> <scope>test</scope> @@ -85,10 +89,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-jmap-draft</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-jmx</artifactId> </dependency> <dependency> @@ -147,6 +147,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-mailets</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-testing</artifactId> <scope>test</scope> </dependency> diff --git a/server/container/guice/jpa-smtp-mariadb/pom.xml b/server/container/guice/jpa-smtp-mariadb/pom.xml index f0910fa..1bc50cd 100644 --- a/server/container/guice/jpa-smtp-mariadb/pom.xml +++ b/server/container/guice/jpa-smtp-mariadb/pom.xml @@ -58,6 +58,14 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-mailets</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-mailets</artifactId> + </dependency> + <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <scope>test</scope> diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/container/guice/jpa-smtp/pom.xml index 4944cd3..a2cd4a4 100644 --- a/server/container/guice/jpa-smtp/pom.xml +++ b/server/container/guice/jpa-smtp/pom.xml @@ -72,6 +72,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-mailets</artifactId> + </dependency> + <dependency> <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> 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 896ef53..0ae9efc 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 @@ -39,7 +39,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-common</artifactId> + <artifactId>james-server-guice-configuration</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> diff --git a/server/container/guice/mailet/pom.xml b/server/container/guice/mailet/pom.xml index 8dc163d..38d33cc 100644 --- a/server/container/guice/mailet/pom.xml +++ b/server/container/guice/mailet/pom.xml @@ -73,10 +73,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.github.fge</groupId> - <artifactId>throwing-lambdas</artifactId> - </dependency> - <dependency> <groupId>com.github.steveash.guavate</groupId> <artifactId>guavate</artifactId> </dependency> diff --git a/server/container/guice/memory-guice/pom.xml b/server/container/guice/memory-guice/pom.xml index 88c5830..133a0fd 100644 --- a/server/container/guice/memory-guice/pom.xml +++ b/server/container/guice/memory-guice/pom.xml @@ -61,12 +61,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-base</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>apache-mailet-icalendar</artifactId> <version>${project.version}</version> </dependency> @@ -170,10 +164,22 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-mailbox</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-server-guice-mailet</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-mailbox-plugin-deleted-messages-vault-guice</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-mailets</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-mailrepository-memory</artifactId> </dependency> <dependency> diff --git a/server/container/guice/protocols/imap/pom.xml b/server/container/guice/protocols/imap/pom.xml index 416e99f..b495c3e 100644 --- a/server/container/guice/protocols/imap/pom.xml +++ b/server/container/guice/protocols/imap/pom.xml @@ -38,10 +38,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-mailbox</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-protocols-imap4</artifactId> </dependency> <dependency> diff --git a/server/container/guice/protocols/jmap-draft/pom.xml b/server/container/guice/protocols/jmap-draft/pom.xml index 27a8f6f..dc5156f 100644 --- a/server/container/guice/protocols/jmap-draft/pom.xml +++ b/server/container/guice/protocols/jmap-draft/pom.xml @@ -43,10 +43,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mailbox-store</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-common</artifactId> </dependency> <dependency> diff --git a/server/container/guice/protocols/managedsieve/pom.xml b/server/container/guice/protocols/managedsieve/pom.xml index c8247cc..3d7ead0 100644 --- a/server/container/guice/protocols/managedsieve/pom.xml +++ b/server/container/guice/protocols/managedsieve/pom.xml @@ -34,10 +34,6 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mailbox-store</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-configuration</artifactId> </dependency> <dependency> diff --git a/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/ManageSieveServerModule.java b/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/ManageSieveServerModule.java index cc9d80f..313f6bf 100644 --- a/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/ManageSieveServerModule.java +++ b/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/ManageSieveServerModule.java @@ -36,6 +36,7 @@ public class ManageSieveServerModule extends AbstractModule { @Override protected void configure() { + install(new SieveModule()); bind(CoreCommands.class).to(CoreProcessor.class); Multibinder.newSetBinder(binder(), InitialisationOperation.class).addBinding().to(ManageSieveModuleInitialisationOperation.class); Multibinder.newSetBinder(binder(), GuiceProbe.class).addBinding().to(SieveProbeImpl.class); diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/MailetProcessingModule.java b/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveModule.java similarity index 75% copy from server/container/guice/guice-common/src/main/java/org/apache/james/modules/MailetProcessingModule.java copy to server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveModule.java index 507549a..6badb99 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/MailetProcessingModule.java +++ b/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveModule.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.modules; -import org.apache.james.modules.server.CamelMailetContainerModule; -import org.apache.james.modules.server.MailStoreRepositoryModule; -import org.apache.james.modules.server.SieveModule; +package org.apache.james.modules.protocols; + +import org.apache.james.managesieve.api.SieveParser; +import org.apache.james.managesieve.jsieve.Parser; import com.google.inject.AbstractModule; +import com.google.inject.Scopes; -public class MailetProcessingModule extends AbstractModule { +public class SieveModule extends AbstractModule { @Override protected void configure() { - install(new SieveModule()); - install(new MailStoreRepositoryModule()); - install(new CamelMailetContainerModule()); + bind(Parser.class).in(Scopes.SINGLETON); + bind(SieveParser.class).to(Parser.class); } - + } diff --git a/server/container/guice/protocols/netty/pom.xml b/server/container/guice/protocols/netty/pom.xml index 76c0061..5902f0d 100644 --- a/server/container/guice/protocols/netty/pom.xml +++ b/server/container/guice/protocols/netty/pom.xml @@ -33,10 +33,6 @@ <dependencies> <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-configuration</artifactId> - </dependency> - <dependency> <groupId>${james.groupId}.protocols</groupId> <artifactId>protocols-netty</artifactId> </dependency> diff --git a/server/container/guice/protocols/webadmin-cassandra-data/pom.xml b/server/container/guice/protocols/webadmin-cassandra-data/pom.xml index 06e3602..164eebe 100644 --- a/server/container/guice/protocols/webadmin-cassandra-data/pom.xml +++ b/server/container/guice/protocols/webadmin-cassandra-data/pom.xml @@ -35,10 +35,6 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-configuration</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-webadmin-cassandra-data</artifactId> </dependency> <dependency> diff --git a/server/container/guice/protocols/webadmin-cassandra/pom.xml b/server/container/guice/protocols/webadmin-cassandra/pom.xml index 492499b..55d0760 100644 --- a/server/container/guice/protocols/webadmin-cassandra/pom.xml +++ b/server/container/guice/protocols/webadmin-cassandra/pom.xml @@ -34,10 +34,6 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-configuration</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-webadmin-cassandra</artifactId> </dependency> <dependency> diff --git a/server/container/guice/protocols/webadmin-data/pom.xml b/server/container/guice/protocols/webadmin-data/pom.xml index 94fa530..bb802b2 100644 --- a/server/container/guice/protocols/webadmin-data/pom.xml +++ b/server/container/guice/protocols/webadmin-data/pom.xml @@ -34,10 +34,6 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-configuration</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-webadmin-core</artifactId> </dependency> <dependency> diff --git a/server/container/guice/protocols/webadmin-mailbox/pom.xml b/server/container/guice/protocols/webadmin-mailbox/pom.xml index 6668c66..ec479d4 100644 --- a/server/container/guice/protocols/webadmin-mailbox/pom.xml +++ b/server/container/guice/protocols/webadmin-mailbox/pom.xml @@ -34,10 +34,6 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-configuration</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-webadmin-core</artifactId> </dependency> <dependency> diff --git a/server/container/guice/protocols/webadmin-mailqueue/pom.xml b/server/container/guice/protocols/webadmin-mailqueue/pom.xml index 1a2d3b5..36db02e 100644 --- a/server/container/guice/protocols/webadmin-mailqueue/pom.xml +++ b/server/container/guice/protocols/webadmin-mailqueue/pom.xml @@ -36,10 +36,6 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-configuration</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-webadmin-core</artifactId> </dependency> <dependency> diff --git a/server/container/guice/protocols/webadmin-mailrepository/pom.xml b/server/container/guice/protocols/webadmin-mailrepository/pom.xml index 00f2449..88fa446 100644 --- a/server/container/guice/protocols/webadmin-mailrepository/pom.xml +++ b/server/container/guice/protocols/webadmin-mailrepository/pom.xml @@ -36,10 +36,6 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-configuration</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-webadmin-core</artifactId> </dependency> <dependency> diff --git a/server/container/guice/protocols/webadmin-swagger/pom.xml b/server/container/guice/protocols/webadmin-swagger/pom.xml index c42198b..69c254f 100644 --- a/server/container/guice/protocols/webadmin-swagger/pom.xml +++ b/server/container/guice/protocols/webadmin-swagger/pom.xml @@ -34,10 +34,6 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-configuration</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-webadmin-core</artifactId> </dependency> <dependency> diff --git a/server/container/jetty/pom.xml b/server/container/jetty/pom.xml index 225079a..5c80c03 100644 --- a/server/container/jetty/pom.xml +++ b/server/container/jetty/pom.xml @@ -35,10 +35,6 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-core</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-core</artifactId> <scope>test</scope> </dependency> @@ -52,10 +48,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.github.fge</groupId> - <artifactId>throwing-lambdas</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> @@ -74,10 +66,6 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> </dependency> <dependency> diff --git a/server/container/lifecycle-api/pom.xml b/server/container/lifecycle-api/pom.xml index 790fbb0..9f020e4 100644 --- a/server/container/lifecycle-api/pom.xml +++ b/server/container/lifecycle-api/pom.xml @@ -43,10 +43,6 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-configuration2</artifactId> </dependency> diff --git a/server/container/mailbox-adapter/pom.xml b/server/container/mailbox-adapter/pom.xml index 616161d..bacc97d 100644 --- a/server/container/mailbox-adapter/pom.xml +++ b/server/container/mailbox-adapter/pom.xml @@ -53,18 +53,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-util</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> diff --git a/server/container/util/pom.xml b/server/container/util/pom.xml index 74c8ff6..fb1024c 100644 --- a/server/container/util/pom.xml +++ b/server/container/util/pom.xml @@ -97,12 +97,6 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - <dependency> - <groupId>backport-util-concurrent</groupId> - <artifactId>backport-util-concurrent</artifactId> - <version>3.1</version> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/server/data/data-api/pom.xml b/server/data/data-api/pom.xml index 60d16f3..6a8d947 100644 --- a/server/data/data-api/pom.xml +++ b/server/data/data-api/pom.xml @@ -34,11 +34,6 @@ <dependencies> <dependency> - <!-- only used by JamesUser (for MailAddress) --> - <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-api</artifactId> - </dependency> - <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-core</artifactId> </dependency> diff --git a/server/data/data-cassandra/pom.xml b/server/data/data-cassandra/pom.xml index e08f1be..6dbafcb 100644 --- a/server/data/data-cassandra/pom.xml +++ b/server/data/data-cassandra/pom.xml @@ -82,10 +82,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> diff --git a/server/data/data-jmap/pom.xml b/server/data/data-jmap/pom.xml index d96f7bb..249ae81 100644 --- a/server/data/data-jmap/pom.xml +++ b/server/data/data-jmap/pom.xml @@ -35,7 +35,7 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-data-api</artifactId> + <artifactId>james-core</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml index 3e5171e..bf78bb3 100644 --- a/server/data/data-jpa/pom.xml +++ b/server/data/data-jpa/pom.xml @@ -95,11 +95,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>io.cucumber</groupId> <artifactId>cucumber-java</artifactId> <scope>test</scope> diff --git a/server/data/data-library/pom.xml b/server/data/data-library/pom.xml index 785f764..eba8fc6 100644 --- a/server/data/data-library/pom.xml +++ b/server/data/data-library/pom.xml @@ -43,11 +43,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-data-api</artifactId> </dependency> <dependency> @@ -113,11 +108,6 @@ <artifactId>javax.inject</artifactId> </dependency> <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-guava</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> diff --git a/server/data/data-memory/pom.xml b/server/data/data-memory/pom.xml index d3cb268..f4805f5 100644 --- a/server/data/data-memory/pom.xml +++ b/server/data/data-memory/pom.xml @@ -45,6 +45,11 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-data-api</artifactId> </dependency> <dependency> diff --git a/server/dns-service/dnsservice-api/pom.xml b/server/dns-service/dnsservice-api/pom.xml index 4b78c20..9b0820a 100644 --- a/server/dns-service/dnsservice-api/pom.xml +++ b/server/dns-service/dnsservice-api/pom.xml @@ -32,19 +32,6 @@ <name>Apache James :: Server :: DNS Service :: API</name> - <dependencies> - - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>testing-base</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - </dependencies> - <build> <plugins> <plugin> diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml index 2e445a8..8549f10 100644 --- a/server/mailet/integration-testing/pom.xml +++ b/server/mailet/integration-testing/pom.xml @@ -50,10 +50,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-data-memory</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-dnsservice-test</artifactId> <scope>test</scope> </dependency> @@ -76,10 +72,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-mailetcontainer-camel</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-mailets</artifactId> </dependency> <dependency> @@ -97,18 +89,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>javax-mail-extension</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-util</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-webadmin-core</artifactId> <type>test-jar</type> <scope>test</scope> diff --git a/server/mailet/mailetcontainer-camel/pom.xml b/server/mailet/mailetcontainer-camel/pom.xml index 52ca00d..6fd3b23 100644 --- a/server/mailet/mailetcontainer-camel/pom.xml +++ b/server/mailet/mailetcontainer-camel/pom.xml @@ -44,11 +44,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-standard</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-core</artifactId> </dependency> <dependency> @@ -92,12 +87,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>javax-mail-extension</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>metrics-api</artifactId> </dependency> <dependency> @@ -122,10 +111,6 @@ <artifactId>jaxb-impl</artifactId> </dependency> <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> </dependency> diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml index 8422241..8ac7d06 100644 --- a/server/mailet/mailets/pom.xml +++ b/server/mailet/mailets/pom.xml @@ -61,12 +61,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mailbox-store</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>apache-james-spamassassin</artifactId> </dependency> <dependency> @@ -87,12 +81,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-base</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>apache-mailet-standard</artifactId> <scope>compile</scope> </dependency> @@ -183,12 +171,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>javax-mail-extension</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>metrics-api</artifactId> </dependency> <dependency> @@ -227,16 +209,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>${james.protocols.groupId}</groupId> - <artifactId>protocols-smtp</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-guava</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.hamcrest</groupId> <artifactId>java-hamcrest</artifactId> <scope>test</scope> diff --git a/server/mailrepository/mailrepository-api/pom.xml b/server/mailrepository/mailrepository-api/pom.xml index ad68993..4876cde 100644 --- a/server/mailrepository/mailrepository-api/pom.xml +++ b/server/mailrepository/mailrepository-api/pom.xml @@ -39,12 +39,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-base</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-core</artifactId> <scope>test</scope> </dependency> diff --git a/server/mailrepository/mailrepository-memory/pom.xml b/server/mailrepository/mailrepository-memory/pom.xml index 4bbf286..fa09f08 100644 --- a/server/mailrepository/mailrepository-memory/pom.xml +++ b/server/mailrepository/mailrepository-memory/pom.xml @@ -35,15 +35,6 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-core</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-testing</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-mailrepository-api</artifactId> </dependency> <dependency> 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 b4398fe..ee1a549 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 @@ -107,12 +107,26 @@ <artifactId>blob-objectstorage</artifactId> <type>test-jar</type> <scope>test</scope> + <!-- JCloud switch relies on incompatible guice 3.3.0 for multibindings --> + <exclusions> + <exclusion> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>blob-objectstorage-guice</artifactId> <type>test-jar</type> <scope>test</scope> + <!-- JCloud switch relies on incompatible guice 3.3.0 for multibindings --> + <exclusions> + <exclusion> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${james.groupId}</groupId> 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 66a17ac..e96d995 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 @@ -56,12 +56,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-base</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>backup</artifactId> <scope>test</scope> <type>test-jar</type> @@ -120,13 +114,12 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-testing</artifactId> + <artifactId>james-server-mailets</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-util</artifactId> - <type>test-jar</type> + <artifactId>james-server-testing</artifactId> <scope>test</scope> </dependency> <dependency> @@ -136,12 +129,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>javax-mail-extension</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> @@ -183,6 +170,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.javatuples</groupId> + <artifactId>javatuples</artifactId> + <version>1.2</version> + </dependency> + <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> <scope>test</scope> 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 fbddba7..edf56b3 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 @@ -61,12 +61,26 @@ <artifactId>blob-objectstorage</artifactId> <type>test-jar</type> <scope>test</scope> + <!-- JCloud switch relies on incompatible guice 3.3.0 for multibindings --> + <exclusions> + <exclusion> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>blob-objectstorage-guice</artifactId> <type>test-jar</type> <scope>test</scope> + <!-- JCloud switch relies on incompatible guice 3.3.0 for multibindings --> + <exclusions> + <exclusion> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${james.groupId}</groupId> diff --git a/server/protocols/jmap-draft/pom.xml b/server/protocols/jmap-draft/pom.xml index 5f9b763..c5734e8 100644 --- a/server/protocols/jmap-draft/pom.xml +++ b/server/protocols/jmap-draft/pom.xml @@ -60,11 +60,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mailbox-tika</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>apache-mailet-test</artifactId> <scope>test</scope> </dependency> @@ -99,17 +94,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-data-memory</artifactId> <scope>test</scope> </dependency> @@ -152,12 +136,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>javax-mail-extension</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>metrics-api</artifactId> </dependency> <dependency> @@ -241,29 +219,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.javatuples</groupId> - <artifactId>javatuples</artifactId> - <version>1.2</version> - </dependency> - <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-params</artifactId> <scope>test</scope> diff --git a/server/protocols/protocols-imap4/pom.xml b/server/protocols/protocols-imap4/pom.xml index d5fa903..521e0d9 100644 --- a/server/protocols/protocols-imap4/pom.xml +++ b/server/protocols/protocols-imap4/pom.xml @@ -51,11 +51,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>metrics-logger</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> @@ -68,10 +63,6 @@ <artifactId>netty</artifactId> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - </dependency> - <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> diff --git a/server/protocols/protocols-lmtp/pom.xml b/server/protocols/protocols-lmtp/pom.xml index ada4b54..68fbe03 100644 --- a/server/protocols/protocols-lmtp/pom.xml +++ b/server/protocols/protocols-lmtp/pom.xml @@ -43,18 +43,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-core</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-data-api</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-protocols-library</artifactId> </dependency> <dependency> @@ -85,18 +77,10 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> - </dependency> - <dependency> <groupId>io.netty</groupId> <artifactId>netty</artifactId> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - </dependency> - <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> diff --git a/server/protocols/protocols-managesieve/pom.xml b/server/protocols/protocols-managesieve/pom.xml index c64ddec..dfab5b9 100644 --- a/server/protocols/protocols-managesieve/pom.xml +++ b/server/protocols/protocols-managesieve/pom.xml @@ -27,10 +27,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> <groupId>io.netty</groupId> <artifactId>netty</artifactId> </dependency> diff --git a/server/protocols/protocols-pop3/pom.xml b/server/protocols/protocols-pop3/pom.xml index c02c5ec..c0a384b 100644 --- a/server/protocols/protocols-pop3/pom.xml +++ b/server/protocols/protocols-pop3/pom.xml @@ -65,17 +65,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-data-memory</artifactId> <scope>test</scope> </dependency> @@ -105,10 +94,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> - </dependency> - <dependency> <groupId>commons-net</groupId> <artifactId>commons-net</artifactId> <scope>test</scope> @@ -118,10 +103,6 @@ <artifactId>netty</artifactId> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - </dependency> - <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml index 4731b0a..88eae80 100644 --- a/server/protocols/protocols-smtp/pom.xml +++ b/server/protocols/protocols-smtp/pom.xml @@ -44,22 +44,11 @@ <scope>test</scope> </dependency> <dependency> - <groupId>${javax.activation.groupId}</groupId> - <artifactId>${javax.activation.artifactId}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>${james.groupId}</groupId> <artifactId>apache-mailet-api</artifactId> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-base</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-core</artifactId> </dependency> <dependency> @@ -68,12 +57,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-data-api</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-data-memory</artifactId> <scope>test</scope> </dependency> @@ -96,12 +79,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-lifecycle-api</artifactId> </dependency> <dependency> @@ -130,12 +107,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-queue-api</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-testing</artifactId> <scope>test</scope> </dependency> @@ -171,10 +142,6 @@ <artifactId>netty</artifactId> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - </dependency> - <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> diff --git a/server/protocols/webadmin/webadmin-cassandra-data/pom.xml b/server/protocols/webadmin/webadmin-cassandra-data/pom.xml index f158211..8b3de92 100644 --- a/server/protocols/webadmin/webadmin-cassandra-data/pom.xml +++ b/server/protocols/webadmin/webadmin-cassandra-data/pom.xml @@ -64,11 +64,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>metrics-logger</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> diff --git a/server/protocols/webadmin/webadmin-cassandra/pom.xml b/server/protocols/webadmin/webadmin-cassandra/pom.xml index f084748..40350ac 100644 --- a/server/protocols/webadmin/webadmin-cassandra/pom.xml +++ b/server/protocols/webadmin/webadmin-cassandra/pom.xml @@ -49,11 +49,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>metrics-logger</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml index fbd8c1b..c85dcf6 100644 --- a/server/protocols/webadmin/webadmin-core/pom.xml +++ b/server/protocols/webadmin/webadmin-core/pom.xml @@ -55,11 +55,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>metrics-logger</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-task</artifactId> </dependency> <dependency> @@ -84,10 +79,6 @@ <artifactId>jackson-datatype-guava</artifactId> </dependency> <dependency> - <groupId>com.github.fge</groupId> - <artifactId>throwing-lambdas</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml index 09ebdae..30b0527 100644 --- a/server/protocols/webadmin/webadmin-data/pom.xml +++ b/server/protocols/webadmin/webadmin-data/pom.xml @@ -80,19 +80,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>metrics-logger</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-guava</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> 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 078bdd2..7a032a3 100644 --- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/pom.xml +++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/pom.xml @@ -84,12 +84,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-core</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-data-api</artifactId> </dependency> <dependency> @@ -109,11 +103,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>metrics-logger</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> @@ -137,11 +126,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>java-hamcrest</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml index e96a319..e763c7b 100644 --- a/server/protocols/webadmin/webadmin-mailbox/pom.xml +++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml @@ -101,12 +101,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-core</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-data-api</artifactId> </dependency> <dependency> @@ -139,11 +133,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>metrics-logger</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> diff --git a/server/protocols/webadmin/webadmin-mailrepository/pom.xml b/server/protocols/webadmin/webadmin-mailrepository/pom.xml index 9f873e2..599d199 100644 --- a/server/protocols/webadmin/webadmin-mailrepository/pom.xml +++ b/server/protocols/webadmin/webadmin-mailrepository/pom.xml @@ -85,12 +85,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>javax-mail-extension</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> diff --git a/server/queue/queue-activemq/pom.xml b/server/queue/queue-activemq/pom.xml index c508621..8f977ed 100644 --- a/server/queue/queue-activemq/pom.xml +++ b/server/queue/queue-activemq/pom.xml @@ -39,12 +39,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-base</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-core</artifactId> </dependency> <dependency> @@ -78,12 +72,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>javax-mail-extension</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>metrics-tests</artifactId> <scope>test</scope> </dependency> @@ -93,19 +81,10 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-text</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> </dependency> diff --git a/server/queue/queue-api/pom.xml b/server/queue/queue-api/pom.xml index e1e09bb..81c1abc 100644 --- a/server/queue/queue-api/pom.xml +++ b/server/queue/queue-api/pom.xml @@ -39,32 +39,11 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-base</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-testing</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>javax-mail-extension</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>metrics-api</artifactId> <scope>test</scope> </dependency> diff --git a/server/queue/queue-file/pom.xml b/server/queue/queue-file/pom.xml index d7516ee..07ee0a0 100644 --- a/server/queue/queue-file/pom.xml +++ b/server/queue/queue-file/pom.xml @@ -35,12 +35,6 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-base</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-core</artifactId> </dependency> <dependency> @@ -74,12 +68,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>javax-mail-extension</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml index e7ae99f..80f638d 100644 --- a/server/queue/queue-jms/pom.xml +++ b/server/queue/queue-jms/pom.xml @@ -53,11 +53,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-protocols-smtp</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-queue-api</artifactId> </dependency> <dependency> @@ -73,12 +68,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>javax-mail-extension</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>metrics-api</artifactId> </dependency> <dependency> @@ -87,10 +76,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>${james.protocols.groupId}</groupId> - <artifactId>protocols-smtp</artifactId> - </dependency> - <dependency> <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> @@ -134,9 +119,5 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - <dependency> - <groupId>org.threeten</groupId> - <artifactId>threeten-extra</artifactId> - </dependency> </dependencies> </project> diff --git a/server/queue/queue-memory/pom.xml b/server/queue/queue-memory/pom.xml index 6d52c55..0b4b896 100644 --- a/server/queue/queue-memory/pom.xml +++ b/server/queue/queue-memory/pom.xml @@ -16,9 +16,8 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-base</artifactId> + <artifactId>apache-mailet-test</artifactId> <scope>test</scope> - <type>test-jar</type> </dependency> <dependency> <groupId>${james.groupId}</groupId> @@ -36,18 +35,12 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-testing</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>javax-mail-extension</artifactId> - <type>test-jar</type> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>testing-base</artifactId> + <artifactId>james-server-testing</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/task-distributed/pom.xml b/server/task-distributed/pom.xml index b31671c..9719c9c 100644 --- a/server/task-distributed/pom.xml +++ b/server/task-distributed/pom.xml @@ -54,17 +54,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mailbox-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mailbox-api</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>event-sourcing-event-store-cassandra</artifactId> </dependency> <dependency> @@ -79,6 +68,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-lifecycle-api</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-task</artifactId> </dependency> <dependency> diff --git a/server/task-json/pom.xml b/server/task-json/pom.xml index 2d4e5d2..7159106 100644 --- a/server/task-json/pom.xml +++ b/server/task-json/pom.xml @@ -33,17 +33,6 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mailbox-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mailbox-api</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-json</artifactId> </dependency> <dependency> diff --git a/server/testing/pom.xml b/server/testing/pom.xml index 3827ea7..b0d3e9a 100644 --- a/server/testing/pom.xml +++ b/server/testing/pom.xml @@ -41,13 +41,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-util</artifactId> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -71,23 +65,6 @@ <artifactId>commons-net</artifactId> </dependency> <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - </dependency> - <dependency> - <groupId>org.junit.platform</groupId> - <artifactId>junit-platform-launcher</artifactId> - </dependency> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> </dependency> diff --git a/third-party/spamassassin/pom.xml b/third-party/spamassassin/pom.xml index 03f538f..4268cab 100644 --- a/third-party/spamassassin/pom.xml +++ b/third-party/spamassassin/pom.xml @@ -47,12 +47,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>javax-mail-extension</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>metrics-api</artifactId> </dependency> <dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
