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 f245ae6a75c7f5ed3b6ae161e150bf3c4632ba80 Author: Matthieu Baechler <matth...@apache.org> AuthorDate: Mon Sep 9 10:12:54 2019 +0200 JAMES-2893 group tests dependencies into a base project to avoid repeating deps This will also enable the share of logback-test.xml config between tests projects. With this commit, all projects now depends on logback-classic for test scope --- backends-common/cassandra/pom.xml | 4 +-- backends-common/elasticsearch/pom.xml | 4 +-- backends-common/jpa/pom.xml | 5 ++++ backends-common/rabbitmq/pom.xml | 5 ++++ core/pom.xml | 5 ++++ event-sourcing/event-sourcing-core/pom.xml | 5 ++++ event-sourcing/event-sourcing-pojo/pom.xml | 5 ++++ event-sourcing/event-store-api/pom.xml | 5 ++++ event-sourcing/event-store-cassandra/pom.xml | 4 +-- event-sourcing/event-store-memory/pom.xml | 5 ++++ examples/custom-listeners/pom.xml | 5 ++++ examples/custom-mailets/pom.xml | 5 ++++ javax-mail-extension/pom.xml | 5 ++++ json/pom.xml | 5 ++++ mailbox/api/pom.xml | 4 +-- mailbox/backup/pom.xml | 10 +++---- mailbox/caching/pom.xml | 4 +-- mailbox/cassandra/pom.xml | 4 +-- mailbox/elasticsearch/pom.xml | 4 +-- mailbox/event/event-cassandra/pom.xml | 5 ++++ mailbox/event/event-memory/pom.xml | 5 ++++ mailbox/event/event-rabbitmq/pom.xml | 5 ++++ mailbox/event/json/pom.xml | 5 ++++ mailbox/jpa/pom.xml | 4 +-- mailbox/lucene/pom.xml | 5 ++++ mailbox/maildir/pom.xml | 4 +-- mailbox/memory/pom.xml | 4 +-- .../deleted-messages-vault-cassandra/pom.xml | 5 ++++ mailbox/plugin/deleted-messages-vault/pom.xml | 5 ++++ mailbox/plugin/quota-mailing-cassandra/pom.xml | 4 +-- mailbox/plugin/quota-mailing-memory/pom.xml | 5 ++++ mailbox/plugin/quota-mailing/pom.xml | 5 ++++ mailbox/plugin/quota-search-elasticsearch/pom.xml | 5 ++++ mailbox/plugin/quota-search-scanning/pom.xml | 5 ++++ mailbox/plugin/quota-search/pom.xml | 5 ++++ mailbox/plugin/spamassassin/pom.xml | 5 ++++ mailbox/scanning-search/pom.xml | 4 +-- mailbox/spring/pom.xml | 4 +-- mailbox/store/pom.xml | 4 +-- mailbox/tika/pom.xml | 4 +-- mailbox/tools/copier/pom.xml | 4 +-- mailbox/tools/indexer/pom.xml | 10 +++---- mailbox/tools/jpa-migrator/pom.xml | 5 ++++ mailbox/tools/maildir-utils/pom.xml | 5 ++++ mailbox/zoo-seq-provider/pom.xml | 4 +-- mailet/ai/pom.xml | 5 ++++ mailet/api/pom.xml | 5 ++++ mailet/base/pom.xml | 5 ++++ mailet/crypto/pom.xml | 5 ++++ mailet/icalendar/pom.xml | 4 +-- mailet/mailetdocs-maven-plugin/pom.xml | 5 ++++ mailet/standard/pom.xml | 5 ++++ mailet/test/pom.xml | 5 ++++ mdn/pom.xml | 5 ++++ metrics/metrics-api/pom.xml | 5 ++++ metrics/metrics-dropwizard/pom.xml | 5 ++++ metrics/metrics-logger/pom.xml | 5 ++++ metrics/metrics-tests/pom.xml | 5 ++++ mpt/all/pom.xml | 5 ++++ mpt/antlib/pom.xml | 5 ++++ mpt/app/pom.xml | 4 +++ mpt/core/pom.xml | 5 ++++ mpt/impl/imap-mailbox/cassandra/pom.xml | 5 ++++ mpt/impl/imap-mailbox/core/pom.xml | 5 ++-- mpt/impl/imap-mailbox/cyrus/pom.xml | 5 ++++ mpt/impl/imap-mailbox/elasticsearch/pom.xml | 5 ++++ mpt/impl/imap-mailbox/inmemory/pom.xml | 5 ++++ mpt/impl/imap-mailbox/jpa/pom.xml | 5 ++++ mpt/impl/imap-mailbox/lucenesearch/pom.xml | 5 ++++ mpt/impl/imap-mailbox/maildir/pom.xml | 5 ++++ mpt/impl/imap-mailbox/rabbitmq/pom.xml | 5 ++++ mpt/impl/managesieve/cassandra/pom.xml | 5 ++++ mpt/impl/managesieve/core/pom.xml | 5 ++-- mpt/impl/managesieve/file/pom.xml | 5 ++++ .../smtp/cassandra-rabbitmq-object-storage/pom.xml | 5 ++-- mpt/impl/smtp/cassandra/pom.xml | 5 ++-- mpt/impl/smtp/core/pom.xml | 5 ++++ mpt/mavenplugin/pom.xml | 5 ++++ pom.xml | 10 +++---- protocols/api/pom.xml | 5 ++++ protocols/imap/pom.xml | 4 +-- protocols/lmtp/pom.xml | 4 +-- protocols/managesieve/pom.xml | 5 ++++ protocols/netty/pom.xml | 5 ++++ protocols/pop3/pom.xml | 5 ++-- protocols/smtp/pom.xml | 4 +-- server/app/pom.xml | 5 ++++ server/blob/blob-api/pom.xml | 5 ++++ server/blob/blob-cassandra/pom.xml | 4 +-- server/blob/blob-export-api/pom.xml | 5 ++++ server/blob/blob-export-file/pom.xml | 5 ++++ server/blob/blob-memory/pom.xml | 5 ++++ server/blob/blob-objectstorage/pom.xml | 4 +-- server/blob/blob-union/pom.xml | 5 ++++ server/blob/mail-store/pom.xml | 5 ++++ server/container/cli-integration/pom.xml | 4 +-- server/container/cli/pom.xml | 10 +++---- server/container/core/pom.xml | 5 ++++ server/container/filesystem-api/pom.xml | 5 ++++ server/container/guice/activemq/pom.xml | 5 ++++ server/container/guice/blob-api-guice/pom.xml | 5 ++++ server/container/guice/blob-export-guice/pom.xml | 5 ++++ server/container/guice/blob-memory-guice/pom.xml | 5 ++++ .../guice/blob-objectstorage-guice/pom.xml | 5 ++++ server/container/guice/cassandra-guice/pom.xml | 5 ++++ .../container/guice/cassandra-ldap-guice/pom.xml | 5 ++++ .../guice/cassandra-rabbitmq-guice/pom.xml | 5 ++++ .../guice/cassandra-rabbitmq-ldap-guice/pom.xml | 5 ++++ server/container/guice/configuration/pom.xml | 5 ++++ server/container/guice/custom-mailets/pom.xml | 5 ++++ server/container/guice/es-metric-reporter/pom.xml | 5 ++++ server/container/guice/guice-common/pom.xml | 4 +-- server/container/guice/guice-utils/pom.xml | 5 ++++ server/container/guice/jmx/pom.xml | 5 ++++ server/container/guice/jpa-common-guice/pom.xml | 5 ++++ server/container/guice/jpa-guice/pom.xml | 5 ++++ server/container/guice/jpa-smtp-common/pom.xml | 4 --- server/container/guice/jpa-smtp-mariadb/pom.xml | 5 ++++ server/container/guice/jpa-smtp/pom.xml | 5 ++++ .../pom.xml | 5 ++++ .../guice/mailbox-plugin-spamassassin/pom.xml | 5 ++++ server/container/guice/mailbox/pom.xml | 5 ++++ server/container/guice/mailet/pom.xml | 4 +-- server/container/guice/memory-guice/pom.xml | 5 ++++ server/container/guice/onami/pom.xml | 5 ++++ server/container/guice/protocols/imap/pom.xml | 5 ++++ .../container/guice/protocols/jmap-draft/pom.xml | 5 ++++ server/container/guice/protocols/lmtp/pom.xml | 5 ++++ .../container/guice/protocols/managedsieve/pom.xml | 5 ++++ server/container/guice/protocols/netty/pom.xml | 5 ++++ server/container/guice/protocols/pop/pom.xml | 5 ++++ server/container/guice/protocols/smtp/pom.xml | 5 ++++ .../protocols/webadmin-cassandra-data/pom.xml | 5 ++++ .../guice/protocols/webadmin-cassandra/pom.xml | 5 ++++ .../guice/protocols/webadmin-data/pom.xml | 5 ++++ .../guice/protocols/webadmin-mailbox/pom.xml | 5 ++++ .../guice/protocols/webadmin-mailqueue/pom.xml | 5 ++++ .../protocols/webadmin-mailrepository/pom.xml | 5 ++++ .../guice/protocols/webadmin-swagger/pom.xml | 5 ++++ server/container/guice/protocols/webadmin/pom.xml | 5 ++++ server/container/guice/rabbitmq/pom.xml | 5 ++++ server/container/jetty/pom.xml | 5 ++++ server/container/lifecycle-api/pom.xml | 5 ++++ server/container/mailbox-adapter/pom.xml | 5 ++++ server/container/mailbox-jmx/pom.xml | 6 ++++- .../container/metrics/metrics-es-reporter/pom.xml | 5 ++++ server/container/spring/pom.xml | 5 ++++ server/container/util/pom.xml | 5 ++++ server/data/data-api/pom.xml | 5 ++++ server/data/data-cassandra/pom.xml | 5 ++++ server/data/data-file/pom.xml | 4 +-- server/data/data-jdbc/pom.xml | 4 +-- server/data/data-jmap-cassandra/pom.xml | 4 +-- server/data/data-jmap/pom.xml | 4 +-- server/data/data-jpa/pom.xml | 4 +-- server/data/data-ldap/pom.xml | 4 +-- server/data/data-library/pom.xml | 4 +-- server/data/data-memory/pom.xml | 4 +-- server/dns-service/dnsservice-api/pom.xml | 5 ++++ server/dns-service/dnsservice-dnsjava/pom.xml | 4 +-- server/dns-service/dnsservice-library/pom.xml | 5 ++++ server/dns-service/dnsservice-test/pom.xml | 5 ++++ server/mailet/dkim/pom.xml | 5 ++++ server/mailet/integration-testing/pom.xml | 4 +-- server/mailet/mailetcontainer-api/pom.xml | 5 ++++ server/mailet/mailetcontainer-camel/pom.xml | 4 +-- server/mailet/mailets/pom.xml | 4 +-- server/mailet/mock-smtp-server/pom.xml | 6 ++--- server/mailrepository/mailrepository-api/pom.xml | 5 ++++ .../mailrepository-cassandra/pom.xml | 4 +-- .../mailrepository/mailrepository-memory/pom.xml | 5 ++++ server/protocols/fetchmail/pom.xml | 5 ++++ .../pom.xml | 5 ++++ .../jmap-draft-integration-testing-common/pom.xml | 5 ++++ .../memory-jmap-draft-integration-testing/pom.xml | 4 +-- .../pom.xml | 5 ++++ server/protocols/jmap-draft/pom.xml | 4 +-- server/protocols/jwt/pom.xml | 5 ++++ server/protocols/protocols-imap4/pom.xml | 5 ++++ server/protocols/protocols-library/pom.xml | 5 ++++ server/protocols/protocols-lmtp/pom.xml | 5 ++++ server/protocols/protocols-managesieve/pom.xml | 5 ++++ server/protocols/protocols-pop3/pom.xml | 5 ++++ server/protocols/protocols-smtp/pom.xml | 4 +-- server/protocols/webadmin-integration-test/pom.xml | 4 +-- .../webadmin/webadmin-cassandra-data/pom.xml | 5 ++++ .../protocols/webadmin/webadmin-cassandra/pom.xml | 5 ++++ server/protocols/webadmin/webadmin-core/pom.xml | 4 +-- server/protocols/webadmin/webadmin-data/pom.xml | 4 +-- .../webadmin-mailbox-deleted-message-vault/pom.xml | 4 +-- server/protocols/webadmin/webadmin-mailbox/pom.xml | 4 +-- .../protocols/webadmin/webadmin-mailqueue/pom.xml | 5 ++++ .../webadmin/webadmin-mailrepository/pom.xml | 4 +-- server/protocols/webadmin/webadmin-swagger/pom.xml | 5 ++++ server/queue/queue-activemq/pom.xml | 4 +-- server/queue/queue-api/pom.xml | 5 ++++ server/queue/queue-file/pom.xml | 4 +-- server/queue/queue-jms/pom.xml | 4 +-- server/queue/queue-memory/pom.xml | 4 +-- server/queue/queue-rabbitmq/pom.xml | 10 +++---- server/task-distributed/pom.xml | 10 +++---- server/task-json/pom.xml | 5 ++++ server/task/pom.xml | 5 ++++ server/testing/pom.xml | 5 ++++ .../event-sourcing-pojo => testing/base}/pom.xml | 26 ++++++++---------- testing/base/src/main/resources/logback-test.xml | 31 ++++++++++++++++++++++ third-party/linshare/pom.xml | 4 +-- third-party/spamassassin/pom.xml | 5 ++++ 208 files changed, 895 insertions(+), 169 deletions(-) diff --git a/backends-common/cassandra/pom.xml b/backends-common/cassandra/pom.xml index 4aa031a..63815ff 100644 --- a/backends-common/cassandra/pom.xml +++ b/backends-common/cassandra/pom.xml @@ -62,8 +62,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/backends-common/elasticsearch/pom.xml b/backends-common/elasticsearch/pom.xml index 6bfb55c..a3108f8 100644 --- a/backends-common/elasticsearch/pom.xml +++ b/backends-common/elasticsearch/pom.xml @@ -38,8 +38,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/backends-common/jpa/pom.xml b/backends-common/jpa/pom.xml index 941d92b..56becba 100644 --- a/backends-common/jpa/pom.xml +++ b/backends-common/jpa/pom.xml @@ -29,6 +29,11 @@ <dependencies> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/backends-common/rabbitmq/pom.xml b/backends-common/rabbitmq/pom.xml index 0da8a92..69339ff 100644 --- a/backends-common/rabbitmq/pom.xml +++ b/backends-common/rabbitmq/pom.xml @@ -45,6 +45,11 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/core/pom.xml b/core/pom.xml index db74005..b2c0377 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -42,6 +42,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.github.fge</groupId> <artifactId>throwing-lambdas</artifactId> </dependency> diff --git a/event-sourcing/event-sourcing-core/pom.xml b/event-sourcing/event-sourcing-core/pom.xml index 95040c0..d72f1db 100644 --- a/event-sourcing/event-sourcing-core/pom.xml +++ b/event-sourcing/event-sourcing-core/pom.xml @@ -47,6 +47,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.github.steveash.guavate</groupId> <artifactId>guavate</artifactId> </dependency> diff --git a/event-sourcing/event-sourcing-pojo/pom.xml b/event-sourcing/event-sourcing-pojo/pom.xml index 9a927b6..b9e08ee 100644 --- a/event-sourcing/event-sourcing-pojo/pom.xml +++ b/event-sourcing/event-sourcing-pojo/pom.xml @@ -33,6 +33,11 @@ <dependencies> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.github.steveash.guavate</groupId> <artifactId>guavate</artifactId> </dependency> diff --git a/event-sourcing/event-store-api/pom.xml b/event-sourcing/event-store-api/pom.xml index f3e61b4..c42d4fe 100644 --- a/event-sourcing/event-store-api/pom.xml +++ b/event-sourcing/event-store-api/pom.xml @@ -43,6 +43,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.github.steveash.guavate</groupId> <artifactId>guavate</artifactId> </dependency> diff --git a/event-sourcing/event-store-cassandra/pom.xml b/event-sourcing/event-store-cassandra/pom.xml index d360b50..c0789c0 100644 --- a/event-sourcing/event-store-cassandra/pom.xml +++ b/event-sourcing/event-store-cassandra/pom.xml @@ -74,8 +74,8 @@ <artifactId>james-json</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/event-sourcing/event-store-memory/pom.xml b/event-sourcing/event-store-memory/pom.xml index 180a935..6472ca5 100644 --- a/event-sourcing/event-store-memory/pom.xml +++ b/event-sourcing/event-store-memory/pom.xml @@ -60,6 +60,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> diff --git a/examples/custom-listeners/pom.xml b/examples/custom-listeners/pom.xml index bc21738..39957aa 100644 --- a/examples/custom-listeners/pom.xml +++ b/examples/custom-listeners/pom.xml @@ -36,6 +36,11 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> diff --git a/examples/custom-mailets/pom.xml b/examples/custom-mailets/pom.xml index c7da5e7..0c15e81 100644 --- a/examples/custom-mailets/pom.xml +++ b/examples/custom-mailets/pom.xml @@ -18,6 +18,11 @@ <groupId>${james.groupId}</groupId> <artifactId>james-server-util</artifactId> </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> </dependencies> diff --git a/javax-mail-extension/pom.xml b/javax-mail-extension/pom.xml index e3955fa..eccb90d 100644 --- a/javax-mail-extension/pom.xml +++ b/javax-mail-extension/pom.xml @@ -37,6 +37,11 @@ <artifactId>apache-mime4j-core</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> diff --git a/json/pom.xml b/json/pom.xml index 028a332..843d652 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -32,6 +32,11 @@ <dependencies> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> diff --git a/mailbox/api/pom.xml b/mailbox/api/pom.xml index 9227c47..5b983f7 100644 --- a/mailbox/api/pom.xml +++ b/mailbox/api/pom.xml @@ -49,8 +49,8 @@ <artifactId>apache-mime4j-dom</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/mailbox/backup/pom.xml b/mailbox/backup/pom.xml index 70b05e2..b8f61bd 100644 --- a/mailbox/backup/pom.xml +++ b/mailbox/backup/pom.xml @@ -59,6 +59,11 @@ <artifactId>james-server-testing</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> @@ -72,11 +77,6 @@ <artifactId>commons-compress</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> diff --git a/mailbox/caching/pom.xml b/mailbox/caching/pom.xml index 12b7295..3bf0333 100644 --- a/mailbox/caching/pom.xml +++ b/mailbox/caching/pom.xml @@ -44,8 +44,8 @@ <artifactId>apache-james-mailbox-store</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml index c395773..21f8670 100644 --- a/mailbox/cassandra/pom.xml +++ b/mailbox/cassandra/pom.xml @@ -101,8 +101,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/mailbox/elasticsearch/pom.xml b/mailbox/elasticsearch/pom.xml index fdf87ed..5a93052 100644 --- a/mailbox/elasticsearch/pom.xml +++ b/mailbox/elasticsearch/pom.xml @@ -101,8 +101,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/mailbox/event/event-cassandra/pom.xml b/mailbox/event/event-cassandra/pom.xml index 09f6435..3af2d9f 100644 --- a/mailbox/event/event-cassandra/pom.xml +++ b/mailbox/event/event-cassandra/pom.xml @@ -62,6 +62,11 @@ <artifactId>apache-james-mailbox-event-json</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> diff --git a/mailbox/event/event-memory/pom.xml b/mailbox/event/event-memory/pom.xml index b1a1c02..135d8b8 100644 --- a/mailbox/event/event-memory/pom.xml +++ b/mailbox/event/event-memory/pom.xml @@ -47,6 +47,11 @@ <artifactId>metrics-api</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>io.projectreactor</groupId> <artifactId>reactor-core</artifactId> </dependency> diff --git a/mailbox/event/event-rabbitmq/pom.xml b/mailbox/event/event-rabbitmq/pom.xml index 8164120..69adf3c 100644 --- a/mailbox/event/event-rabbitmq/pom.xml +++ b/mailbox/event/event-rabbitmq/pom.xml @@ -80,6 +80,11 @@ <artifactId>metrics-api</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>io.projectreactor</groupId> <artifactId>reactor-core</artifactId> </dependency> diff --git a/mailbox/event/json/pom.xml b/mailbox/event/json/pom.xml index 8a56f82..871d16b 100644 --- a/mailbox/event/json/pom.xml +++ b/mailbox/event/json/pom.xml @@ -48,6 +48,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.beachape</groupId> <artifactId>enumeratum_${scala.base}</artifactId> <version>1.5.13</version> diff --git a/mailbox/jpa/pom.xml b/mailbox/jpa/pom.xml index 4814303..3b60207 100644 --- a/mailbox/jpa/pom.xml +++ b/mailbox/jpa/pom.xml @@ -72,8 +72,8 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/mailbox/lucene/pom.xml b/mailbox/lucene/pom.xml index 1c66b25..f996d49 100644 --- a/mailbox/lucene/pom.xml +++ b/mailbox/lucene/pom.xml @@ -77,6 +77,11 @@ <artifactId>apache-mime4j-dom</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> diff --git a/mailbox/maildir/pom.xml b/mailbox/maildir/pom.xml index 0dbe913..9383f4c 100644 --- a/mailbox/maildir/pom.xml +++ b/mailbox/maildir/pom.xml @@ -71,8 +71,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/mailbox/memory/pom.xml b/mailbox/memory/pom.xml index 12d8f04..f77107b 100644 --- a/mailbox/memory/pom.xml +++ b/mailbox/memory/pom.xml @@ -57,8 +57,8 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/mailbox/plugin/deleted-messages-vault-cassandra/pom.xml b/mailbox/plugin/deleted-messages-vault-cassandra/pom.xml index 113c86f..dce5038 100644 --- a/mailbox/plugin/deleted-messages-vault-cassandra/pom.xml +++ b/mailbox/plugin/deleted-messages-vault-cassandra/pom.xml @@ -61,6 +61,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>nl.jqno.equalsverifier</groupId> <artifactId>equalsverifier</artifactId> <scope>test</scope> diff --git a/mailbox/plugin/deleted-messages-vault/pom.xml b/mailbox/plugin/deleted-messages-vault/pom.xml index 37f196a..3e2dd3f 100644 --- a/mailbox/plugin/deleted-messages-vault/pom.xml +++ b/mailbox/plugin/deleted-messages-vault/pom.xml @@ -99,6 +99,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/mailbox/plugin/quota-mailing-cassandra/pom.xml b/mailbox/plugin/quota-mailing-cassandra/pom.xml index a1092ac..e84385c 100644 --- a/mailbox/plugin/quota-mailing-cassandra/pom.xml +++ b/mailbox/plugin/quota-mailing-cassandra/pom.xml @@ -106,8 +106,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/mailbox/plugin/quota-mailing-memory/pom.xml b/mailbox/plugin/quota-mailing-memory/pom.xml index 7d4da67..3b0170a 100644 --- a/mailbox/plugin/quota-mailing-memory/pom.xml +++ b/mailbox/plugin/quota-mailing-memory/pom.xml @@ -96,6 +96,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>nl.jqno.equalsverifier</groupId> <artifactId>equalsverifier</artifactId> <scope>test</scope> diff --git a/mailbox/plugin/quota-mailing/pom.xml b/mailbox/plugin/quota-mailing/pom.xml index a4042bb..2d213b7 100644 --- a/mailbox/plugin/quota-mailing/pom.xml +++ b/mailbox/plugin/quota-mailing/pom.xml @@ -96,6 +96,11 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.github.spullara.mustache.java</groupId> <artifactId>compiler</artifactId> </dependency> diff --git a/mailbox/plugin/quota-search-elasticsearch/pom.xml b/mailbox/plugin/quota-search-elasticsearch/pom.xml index e52e932..655b4f0 100644 --- a/mailbox/plugin/quota-search-elasticsearch/pom.xml +++ b/mailbox/plugin/quota-search-elasticsearch/pom.xml @@ -94,6 +94,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> diff --git a/mailbox/plugin/quota-search-scanning/pom.xml b/mailbox/plugin/quota-search-scanning/pom.xml index 87184a5..70da94c 100644 --- a/mailbox/plugin/quota-search-scanning/pom.xml +++ b/mailbox/plugin/quota-search-scanning/pom.xml @@ -75,6 +75,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> diff --git a/mailbox/plugin/quota-search/pom.xml b/mailbox/plugin/quota-search/pom.xml index 0e4c317..d080800 100644 --- a/mailbox/plugin/quota-search/pom.xml +++ b/mailbox/plugin/quota-search/pom.xml @@ -63,6 +63,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>nl.jqno.equalsverifier</groupId> <artifactId>equalsverifier</artifactId> <scope>test</scope> diff --git a/mailbox/plugin/spamassassin/pom.xml b/mailbox/plugin/spamassassin/pom.xml index 924f124..c9bba7c 100644 --- a/mailbox/plugin/spamassassin/pom.xml +++ b/mailbox/plugin/spamassassin/pom.xml @@ -68,6 +68,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> diff --git a/mailbox/scanning-search/pom.xml b/mailbox/scanning-search/pom.xml index 0e6a108..5d7676b 100644 --- a/mailbox/scanning-search/pom.xml +++ b/mailbox/scanning-search/pom.xml @@ -64,8 +64,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/mailbox/spring/pom.xml b/mailbox/spring/pom.xml index ed1d94c..091820b 100644 --- a/mailbox/spring/pom.xml +++ b/mailbox/spring/pom.xml @@ -75,8 +75,8 @@ <artifactId>apache-james-mailbox-tools-indexer</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/mailbox/store/pom.xml b/mailbox/store/pom.xml index c53bbb1..eae2c16 100644 --- a/mailbox/store/pom.xml +++ b/mailbox/store/pom.xml @@ -81,8 +81,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml index c710ea9..aaf126c 100644 --- a/mailbox/tika/pom.xml +++ b/mailbox/tika/pom.xml @@ -46,8 +46,8 @@ <artifactId>metrics-api</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/mailbox/tools/copier/pom.xml b/mailbox/tools/copier/pom.xml index 0e5cf88..6125de6 100644 --- a/mailbox/tools/copier/pom.xml +++ b/mailbox/tools/copier/pom.xml @@ -63,8 +63,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/mailbox/tools/indexer/pom.xml b/mailbox/tools/indexer/pom.xml index ead2ae3..6d98ad2 100644 --- a/mailbox/tools/indexer/pom.xml +++ b/mailbox/tools/indexer/pom.xml @@ -95,6 +95,11 @@ <artifactId>james-server-task-json</artifactId> </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> <scope>test</scope> @@ -105,11 +110,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> diff --git a/mailbox/tools/jpa-migrator/pom.xml b/mailbox/tools/jpa-migrator/pom.xml index 57bd735..4f4600c 100644 --- a/mailbox/tools/jpa-migrator/pom.xml +++ b/mailbox/tools/jpa-migrator/pom.xml @@ -37,6 +37,11 @@ <artifactId>apache-james-backends-jpa</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> diff --git a/mailbox/tools/maildir-utils/pom.xml b/mailbox/tools/maildir-utils/pom.xml index 74b1dda..e91d2a3 100644 --- a/mailbox/tools/maildir-utils/pom.xml +++ b/mailbox/tools/maildir-utils/pom.xml @@ -44,6 +44,11 @@ <groupId>${james.groupId}</groupId> <artifactId>james-server-filesystem-api</artifactId> </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> </dependencies> diff --git a/mailbox/zoo-seq-provider/pom.xml b/mailbox/zoo-seq-provider/pom.xml index 6b1668b..490a67f 100644 --- a/mailbox/zoo-seq-provider/pom.xml +++ b/mailbox/zoo-seq-provider/pom.xml @@ -46,8 +46,8 @@ <artifactId>apache-james-mailbox-store</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/mailet/ai/pom.xml b/mailet/ai/pom.xml index 0867ca1..66067b8 100644 --- a/mailet/ai/pom.xml +++ b/mailet/ai/pom.xml @@ -45,6 +45,11 @@ <artifactId>apache-mailet-base</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> diff --git a/mailet/api/pom.xml b/mailet/api/pom.xml index 1f406a3..c25d386 100644 --- a/mailet/api/pom.xml +++ b/mailet/api/pom.xml @@ -55,6 +55,11 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> diff --git a/mailet/base/pom.xml b/mailet/base/pom.xml index 5934f61..1f30f28 100644 --- a/mailet/base/pom.xml +++ b/mailet/base/pom.xml @@ -65,6 +65,11 @@ <artifactId>james-mdn</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.github.steveash.guavate</groupId> <artifactId>guavate</artifactId> </dependency> diff --git a/mailet/crypto/pom.xml b/mailet/crypto/pom.xml index 55aa9e6..7ca3bd9 100644 --- a/mailet/crypto/pom.xml +++ b/mailet/crypto/pom.xml @@ -47,6 +47,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> diff --git a/mailet/icalendar/pom.xml b/mailet/icalendar/pom.xml index 98016d5..74fc6d1 100644 --- a/mailet/icalendar/pom.xml +++ b/mailet/icalendar/pom.xml @@ -50,8 +50,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/mailet/mailetdocs-maven-plugin/pom.xml b/mailet/mailetdocs-maven-plugin/pom.xml index 10b605b..834b11d 100644 --- a/mailet/mailetdocs-maven-plugin/pom.xml +++ b/mailet/mailetdocs-maven-plugin/pom.xml @@ -42,6 +42,11 @@ <artifactId>apache-mailet-api</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml index 936b5fe..f46e7b5 100644 --- a/mailet/standard/pom.xml +++ b/mailet/standard/pom.xml @@ -67,6 +67,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> diff --git a/mailet/test/pom.xml b/mailet/test/pom.xml index 80a053e..42c6643 100644 --- a/mailet/test/pom.xml +++ b/mailet/test/pom.xml @@ -57,6 +57,11 @@ <artifactId>javax-mail-extension</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.github.steveash.guavate</groupId> <artifactId>guavate</artifactId> </dependency> diff --git a/mdn/pom.xml b/mdn/pom.xml index e8d07e1..c0a108b 100644 --- a/mdn/pom.xml +++ b/mdn/pom.xml @@ -44,6 +44,11 @@ <artifactId>javax-mail-extension</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.parboiled</groupId> <artifactId>parboiled-java</artifactId> <version>1.3.1</version> diff --git a/metrics/metrics-api/pom.xml b/metrics/metrics-api/pom.xml index 159652e..02919f4 100644 --- a/metrics/metrics-api/pom.xml +++ b/metrics/metrics-api/pom.xml @@ -31,6 +31,11 @@ <dependencies> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>io.projectreactor</groupId> <artifactId>reactor-core</artifactId> </dependency> diff --git a/metrics/metrics-dropwizard/pom.xml b/metrics/metrics-dropwizard/pom.xml index e98083e..04c97d8 100644 --- a/metrics/metrics-dropwizard/pom.xml +++ b/metrics/metrics-dropwizard/pom.xml @@ -35,6 +35,11 @@ <artifactId>metrics-api</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/metrics/metrics-logger/pom.xml b/metrics/metrics-logger/pom.xml index 5127753..4354fad 100644 --- a/metrics/metrics-logger/pom.xml +++ b/metrics/metrics-logger/pom.xml @@ -35,6 +35,11 @@ <artifactId>metrics-api</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/metrics/metrics-tests/pom.xml b/metrics/metrics-tests/pom.xml index c0c3729..edfc3c7 100644 --- a/metrics/metrics-tests/pom.xml +++ b/metrics/metrics-tests/pom.xml @@ -40,6 +40,11 @@ <artifactId>metrics-api</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/mpt/all/pom.xml b/mpt/all/pom.xml index 5bb68ef..82ecaf6 100644 --- a/mpt/all/pom.xml +++ b/mpt/all/pom.xml @@ -32,6 +32,11 @@ MPT is a functional test framework specialised for the ASCII line-base protocols common in mail.</description> <dependencies> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> </dependency> diff --git a/mpt/antlib/pom.xml b/mpt/antlib/pom.xml index e62fbe4..890ecee 100644 --- a/mpt/antlib/pom.xml +++ b/mpt/antlib/pom.xml @@ -47,6 +47,11 @@ to the library requiring no extra coding.</description> <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> diff --git a/mpt/app/pom.xml b/mpt/app/pom.xml index a50f318..689ce76 100644 --- a/mpt/app/pom.xml +++ b/mpt/app/pom.xml @@ -48,6 +48,10 @@ interfaces to the MPT library.</description> </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 734b50d..0f3ec19 100644 --- a/mpt/core/pom.xml +++ b/mpt/core/pom.xml @@ -36,6 +36,11 @@ <artifactId>apache-james-mailbox-api</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> diff --git a/mpt/impl/imap-mailbox/cassandra/pom.xml b/mpt/impl/imap-mailbox/cassandra/pom.xml index e891ba5..0ec862b 100644 --- a/mpt/impl/imap-mailbox/cassandra/pom.xml +++ b/mpt/impl/imap-mailbox/cassandra/pom.xml @@ -65,6 +65,11 @@ <artifactId>blob-cassandra</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </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 41edcd6..8650427 100644 --- a/mpt/impl/imap-mailbox/core/pom.xml +++ b/mpt/impl/imap-mailbox/core/pom.xml @@ -57,8 +57,9 @@ <artifactId>metrics-logger</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>com.google.inject</groupId> diff --git a/mpt/impl/imap-mailbox/cyrus/pom.xml b/mpt/impl/imap-mailbox/cyrus/pom.xml index 6cfa61e..8011b42 100644 --- a/mpt/impl/imap-mailbox/cyrus/pom.xml +++ b/mpt/impl/imap-mailbox/cyrus/pom.xml @@ -36,6 +36,11 @@ <artifactId>apache-james-mpt-imapmailbox-core</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> </dependency> diff --git a/mpt/impl/imap-mailbox/elasticsearch/pom.xml b/mpt/impl/imap-mailbox/elasticsearch/pom.xml index 6fd977b..ff534bb 100644 --- a/mpt/impl/imap-mailbox/elasticsearch/pom.xml +++ b/mpt/impl/imap-mailbox/elasticsearch/pom.xml @@ -82,6 +82,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> diff --git a/mpt/impl/imap-mailbox/inmemory/pom.xml b/mpt/impl/imap-mailbox/inmemory/pom.xml index 9fbf5cd..28cc73f 100644 --- a/mpt/impl/imap-mailbox/inmemory/pom.xml +++ b/mpt/impl/imap-mailbox/inmemory/pom.xml @@ -52,6 +52,11 @@ <groupId>${james.groupId}</groupId> <artifactId>apache-james-mpt-imapmailbox-core</artifactId> </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> diff --git a/mpt/impl/imap-mailbox/jpa/pom.xml b/mpt/impl/imap-mailbox/jpa/pom.xml index 8cd8f56..c568323 100644 --- a/mpt/impl/imap-mailbox/jpa/pom.xml +++ b/mpt/impl/imap-mailbox/jpa/pom.xml @@ -63,6 +63,11 @@ <artifactId>apache-james-mpt-imapmailbox-core</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <scope>test</scope> diff --git a/mpt/impl/imap-mailbox/lucenesearch/pom.xml b/mpt/impl/imap-mailbox/lucenesearch/pom.xml index 3397a08..b8209c6 100644 --- a/mpt/impl/imap-mailbox/lucenesearch/pom.xml +++ b/mpt/impl/imap-mailbox/lucenesearch/pom.xml @@ -71,6 +71,11 @@ <artifactId>apache-james-mpt-imapmailbox-core</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> diff --git a/mpt/impl/imap-mailbox/maildir/pom.xml b/mpt/impl/imap-mailbox/maildir/pom.xml index 7965414..fa5fcaa 100644 --- a/mpt/impl/imap-mailbox/maildir/pom.xml +++ b/mpt/impl/imap-mailbox/maildir/pom.xml @@ -45,5 +45,10 @@ <groupId>${james.groupId}</groupId> <artifactId>apache-james-mpt-imapmailbox-core</artifactId> </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/mpt/impl/imap-mailbox/rabbitmq/pom.xml b/mpt/impl/imap-mailbox/rabbitmq/pom.xml index ca6537e..a12ad81 100644 --- a/mpt/impl/imap-mailbox/rabbitmq/pom.xml +++ b/mpt/impl/imap-mailbox/rabbitmq/pom.xml @@ -78,6 +78,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> <scope>test</scope> diff --git a/mpt/impl/managesieve/cassandra/pom.xml b/mpt/impl/managesieve/cassandra/pom.xml index 1e5820a..1845859 100644 --- a/mpt/impl/managesieve/cassandra/pom.xml +++ b/mpt/impl/managesieve/cassandra/pom.xml @@ -50,6 +50,11 @@ <artifactId>james-server-data-cassandra</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.junit.platform</groupId> <artifactId>junit-platform-launcher</artifactId> <scope>test</scope> diff --git a/mpt/impl/managesieve/core/pom.xml b/mpt/impl/managesieve/core/pom.xml index d9c0038..6ff6bc3 100644 --- a/mpt/impl/managesieve/core/pom.xml +++ b/mpt/impl/managesieve/core/pom.xml @@ -39,8 +39,9 @@ <artifactId>james-server-data-api</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>com.google.inject</groupId> diff --git a/mpt/impl/managesieve/file/pom.xml b/mpt/impl/managesieve/file/pom.xml index 9a8a4a8..bbd668f 100644 --- a/mpt/impl/managesieve/file/pom.xml +++ b/mpt/impl/managesieve/file/pom.xml @@ -44,6 +44,11 @@ <artifactId>james-server-data-memory</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.junit.platform</groupId> <artifactId>junit-platform-launcher</artifactId> <scope>test</scope> diff --git a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml index 8c6ad8f..58dc792 100644 --- a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml +++ b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/pom.xml @@ -92,8 +92,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>com.google.guava</groupId> diff --git a/mpt/impl/smtp/cassandra/pom.xml b/mpt/impl/smtp/cassandra/pom.xml index a7d6f20..8e82fc7 100644 --- a/mpt/impl/smtp/cassandra/pom.xml +++ b/mpt/impl/smtp/cassandra/pom.xml @@ -74,8 +74,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>com.google.guava</groupId> diff --git a/mpt/impl/smtp/core/pom.xml b/mpt/impl/smtp/core/pom.xml index 6cdba3a..4727f38 100644 --- a/mpt/impl/smtp/core/pom.xml +++ b/mpt/impl/smtp/core/pom.xml @@ -65,6 +65,11 @@ <type>test-jar</type> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> </dependency> diff --git a/mpt/mavenplugin/pom.xml b/mpt/mavenplugin/pom.xml index da03e77..90c8461 100644 --- a/mpt/mavenplugin/pom.xml +++ b/mpt/mavenplugin/pom.xml @@ -48,6 +48,11 @@ to the library requiring no extra coding.</description> <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> diff --git a/pom.xml b/pom.xml index c9f9dbc..e0e2f57 100644 --- a/pom.xml +++ b/pom.xml @@ -538,6 +538,7 @@ <module>mpt</module> <module>protocols</module> <module>server</module> + <module>testing/base</module> <module>third-party</module> </modules> @@ -1833,14 +1834,13 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>${logback.version}</version> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <version>${project.version}</version> </dependency> - <dependency> <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> + <artifactId>logback-classic</artifactId> <version>${logback.version}</version> </dependency> <dependency> diff --git a/protocols/api/pom.xml b/protocols/api/pom.xml index a674719..5ff2e1b 100644 --- a/protocols/api/pom.xml +++ b/protocols/api/pom.xml @@ -34,6 +34,11 @@ <dependencies> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.github.steveash.guavate</groupId> <artifactId>guavate</artifactId> </dependency> diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml index 82ea795..6a5c6a8 100644 --- a/protocols/imap/pom.xml +++ b/protocols/imap/pom.xml @@ -69,8 +69,8 @@ <artifactId>protocols-api</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/protocols/lmtp/pom.xml b/protocols/lmtp/pom.xml index 5d59cd8..b9d9c70 100644 --- a/protocols/lmtp/pom.xml +++ b/protocols/lmtp/pom.xml @@ -59,8 +59,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/protocols/managesieve/pom.xml b/protocols/managesieve/pom.xml index 99e336f..0c84861 100644 --- a/protocols/managesieve/pom.xml +++ b/protocols/managesieve/pom.xml @@ -42,6 +42,11 @@ <artifactId>james-server-data-api</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/protocols/netty/pom.xml b/protocols/netty/pom.xml index ae66fd0..910a700 100644 --- a/protocols/netty/pom.xml +++ b/protocols/netty/pom.xml @@ -42,6 +42,11 @@ <artifactId>protocols-api</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/protocols/pop3/pom.xml b/protocols/pop3/pom.xml index 436cde8..1e86f15 100644 --- a/protocols/pop3/pom.xml +++ b/protocols/pop3/pom.xml @@ -49,8 +49,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>commons-net</groupId> diff --git a/protocols/smtp/pom.xml b/protocols/smtp/pom.xml index 3fb0392..be05124 100644 --- a/protocols/smtp/pom.xml +++ b/protocols/smtp/pom.xml @@ -60,8 +60,8 @@ <artifactId>protocols-netty</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/app/pom.xml b/server/app/pom.xml index 3c7240c..14bd616 100644 --- a/server/app/pom.xml +++ b/server/app/pom.xml @@ -529,6 +529,11 @@ <artifactId>protocols-managesieve</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.xbean</groupId> <artifactId>xbean-spring</artifactId> <scope>runtime</scope> diff --git a/server/blob/blob-api/pom.xml b/server/blob/blob-api/pom.xml index ecc84c5..66685e5 100644 --- a/server/blob/blob-api/pom.xml +++ b/server/blob/blob-api/pom.xml @@ -47,6 +47,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <scope>test</scope> diff --git a/server/blob/blob-cassandra/pom.xml b/server/blob/blob-cassandra/pom.xml index fb8c35e..c6ca7e0 100644 --- a/server/blob/blob-cassandra/pom.xml +++ b/server/blob/blob-cassandra/pom.xml @@ -63,8 +63,8 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/blob/blob-export-api/pom.xml b/server/blob/blob-export-api/pom.xml index fb58c02..c29e0c0 100644 --- a/server/blob/blob-export-api/pom.xml +++ b/server/blob/blob-export-api/pom.xml @@ -48,6 +48,11 @@ <type>test-jar</type> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>nl.jqno.equalsverifier</groupId> <artifactId>equalsverifier</artifactId> <scope>test</scope> diff --git a/server/blob/blob-export-file/pom.xml b/server/blob/blob-export-file/pom.xml index 3bb5c3e..73b0015 100644 --- a/server/blob/blob-export-file/pom.xml +++ b/server/blob/blob-export-file/pom.xml @@ -61,6 +61,11 @@ <artifactId>james-server-filesystem-api</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>nl.jqno.equalsverifier</groupId> <artifactId>equalsverifier</artifactId> <scope>test</scope> diff --git a/server/blob/blob-memory/pom.xml b/server/blob/blob-memory/pom.xml index 990efc9..8ec24ea 100644 --- a/server/blob/blob-memory/pom.xml +++ b/server/blob/blob-memory/pom.xml @@ -48,6 +48,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> diff --git a/server/blob/blob-objectstorage/pom.xml b/server/blob/blob-objectstorage/pom.xml index 0c4e558..6aaf095 100644 --- a/server/blob/blob-objectstorage/pom.xml +++ b/server/blob/blob-objectstorage/pom.xml @@ -62,8 +62,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/blob/blob-union/pom.xml b/server/blob/blob-union/pom.xml index 3ecf106..16f9a7e 100644 --- a/server/blob/blob-union/pom.xml +++ b/server/blob/blob-union/pom.xml @@ -62,6 +62,11 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> diff --git a/server/blob/mail-store/pom.xml b/server/blob/mail-store/pom.xml index 00bf37c..fd85be2 100644 --- a/server/blob/mail-store/pom.xml +++ b/server/blob/mail-store/pom.xml @@ -47,6 +47,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>nl.jqno.equalsverifier</groupId> <artifactId>equalsverifier</artifactId> <scope>test</scope> diff --git a/server/container/cli-integration/pom.xml b/server/container/cli-integration/pom.xml index 32f88bc..a168e5b 100644 --- a/server/container/cli-integration/pom.xml +++ b/server/container/cli-integration/pom.xml @@ -67,8 +67,8 @@ </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/container/cli/pom.xml b/server/container/cli/pom.xml index 4148b92..22a6be0 100644 --- a/server/container/cli/pom.xml +++ b/server/container/cli/pom.xml @@ -46,13 +46,13 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <scope>runtime</scope> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> <groupId>commons-cli</groupId> diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml index ec0603b..d18c48d 100644 --- a/server/container/core/pom.xml +++ b/server/container/core/pom.xml @@ -83,6 +83,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/server/container/filesystem-api/pom.xml b/server/container/filesystem-api/pom.xml index 9de4d4b..e7eafbc 100644 --- a/server/container/filesystem-api/pom.xml +++ b/server/container/filesystem-api/pom.xml @@ -34,6 +34,11 @@ <dependencies> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.sparkjava</groupId> <artifactId>spark-core</artifactId> <scope>test</scope> diff --git a/server/container/guice/activemq/pom.xml b/server/container/guice/activemq/pom.xml index 403a1eb..98c5a22 100644 --- a/server/container/guice/activemq/pom.xml +++ b/server/container/guice/activemq/pom.xml @@ -41,6 +41,11 @@ <artifactId>james-server-queue-activemq</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/blob-api-guice/pom.xml b/server/container/guice/blob-api-guice/pom.xml index 5ede30c..c1516ac 100644 --- a/server/container/guice/blob-api-guice/pom.xml +++ b/server/container/guice/blob-api-guice/pom.xml @@ -43,6 +43,11 @@ <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-common</artifactId> </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> diff --git a/server/container/guice/blob-export-guice/pom.xml b/server/container/guice/blob-export-guice/pom.xml index d2e73b0..ad720af 100644 --- a/server/container/guice/blob-export-guice/pom.xml +++ b/server/container/guice/blob-export-guice/pom.xml @@ -67,6 +67,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>nl.jqno.equalsverifier</groupId> <artifactId>equalsverifier</artifactId> <scope>test</scope> diff --git a/server/container/guice/blob-memory-guice/pom.xml b/server/container/guice/blob-memory-guice/pom.xml index 86e25b0..bdb04cb 100644 --- a/server/container/guice/blob-memory-guice/pom.xml +++ b/server/container/guice/blob-memory-guice/pom.xml @@ -47,5 +47,10 @@ <groupId>${james.groupId}</groupId> <artifactId>james-server-guice-common</artifactId> </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> \ No newline at end of file diff --git a/server/container/guice/blob-objectstorage-guice/pom.xml b/server/container/guice/blob-objectstorage-guice/pom.xml index 4c8de80..cfc5842 100644 --- a/server/container/guice/blob-objectstorage-guice/pom.xml +++ b/server/container/guice/blob-objectstorage-guice/pom.xml @@ -66,6 +66,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>nl.jqno.equalsverifier</groupId> <artifactId>equalsverifier</artifactId> <scope>test</scope> diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml index 51f6e1f..e01ad9b 100644 --- a/server/container/guice/cassandra-guice/pom.xml +++ b/server/container/guice/cassandra-guice/pom.xml @@ -285,6 +285,11 @@ <artifactId>quota-mailing-cassandra</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> </dependency> diff --git a/server/container/guice/cassandra-ldap-guice/pom.xml b/server/container/guice/cassandra-ldap-guice/pom.xml index 5d0dc8f..1fd94d7 100644 --- a/server/container/guice/cassandra-ldap-guice/pom.xml +++ b/server/container/guice/cassandra-ldap-guice/pom.xml @@ -104,6 +104,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> diff --git a/server/container/guice/cassandra-rabbitmq-guice/pom.xml b/server/container/guice/cassandra-rabbitmq-guice/pom.xml index 5ccebfb..707b63a 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/pom.xml +++ b/server/container/guice/cassandra-rabbitmq-guice/pom.xml @@ -155,6 +155,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml index 0a2de84..be3749d 100644 --- a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml +++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml @@ -116,6 +116,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> <scope>test</scope> diff --git a/server/container/guice/configuration/pom.xml b/server/container/guice/configuration/pom.xml index 2ad973e..b76faae 100644 --- a/server/container/guice/configuration/pom.xml +++ b/server/container/guice/configuration/pom.xml @@ -45,6 +45,11 @@ <artifactId>james-server-lifecycle-api</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.github.stefanbirkner</groupId> <artifactId>system-rules</artifactId> <scope>test</scope> diff --git a/server/container/guice/custom-mailets/pom.xml b/server/container/guice/custom-mailets/pom.xml index f483c6b..ff7c8d8 100644 --- a/server/container/guice/custom-mailets/pom.xml +++ b/server/container/guice/custom-mailets/pom.xml @@ -40,5 +40,10 @@ <groupId>${james.groupId}</groupId> <artifactId>apache-mailet-base</artifactId> </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/server/container/guice/es-metric-reporter/pom.xml b/server/container/guice/es-metric-reporter/pom.xml index 94823e6..39698ee 100644 --- a/server/container/guice/es-metric-reporter/pom.xml +++ b/server/container/guice/es-metric-reporter/pom.xml @@ -49,6 +49,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml index 26b3668..d09870f 100644 --- a/server/container/guice/guice-common/pom.xml +++ b/server/container/guice/guice-common/pom.xml @@ -148,8 +148,8 @@ <artifactId>metrics-dropwizard</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/container/guice/guice-utils/pom.xml b/server/container/guice/guice-utils/pom.xml index 6ffc43e..7948e4e 100644 --- a/server/container/guice/guice-utils/pom.xml +++ b/server/container/guice/guice-utils/pom.xml @@ -38,6 +38,11 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.github.fge</groupId> <artifactId>throwing-lambdas</artifactId> </dependency> diff --git a/server/container/guice/jmx/pom.xml b/server/container/guice/jmx/pom.xml index 26e9901..ab9ef5e 100644 --- a/server/container/guice/jmx/pom.xml +++ b/server/container/guice/jmx/pom.xml @@ -73,6 +73,11 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.github.fge</groupId> <artifactId>throwing-lambdas</artifactId> </dependency> diff --git a/server/container/guice/jpa-common-guice/pom.xml b/server/container/guice/jpa-common-guice/pom.xml index 3bdbaa3..5a64bd7 100644 --- a/server/container/guice/jpa-common-guice/pom.xml +++ b/server/container/guice/jpa-common-guice/pom.xml @@ -47,6 +47,11 @@ <artifactId>james-server-guice-common</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <scope>test</scope> diff --git a/server/container/guice/jpa-guice/pom.xml b/server/container/guice/jpa-guice/pom.xml index 53f27e8..8432db2 100644 --- a/server/container/guice/jpa-guice/pom.xml +++ b/server/container/guice/jpa-guice/pom.xml @@ -151,6 +151,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> </dependency> diff --git a/server/container/guice/jpa-smtp-common/pom.xml b/server/container/guice/jpa-smtp-common/pom.xml index c9ccb60..1883d95 100644 --- a/server/container/guice/jpa-smtp-common/pom.xml +++ b/server/container/guice/jpa-smtp-common/pom.xml @@ -74,10 +74,6 @@ <artifactId>james-server-jpa-common-guice</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </dependency> - <dependency> <groupId>com.linagora</groupId> <artifactId>logback-elasticsearch-appender</artifactId> </dependency> diff --git a/server/container/guice/jpa-smtp-mariadb/pom.xml b/server/container/guice/jpa-smtp-mariadb/pom.xml index 4e9e240..d020771 100644 --- a/server/container/guice/jpa-smtp-mariadb/pom.xml +++ b/server/container/guice/jpa-smtp-mariadb/pom.xml @@ -53,6 +53,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </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 f40f06a..4d65ffa 100644 --- a/server/container/guice/jpa-smtp/pom.xml +++ b/server/container/guice/jpa-smtp/pom.xml @@ -67,6 +67,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </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 99ca391..896ef53 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 @@ -55,6 +55,11 @@ <artifactId>james-server-webadmin-mailbox-deleted-message-vault</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/mailbox-plugin-spamassassin/pom.xml b/server/container/guice/mailbox-plugin-spamassassin/pom.xml index eddba04..6fb753a 100644 --- a/server/container/guice/mailbox-plugin-spamassassin/pom.xml +++ b/server/container/guice/mailbox-plugin-spamassassin/pom.xml @@ -41,6 +41,11 @@ <artifactId>james-server-guice-configuration</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/mailbox/pom.xml b/server/container/guice/mailbox/pom.xml index 7f6e88a..a866ede 100644 --- a/server/container/guice/mailbox/pom.xml +++ b/server/container/guice/mailbox/pom.xml @@ -53,6 +53,11 @@ <artifactId>james-server-mailbox-adapter</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/mailet/pom.xml b/server/container/guice/mailet/pom.xml index 7144285..ee5ead0 100644 --- a/server/container/guice/mailet/pom.xml +++ b/server/container/guice/mailet/pom.xml @@ -68,8 +68,8 @@ <artifactId>james-server-mailetcontainer-camel</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/container/guice/memory-guice/pom.xml b/server/container/guice/memory-guice/pom.xml index 3323eca..acd6098 100644 --- a/server/container/guice/memory-guice/pom.xml +++ b/server/container/guice/memory-guice/pom.xml @@ -186,6 +186,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> </dependency> diff --git a/server/container/guice/onami/pom.xml b/server/container/guice/onami/pom.xml index 7b9c87d..a7409ff 100644 --- a/server/container/guice/onami/pom.xml +++ b/server/container/guice/onami/pom.xml @@ -35,6 +35,11 @@ <dependencies> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/protocols/imap/pom.xml b/server/container/guice/protocols/imap/pom.xml index 3e69e75..722a3a2 100644 --- a/server/container/guice/protocols/imap/pom.xml +++ b/server/container/guice/protocols/imap/pom.xml @@ -45,6 +45,11 @@ <artifactId>james-server-protocols-imap4</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/protocols/jmap-draft/pom.xml b/server/container/guice/protocols/jmap-draft/pom.xml index ed0f8fe..c609ddd 100644 --- a/server/container/guice/protocols/jmap-draft/pom.xml +++ b/server/container/guice/protocols/jmap-draft/pom.xml @@ -62,6 +62,11 @@ <artifactId>james-server-jmap-draft</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/protocols/lmtp/pom.xml b/server/container/guice/protocols/lmtp/pom.xml index 19003a8..cb38d44 100644 --- a/server/container/guice/protocols/lmtp/pom.xml +++ b/server/container/guice/protocols/lmtp/pom.xml @@ -41,6 +41,11 @@ <artifactId>james-server-protocols-lmtp</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/protocols/managedsieve/pom.xml b/server/container/guice/protocols/managedsieve/pom.xml index f052723..10ce419 100644 --- a/server/container/guice/protocols/managedsieve/pom.xml +++ b/server/container/guice/protocols/managedsieve/pom.xml @@ -45,6 +45,11 @@ <artifactId>james-server-protocols-managesieve</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/protocols/netty/pom.xml b/server/container/guice/protocols/netty/pom.xml index ac53323..a1fcb01 100644 --- a/server/container/guice/protocols/netty/pom.xml +++ b/server/container/guice/protocols/netty/pom.xml @@ -41,6 +41,11 @@ <artifactId>protocols-netty</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/protocols/pop/pom.xml b/server/container/guice/protocols/pop/pom.xml index 6e6bbd1..62484f0 100644 --- a/server/container/guice/protocols/pop/pom.xml +++ b/server/container/guice/protocols/pop/pom.xml @@ -41,6 +41,11 @@ <artifactId>james-server-protocols-pop3</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/protocols/smtp/pom.xml b/server/container/guice/protocols/smtp/pom.xml index 055f3b0..34580a7 100644 --- a/server/container/guice/protocols/smtp/pom.xml +++ b/server/container/guice/protocols/smtp/pom.xml @@ -41,6 +41,11 @@ <artifactId>james-server-protocols-smtp</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</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 93c437c..16a43c4 100644 --- a/server/container/guice/protocols/webadmin-cassandra-data/pom.xml +++ b/server/container/guice/protocols/webadmin-cassandra-data/pom.xml @@ -42,6 +42,11 @@ <artifactId>james-server-webadmin-cassandra-data</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/protocols/webadmin-cassandra/pom.xml b/server/container/guice/protocols/webadmin-cassandra/pom.xml index d4a8a2c..df29402 100644 --- a/server/container/guice/protocols/webadmin-cassandra/pom.xml +++ b/server/container/guice/protocols/webadmin-cassandra/pom.xml @@ -45,6 +45,11 @@ <artifactId>james-server-data-cassandra</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/protocols/webadmin-data/pom.xml b/server/container/guice/protocols/webadmin-data/pom.xml index 56c30ad..2ee10b0 100644 --- a/server/container/guice/protocols/webadmin-data/pom.xml +++ b/server/container/guice/protocols/webadmin-data/pom.xml @@ -45,6 +45,11 @@ <artifactId>james-server-webadmin-data</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/protocols/webadmin-mailbox/pom.xml b/server/container/guice/protocols/webadmin-mailbox/pom.xml index b733e75..9b896c9 100644 --- a/server/container/guice/protocols/webadmin-mailbox/pom.xml +++ b/server/container/guice/protocols/webadmin-mailbox/pom.xml @@ -45,6 +45,11 @@ <artifactId>james-server-webadmin-mailbox</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/protocols/webadmin-mailqueue/pom.xml b/server/container/guice/protocols/webadmin-mailqueue/pom.xml index 79c45a9..b823781 100644 --- a/server/container/guice/protocols/webadmin-mailqueue/pom.xml +++ b/server/container/guice/protocols/webadmin-mailqueue/pom.xml @@ -47,6 +47,11 @@ <artifactId>james-server-webadmin-mailqueue</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/protocols/webadmin-mailrepository/pom.xml b/server/container/guice/protocols/webadmin-mailrepository/pom.xml index cd6c9eb..5b9bf79 100644 --- a/server/container/guice/protocols/webadmin-mailrepository/pom.xml +++ b/server/container/guice/protocols/webadmin-mailrepository/pom.xml @@ -47,6 +47,11 @@ <artifactId>james-server-webadmin-mailrepository</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/protocols/webadmin-swagger/pom.xml b/server/container/guice/protocols/webadmin-swagger/pom.xml index f9b7dda..cae710d 100644 --- a/server/container/guice/protocols/webadmin-swagger/pom.xml +++ b/server/container/guice/protocols/webadmin-swagger/pom.xml @@ -45,6 +45,11 @@ <artifactId>james-server-webadmin-swagger</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/protocols/webadmin/pom.xml b/server/container/guice/protocols/webadmin/pom.xml index 2a348a7..e83ce05 100644 --- a/server/container/guice/protocols/webadmin/pom.xml +++ b/server/container/guice/protocols/webadmin/pom.xml @@ -41,6 +41,11 @@ <artifactId>james-server-webadmin-core</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/guice/rabbitmq/pom.xml b/server/container/guice/rabbitmq/pom.xml index 79e119d..686666c 100644 --- a/server/container/guice/rabbitmq/pom.xml +++ b/server/container/guice/rabbitmq/pom.xml @@ -49,6 +49,11 @@ <artifactId>james-server-queue-rabbitmq</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> diff --git a/server/container/jetty/pom.xml b/server/container/jetty/pom.xml index c234aa6..910e52c 100644 --- a/server/container/jetty/pom.xml +++ b/server/container/jetty/pom.xml @@ -47,6 +47,11 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.github.fge</groupId> <artifactId>throwing-lambdas</artifactId> </dependency> diff --git a/server/container/lifecycle-api/pom.xml b/server/container/lifecycle-api/pom.xml index 4c263bd..2eb7b82 100644 --- a/server/container/lifecycle-api/pom.xml +++ b/server/container/lifecycle-api/pom.xml @@ -34,6 +34,11 @@ <dependencies> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/server/container/mailbox-adapter/pom.xml b/server/container/mailbox-adapter/pom.xml index dffd0d9..42ce6f6 100644 --- a/server/container/mailbox-adapter/pom.xml +++ b/server/container/mailbox-adapter/pom.xml @@ -64,6 +64,11 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/server/container/mailbox-jmx/pom.xml b/server/container/mailbox-jmx/pom.xml index c0310e8..3d2cbb0 100644 --- a/server/container/mailbox-jmx/pom.xml +++ b/server/container/mailbox-jmx/pom.xml @@ -58,7 +58,11 @@ <groupId>${james.groupId}</groupId> <artifactId>james-server-util</artifactId> </dependency> - + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> diff --git a/server/container/metrics/metrics-es-reporter/pom.xml b/server/container/metrics/metrics-es-reporter/pom.xml index e2759ad..1eeeba5 100644 --- a/server/container/metrics/metrics-es-reporter/pom.xml +++ b/server/container/metrics/metrics-es-reporter/pom.xml @@ -60,6 +60,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml index d7ff234..557d1c5 100644 --- a/server/container/spring/pom.xml +++ b/server/container/spring/pom.xml @@ -96,6 +96,11 @@ </exclusions> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.sparkjava</groupId> <artifactId>spark-core</artifactId> <scope>test</scope> diff --git a/server/container/util/pom.xml b/server/container/util/pom.xml index c43ee55..b5b9e25 100644 --- a/server/container/util/pom.xml +++ b/server/container/util/pom.xml @@ -38,6 +38,11 @@ <artifactId>apache-mime4j-dom</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.github.dpaukov</groupId> <artifactId>combinatoricslib3</artifactId> <scope>test</scope> diff --git a/server/data/data-api/pom.xml b/server/data/data-api/pom.xml index 31f2194..10cb84a 100644 --- a/server/data/data-api/pom.xml +++ b/server/data/data-api/pom.xml @@ -51,6 +51,11 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/server/data/data-cassandra/pom.xml b/server/data/data-cassandra/pom.xml index 4da36dc..fc8edc6 100644 --- a/server/data/data-cassandra/pom.xml +++ b/server/data/data-cassandra/pom.xml @@ -85,6 +85,11 @@ <artifactId>james-server-lifecycle-api</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/server/data/data-file/pom.xml b/server/data/data-file/pom.xml index 8b07253..5c659b7 100644 --- a/server/data/data-file/pom.xml +++ b/server/data/data-file/pom.xml @@ -90,8 +90,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/data/data-jdbc/pom.xml b/server/data/data-jdbc/pom.xml index 518a4ec..7da9410 100644 --- a/server/data/data-jdbc/pom.xml +++ b/server/data/data-jdbc/pom.xml @@ -85,8 +85,8 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/data/data-jmap-cassandra/pom.xml b/server/data/data-jmap-cassandra/pom.xml index 334bb9d..c6f4463 100644 --- a/server/data/data-jmap-cassandra/pom.xml +++ b/server/data/data-jmap-cassandra/pom.xml @@ -65,8 +65,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/data/data-jmap/pom.xml b/server/data/data-jmap/pom.xml index 119dd7b..7833b8c 100644 --- a/server/data/data-jmap/pom.xml +++ b/server/data/data-jmap/pom.xml @@ -57,8 +57,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml index e79ab1c..983879a 100644 --- a/server/data/data-jpa/pom.xml +++ b/server/data/data-jpa/pom.xml @@ -77,8 +77,8 @@ <artifactId>james-server-lifecycle-api</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/data/data-ldap/pom.xml b/server/data/data-ldap/pom.xml index d95300d..cef1a81 100644 --- a/server/data/data-ldap/pom.xml +++ b/server/data/data-ldap/pom.xml @@ -51,8 +51,8 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/data/data-library/pom.xml b/server/data/data-library/pom.xml index 0985d44..b923b1c 100644 --- a/server/data/data-library/pom.xml +++ b/server/data/data-library/pom.xml @@ -78,8 +78,8 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/data/data-memory/pom.xml b/server/data/data-memory/pom.xml index badea66..0e8e6dd 100644 --- a/server/data/data-memory/pom.xml +++ b/server/data/data-memory/pom.xml @@ -74,8 +74,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/dns-service/dnsservice-api/pom.xml b/server/dns-service/dnsservice-api/pom.xml index e107776..b543101 100644 --- a/server/dns-service/dnsservice-api/pom.xml +++ b/server/dns-service/dnsservice-api/pom.xml @@ -35,6 +35,11 @@ <dependencies> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/server/dns-service/dnsservice-dnsjava/pom.xml b/server/dns-service/dnsservice-dnsjava/pom.xml index 4876bd0..c69eb26 100644 --- a/server/dns-service/dnsservice-dnsjava/pom.xml +++ b/server/dns-service/dnsservice-dnsjava/pom.xml @@ -51,8 +51,8 @@ <artifactId>metrics-api</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/dns-service/dnsservice-library/pom.xml b/server/dns-service/dnsservice-library/pom.xml index 4cde943..ec734e8 100644 --- a/server/dns-service/dnsservice-library/pom.xml +++ b/server/dns-service/dnsservice-library/pom.xml @@ -47,6 +47,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/server/dns-service/dnsservice-test/pom.xml b/server/dns-service/dnsservice-test/pom.xml index 5550873..ebac2bc 100644 --- a/server/dns-service/dnsservice-test/pom.xml +++ b/server/dns-service/dnsservice-test/pom.xml @@ -39,6 +39,11 @@ <artifactId>james-server-dnsservice-api</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/server/mailet/dkim/pom.xml b/server/mailet/dkim/pom.xml index 186031d..85cbda7 100644 --- a/server/mailet/dkim/pom.xml +++ b/server/mailet/dkim/pom.xml @@ -99,6 +99,11 @@ </exclusions> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml index 574efdf..390414b 100644 --- a/server/mailet/integration-testing/pom.xml +++ b/server/mailet/integration-testing/pom.xml @@ -119,8 +119,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/mailet/mailetcontainer-api/pom.xml b/server/mailet/mailetcontainer-api/pom.xml index 2dc40a3..da75700 100644 --- a/server/mailet/mailetcontainer-api/pom.xml +++ b/server/mailet/mailetcontainer-api/pom.xml @@ -38,6 +38,11 @@ <artifactId>apache-mailet-api</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> diff --git a/server/mailet/mailetcontainer-camel/pom.xml b/server/mailet/mailetcontainer-camel/pom.xml index 3235358..9b5c285 100644 --- a/server/mailet/mailetcontainer-camel/pom.xml +++ b/server/mailet/mailetcontainer-camel/pom.xml @@ -101,8 +101,8 @@ <artifactId>metrics-api</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml index de36e8d..98d775b 100644 --- a/server/mailet/mailets/pom.xml +++ b/server/mailet/mailets/pom.xml @@ -192,8 +192,8 @@ <artifactId>metrics-api</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/mailet/mock-smtp-server/pom.xml b/server/mailet/mock-smtp-server/pom.xml index d29267d..d185737 100644 --- a/server/mailet/mock-smtp-server/pom.xml +++ b/server/mailet/mock-smtp-server/pom.xml @@ -55,9 +55,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <scope>runtime</scope> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/server/mailrepository/mailrepository-api/pom.xml b/server/mailrepository/mailrepository-api/pom.xml index 8e76728..f6c7b24 100644 --- a/server/mailrepository/mailrepository-api/pom.xml +++ b/server/mailrepository/mailrepository-api/pom.xml @@ -54,6 +54,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>nl.jqno.equalsverifier</groupId> <artifactId>equalsverifier</artifactId> <scope>test</scope> diff --git a/server/mailrepository/mailrepository-cassandra/pom.xml b/server/mailrepository/mailrepository-cassandra/pom.xml index 141d55c..ad96b97 100644 --- a/server/mailrepository/mailrepository-cassandra/pom.xml +++ b/server/mailrepository/mailrepository-cassandra/pom.xml @@ -78,8 +78,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/mailrepository/mailrepository-memory/pom.xml b/server/mailrepository/mailrepository-memory/pom.xml index ffd1675..5e7d03f 100644 --- a/server/mailrepository/mailrepository-memory/pom.xml +++ b/server/mailrepository/mailrepository-memory/pom.xml @@ -53,6 +53,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> diff --git a/server/protocols/fetchmail/pom.xml b/server/protocols/fetchmail/pom.xml index a6db236..9f4a12f 100644 --- a/server/protocols/fetchmail/pom.xml +++ b/server/protocols/fetchmail/pom.xml @@ -62,6 +62,11 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </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 495034e..2e9810a 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 @@ -177,6 +177,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>io.cucumber</groupId> <artifactId>cucumber-guice</artifactId> <scope>test</scope> 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 684267a..4c68430 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 @@ -141,6 +141,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml index fe7c151..41f5e7a 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/pom.xml @@ -136,8 +136,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> 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 0ed91af..4c216cd 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 @@ -120,6 +120,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>io.cucumber</groupId> <artifactId>cucumber-guice</artifactId> <scope>test</scope> diff --git a/server/protocols/jmap-draft/pom.xml b/server/protocols/jmap-draft/pom.xml index b822013..5a7a841 100644 --- a/server/protocols/jmap-draft/pom.xml +++ b/server/protocols/jmap-draft/pom.xml @@ -166,8 +166,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/protocols/jwt/pom.xml b/server/protocols/jwt/pom.xml index 587f9df..1b6b796 100644 --- a/server/protocols/jwt/pom.xml +++ b/server/protocols/jwt/pom.xml @@ -33,6 +33,11 @@ <dependencies> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/server/protocols/protocols-imap4/pom.xml b/server/protocols/protocols-imap4/pom.xml index d9b2670..05ab23b 100644 --- a/server/protocols/protocols-imap4/pom.xml +++ b/server/protocols/protocols-imap4/pom.xml @@ -55,6 +55,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> diff --git a/server/protocols/protocols-library/pom.xml b/server/protocols/protocols-library/pom.xml index a058382..f5f8692 100644 --- a/server/protocols/protocols-library/pom.xml +++ b/server/protocols/protocols-library/pom.xml @@ -57,6 +57,11 @@ <artifactId>metrics-api</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>io.netty</groupId> <artifactId>netty</artifactId> </dependency> diff --git a/server/protocols/protocols-lmtp/pom.xml b/server/protocols/protocols-lmtp/pom.xml index bc18395..ada4b54 100644 --- a/server/protocols/protocols-lmtp/pom.xml +++ b/server/protocols/protocols-lmtp/pom.xml @@ -80,6 +80,11 @@ </exclusions> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> diff --git a/server/protocols/protocols-managesieve/pom.xml b/server/protocols/protocols-managesieve/pom.xml index 1e257e0..c64ddec 100644 --- a/server/protocols/protocols-managesieve/pom.xml +++ b/server/protocols/protocols-managesieve/pom.xml @@ -22,6 +22,11 @@ <artifactId>james-server-protocols-library</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> diff --git a/server/protocols/protocols-pop3/pom.xml b/server/protocols/protocols-pop3/pom.xml index 590086d..49bb25a 100644 --- a/server/protocols/protocols-pop3/pom.xml +++ b/server/protocols/protocols-pop3/pom.xml @@ -100,6 +100,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml index 7cd2ce2..0c02df7 100644 --- a/server/protocols/protocols-smtp/pom.xml +++ b/server/protocols/protocols-smtp/pom.xml @@ -148,8 +148,8 @@ <artifactId>metrics-api</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/protocols/webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/pom.xml index bcd4543..151ab53 100644 --- a/server/protocols/webadmin-integration-test/pom.xml +++ b/server/protocols/webadmin-integration-test/pom.xml @@ -107,8 +107,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/protocols/webadmin/webadmin-cassandra-data/pom.xml b/server/protocols/webadmin/webadmin-cassandra-data/pom.xml index 07824a1..b698812 100644 --- a/server/protocols/webadmin/webadmin-cassandra-data/pom.xml +++ b/server/protocols/webadmin/webadmin-cassandra-data/pom.xml @@ -68,6 +68,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> diff --git a/server/protocols/webadmin/webadmin-cassandra/pom.xml b/server/protocols/webadmin/webadmin-cassandra/pom.xml index 1701a7f..6d9957b 100644 --- a/server/protocols/webadmin/webadmin-cassandra/pom.xml +++ b/server/protocols/webadmin/webadmin-cassandra/pom.xml @@ -53,6 +53,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml index b5f9bb8..5b3cf06 100644 --- a/server/protocols/webadmin/webadmin-core/pom.xml +++ b/server/protocols/webadmin/webadmin-core/pom.xml @@ -63,8 +63,8 @@ <artifactId>james-server-task</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml index 99a6bbc..a8222f4 100644 --- a/server/protocols/webadmin/webadmin-data/pom.xml +++ b/server/protocols/webadmin/webadmin-data/pom.xml @@ -84,8 +84,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <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 8fe2375..787c8fd 100644 --- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/pom.xml +++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/pom.xml @@ -113,8 +113,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml index 9dc6656..767ff0f 100644 --- a/server/protocols/webadmin/webadmin-mailbox/pom.xml +++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml @@ -143,8 +143,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/protocols/webadmin/webadmin-mailqueue/pom.xml b/server/protocols/webadmin/webadmin-mailqueue/pom.xml index 9ad7fd9..4d6829b 100644 --- a/server/protocols/webadmin/webadmin-mailqueue/pom.xml +++ b/server/protocols/webadmin/webadmin-mailqueue/pom.xml @@ -72,6 +72,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/server/protocols/webadmin/webadmin-mailrepository/pom.xml b/server/protocols/webadmin/webadmin-mailrepository/pom.xml index 6df54fe..a0cc81e 100644 --- a/server/protocols/webadmin/webadmin-mailrepository/pom.xml +++ b/server/protocols/webadmin/webadmin-mailrepository/pom.xml @@ -90,8 +90,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/protocols/webadmin/webadmin-swagger/pom.xml b/server/protocols/webadmin/webadmin-swagger/pom.xml index 0c2a27c..60e10fb 100644 --- a/server/protocols/webadmin/webadmin-swagger/pom.xml +++ b/server/protocols/webadmin/webadmin-swagger/pom.xml @@ -37,6 +37,11 @@ <groupId>${james.groupId}</groupId> <artifactId>james-server-webadmin-core</artifactId> </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> diff --git a/server/queue/queue-activemq/pom.xml b/server/queue/queue-activemq/pom.xml index e1a709a..f49195d 100644 --- a/server/queue/queue-activemq/pom.xml +++ b/server/queue/queue-activemq/pom.xml @@ -88,8 +88,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/queue/queue-api/pom.xml b/server/queue/queue-api/pom.xml index ed73468..329e9fb 100644 --- a/server/queue/queue-api/pom.xml +++ b/server/queue/queue-api/pom.xml @@ -74,6 +74,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/server/queue/queue-file/pom.xml b/server/queue/queue-file/pom.xml index 9e20849..0c5ec56 100644 --- a/server/queue/queue-file/pom.xml +++ b/server/queue/queue-file/pom.xml @@ -79,8 +79,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml index dd8d6d5..a5095fc 100644 --- a/server/queue/queue-jms/pom.xml +++ b/server/queue/queue-jms/pom.xml @@ -91,8 +91,8 @@ <artifactId>protocols-smtp</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/queue/queue-memory/pom.xml b/server/queue/queue-memory/pom.xml index c5ec1d9..2560fc0 100644 --- a/server/queue/queue-memory/pom.xml +++ b/server/queue/queue-memory/pom.xml @@ -46,8 +46,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/server/queue/queue-rabbitmq/pom.xml b/server/queue/queue-rabbitmq/pom.xml index 32c1cd4..f9f60e0 100644 --- a/server/queue/queue-rabbitmq/pom.xml +++ b/server/queue/queue-rabbitmq/pom.xml @@ -122,6 +122,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> @@ -215,10 +220,5 @@ <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/server/task-distributed/pom.xml b/server/task-distributed/pom.xml index 40bf7ba..887ff33 100644 --- a/server/task-distributed/pom.xml +++ b/server/task-distributed/pom.xml @@ -103,6 +103,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> @@ -117,11 +122,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> <scope>test</scope> diff --git a/server/task-json/pom.xml b/server/task-json/pom.xml index 77dd134..b74e6c5 100644 --- a/server/task-json/pom.xml +++ b/server/task-json/pom.xml @@ -57,6 +57,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> diff --git a/server/task/pom.xml b/server/task/pom.xml index 766490a..a5af1d6 100644 --- a/server/task/pom.xml +++ b/server/task/pom.xml @@ -45,6 +45,11 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> </dependency> diff --git a/server/testing/pom.xml b/server/testing/pom.xml index aa68648..459f5cb 100644 --- a/server/testing/pom.xml +++ b/server/testing/pom.xml @@ -45,6 +45,11 @@ <type>test-jar</type> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/event-sourcing/event-sourcing-pojo/pom.xml b/testing/base/pom.xml similarity index 75% copy from event-sourcing/event-sourcing-pojo/pom.xml copy to testing/base/pom.xml index 9a927b6..8cdaf7c 100644 --- a/event-sourcing/event-sourcing-pojo/pom.xml +++ b/testing/base/pom.xml @@ -17,48 +17,44 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> + <artifactId>james-project</artifactId> <groupId>org.apache.james</groupId> - <artifactId>event-sourcing</artifactId> <version>3.5.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>event-sourcing-pojo</artifactId> + <artifactId>testing-base</artifactId> - <name>Apache James :: Event sourcing :: pojo</name> - <description>James event sourcing types</description> + <name>Apache James :: Testing :: Base</name> + <description>Root project for all james modules that run tests</description> <dependencies> <dependency> - <groupId>com.github.steveash.guavate</groupId> - <artifactId>guavate</artifactId> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> </dependency> <dependency> <groupId>nl.jqno.equalsverifier</groupId> <artifactId>equalsverifier</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>org.junit.platform</groupId> <artifactId>junit-platform-launcher</artifactId> - <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> </dependency> </dependencies> diff --git a/testing/base/src/main/resources/logback-test.xml b/testing/base/src/main/resources/logback-test.xml new file mode 100644 index 0000000..0db4a3c --- /dev/null +++ b/testing/base/src/main/resources/logback-test.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8" debug="true" ?> +<configuration> + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> + <file>test-run.log</file> + <append>false</append> + <!-- set immediateFlush to false for much higher logging throughput --> + <immediateFlush>false</immediateFlush> + <!-- encoders are assigned the type + ch.qos.logback.classic.encoder.PatternLayoutEncoder by default --> + <encoder> + <pattern>bloop %d{HH:mm:ss.SSS} [%-5level] %logger{35} - %msg%n%rEx</pattern> + </encoder> + </appender> + + + <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <pattern>bloop %d{HH:mm:ss.SSS} [%-5level] %logger{15} - %msg%n%rEx</pattern> + </encoder> + <immediateFlush>false</immediateFlush> + <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> + <level>ERROR</level> + </filter> + </appender> + + <root level="DEBUG"> + <appender-ref ref="CONSOLE" /> + <appender-ref ref="FILE" /> + </root> + +</configuration> diff --git a/third-party/linshare/pom.xml b/third-party/linshare/pom.xml index 379b8da..4e1e810 100644 --- a/third-party/linshare/pom.xml +++ b/third-party/linshare/pom.xml @@ -51,8 +51,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/third-party/spamassassin/pom.xml b/third-party/spamassassin/pom.xml index 9ac1997..77e5275 100644 --- a/third-party/spamassassin/pom.xml +++ b/third-party/spamassassin/pom.xml @@ -56,6 +56,11 @@ <artifactId>metrics-api</artifactId> </dependency> <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>testing-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.github.fge</groupId> <artifactId>throwing-lambdas</artifactId> </dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org