This is an automated email from the ASF dual-hosted git repository. ieugen pushed a commit to branch JAMES-3260-gradle-poc in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 41087fa57d3f44a3fe0f5ddba360a86d9a647735 Author: Eugen Stan <ieu...@apache.org> AuthorDate: Thu Jun 25 19:25:36 2020 +0300 JAMES-3260 Builds with some tests disables * Search for disabled tests with git grep 'enabled = false' * Tests fail for classpath issues mostly --- mailbox/event/event-memory/build.gradle | 8 ++++ mailbox/jpa/build.gradle | 9 +++- mailbox/lucene/build.gradle | 8 ++++ metrics/metrics-api/build.gradle | 10 ++++- metrics/metrics-dropwizard/build.gradle | 6 +-- metrics/metrics-logger/build.gradle | 4 +- metrics/metrics-tests/build.gradle | 4 +- mpt/impl/imap-mailbox/cassandra/build.gradle | 29 ++++++++++-- mpt/impl/imap-mailbox/cyrus/build.gradle | 23 +++++++++- mpt/impl/imap-mailbox/elasticsearch/build.gradle | 29 ++++++++++-- mpt/impl/imap-mailbox/external-james/build.gradle | 25 +++++++++++ mpt/impl/imap-mailbox/inmemory/build.gradle | 22 ++++++++-- mpt/impl/imap-mailbox/jpa/build.gradle | 20 +++++++-- mpt/impl/imap-mailbox/lucenesearch/build.gradle | 30 +++++++++++-- mpt/impl/imap-mailbox/maildir/build.gradle | 22 +++++++++- mpt/impl/imap-mailbox/rabbitmq/build.gradle | 26 +++++++++-- mpt/impl/managesieve/cassandra/build.gradle | 29 +++++++++--- mpt/impl/managesieve/file/build.gradle | 25 +++++++++-- .../cassandra-rabbitmq-object-storage/build.gradle | 34 ++++++++++++--- mpt/impl/smtp/cassandra/build.gradle | 21 ++++++++- protocols/imap/build.gradle | 13 ++++-- protocols/lmtp/build.gradle | 9 +++- protocols/managesieve/build.gradle | 4 ++ protocols/netty/build.gradle | 9 ++-- protocols/pop3/build.gradle | 6 ++- server/blob/blob-cassandra/build.gradle | 6 +-- server/blob/blob-export-api/build.gradle | 8 ++-- server/blob/blob-memory/build.gradle | 3 +- server/blob/blob-objectstorage/build.gradle | 29 +++++++++--- server/blob/blob-union/build.gradle | 6 ++- server/blob/mail-store/build.gradle | 3 ++ .../guice/blob-objectstorage-guice/build.gradle | 14 +++++- .../container/guice/cassandra-guice/build.gradle | 24 ++++++---- .../guice/cassandra-ldap-guice/build.gradle | 20 ++++++--- .../guice/cassandra-rabbitmq-guice/build.gradle | 29 ++++++++---- .../cassandra-rabbitmq-ldap-guice/build.gradle | 16 ++++--- server/container/guice/configuration/build.gradle | 1 + server/container/guice/jmx/build.gradle | 3 ++ .../container/guice/jpa-common-guice/build.gradle | 7 +++ server/container/guice/jpa-guice/build.gradle | 9 +++- .../container/guice/jpa-smtp-mariadb/build.gradle | 3 ++ server/container/guice/jpa-smtp/build.gradle | 10 ++++- .../build.gradle | 4 ++ .../guice/mailbox-plugin-spamassassin/build.gradle | 4 ++ server/container/guice/mailbox/build.gradle | 5 ++- server/container/guice/mailet/build.gradle | 5 ++- server/container/guice/memory-guice/build.gradle | 5 ++- server/container/guice/onami/build.gradle | 4 ++ server/container/guice/protocols/imap/build.gradle | 4 ++ server/container/guice/rabbitmq/build.gradle | 1 + .../metrics/metrics-es-reporter/build.gradle | 31 +++++++++++-- server/mailet/mock-smtp-server/build.gradle | 10 ++++- .../build.gradle | 39 +++++++++++++---- .../build.gradle | 51 +++++++++++++++++++--- .../build.gradle | 35 ++++++++++++--- .../build.gradle | 38 +++++++++++----- .../build.gradle | 29 +++++++++--- .../build.gradle | 37 +++++++++++++++- .../build.gradle | 21 ++++++++- server/protocols/jmap-rfc-8621/build.gradle | 4 ++ .../build.gradle | 27 +++++++++--- .../memory-webadmin-integration-test/build.gradle | 8 +++- .../webadmin/webadmin-mailrepository/build.gradle | 5 ++- server/testing/build.gradle | 1 - 64 files changed, 821 insertions(+), 163 deletions(-) diff --git a/mailbox/event/event-memory/build.gradle b/mailbox/event/event-memory/build.gradle index b996cb5..0190df4 100644 --- a/mailbox/event/event-memory/build.gradle +++ b/mailbox/event/event-memory/build.gradle @@ -5,6 +5,10 @@ plugins { id 'java-library' } +configurations { + tests +} + dependencies { api project(':apache-james-mailbox:apache-james-mailbox-api') api project(":james-core") @@ -47,4 +51,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/mailbox/jpa/build.gradle b/mailbox/jpa/build.gradle index ee4e4a3..3e9566b 100644 --- a/mailbox/jpa/build.gradle +++ b/mailbox/jpa/build.gradle @@ -18,6 +18,10 @@ plugins { apply plugin: 'openjpa' +configurations { + tests +} + dependencies { api project(':james-core') api project(':apache-james-mailbox:apache-james-mailbox-api') @@ -55,7 +59,6 @@ dependencies { testImplementation project(':james-server:james-server-data-jpa') testImplementation project(':metrics:metrics-tests') - testImplementation 'org.apache.derby:derby:10.14.2.0' testImplementation 'org.mockito:mockito-core:3.0.0' testImplementation 'org.assertj:assertj-core:3.12.2' @@ -86,4 +89,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/mailbox/lucene/build.gradle b/mailbox/lucene/build.gradle index de973c1..dbeb1b8 100644 --- a/mailbox/lucene/build.gradle +++ b/mailbox/lucene/build.gradle @@ -5,6 +5,10 @@ plugins { id 'java-library' } +configurations { + tests +} + dependencies { api project(':james-core') api project(':apache-james-mailbox:apache-james-mailbox-api') @@ -55,4 +59,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/metrics/metrics-api/build.gradle b/metrics/metrics-api/build.gradle index d586be4..5affd6c 100644 --- a/metrics/metrics-api/build.gradle +++ b/metrics/metrics-api/build.gradle @@ -6,11 +6,15 @@ plugins { id 'java-library' } +configurations { + tests +} + dependencies { implementation 'org.apache.commons:commons-lang3:3.9' implementation 'org.reactivestreams:reactive-streams:1.0.3' - + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' @@ -28,4 +32,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/metrics/metrics-dropwizard/build.gradle b/metrics/metrics-dropwizard/build.gradle index 53299fa..ec88fe4 100644 --- a/metrics/metrics-dropwizard/build.gradle +++ b/metrics/metrics-dropwizard/build.gradle @@ -7,7 +7,7 @@ plugins { dependencies { api project(':metrics:metrics-api') - implementation project(':james-server:james-server-lifecycle-api') + api project(':james-server:james-server-lifecycle-api') implementation 'io.dropwizard.metrics:metrics-core:4.1.0' implementation 'io.dropwizard.metrics:metrics-jmx:4.1.0' @@ -17,8 +17,8 @@ dependencies { implementation 'javax.inject:javax.inject:1' implementation 'com.google.guava:guava:25.1-jre' - testImplementation project(':metrics:metrics-api') - testImplementation project(':testing-base') + testImplementation project(path: ':metrics:metrics-api', configuration: 'tests') + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' diff --git a/metrics/metrics-logger/build.gradle b/metrics/metrics-logger/build.gradle index 300674e..56f8315 100644 --- a/metrics/metrics-logger/build.gradle +++ b/metrics/metrics-logger/build.gradle @@ -12,8 +12,8 @@ dependencies { implementation 'io.projectreactor:reactor-core:3.3.4.RELEASE' implementation 'org.slf4j:slf4j-api:1.7.27' - testImplementation project(':metrics:metrics-api') - testImplementation project(':testing-base') + testImplementation project(path: ':metrics:metrics-api', configuration: 'tests') + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' diff --git a/metrics/metrics-tests/build.gradle b/metrics/metrics-tests/build.gradle index ac7b5ea..fb915b7 100644 --- a/metrics/metrics-tests/build.gradle +++ b/metrics/metrics-tests/build.gradle @@ -13,10 +13,10 @@ dependencies { implementation 'io.projectreactor:reactor-core:3.3.4.RELEASE' testImplementation project(':james-server:james-server-util') - testImplementation project(':metrics:metrics-api') - + testImplementation project(path: ':metrics:metrics-api', configuration: 'tests') testImplementation 'org.awaitility:awaitility:3.1.6' + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' diff --git a/mpt/impl/imap-mailbox/cassandra/build.gradle b/mpt/impl/imap-mailbox/cassandra/build.gradle index b70691c..0db5b7f 100644 --- a/mpt/impl/imap-mailbox/cassandra/build.gradle +++ b/mpt/impl/imap-mailbox/cassandra/build.gradle @@ -1,20 +1,41 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { implementation project(':james-backends-common:apache-james-backends-cassandra') implementation project(':apache-james-mailbox:apache-james-mailbox-cassandra') implementation project(':james-server:james-server-blob:blob-cassandra') + implementation 'com.google.inject:guice:4.2.2' - testImplementation project(':james-backends-common:apache-james-backends-cassandra') - testImplementation project(':apache-james-mailbox:apache-james-mailbox-api') - testImplementation project(':apache-james-mailbox:apache-james-mailbox-cassandra') + + testImplementation project(path: ':james-backends-common:apache-james-backends-cassandra', configuration: 'tests') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-api', configuration: 'tests') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-cassandra', configuration: 'tests') testImplementation project(':apache-james-mailbox:apache-james-mailbox-event-memory') testImplementation project(':apache-james-mpt:apache-james-mpt-imapmailbox:apache-james-mpt-imapmailbox-core') testImplementation project(':metrics:metrics-tests') - testImplementation project(':testing-base') + + testImplementation 'com.datastax.cassandra:cassandra-driver-core:3.7.2' + testImplementation 'io.projectreactor:reactor-core:3.3.4.RELEASE' testImplementation 'org.testcontainers:testcontainers:1.12.0' + testImplementation 'org.reactivestreams:reactive-streams:1.0.3' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' +} + +test { + useJUnitPlatform() + failFast = true } description = 'Apache James MPT Imap Mailbox - Cassandra' diff --git a/mpt/impl/imap-mailbox/cyrus/build.gradle b/mpt/impl/imap-mailbox/cyrus/build.gradle index 9f3f73f..23019d2 100644 --- a/mpt/impl/imap-mailbox/cyrus/build.gradle +++ b/mpt/impl/imap-mailbox/cyrus/build.gradle @@ -1,13 +1,34 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { implementation 'org.awaitility:awaitility:3.1.6' implementation 'com.google.inject:guice:4.2.2' implementation 'com.spotify:docker-client:8.16.0' + testImplementation project(':apache-james-mpt:apache-james-mpt-imapmailbox:apache-james-mpt-imapmailbox-core') - testImplementation project(':testing-base') + + testImplementation 'org.apache.commons:commons-lang3:3.9' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' +} + +test { + useJUnitPlatform() + //TODO: @ieugne Part of gradle migration. Disabled temporarily as it fails some tests https://issues.apache.org/jira/browse/JAMES-3260 + enabled = false } description = 'Apache James MPT Imap Mailbox - Cyrus' diff --git a/mpt/impl/imap-mailbox/elasticsearch/build.gradle b/mpt/impl/imap-mailbox/elasticsearch/build.gradle index 57ddb02..6092948 100644 --- a/mpt/impl/imap-mailbox/elasticsearch/build.gradle +++ b/mpt/impl/imap-mailbox/elasticsearch/build.gradle @@ -1,6 +1,13 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { implementation project(':james-backends-common:apache-james-backends-es') @@ -10,12 +17,28 @@ dependencies { implementation project(':apache-james-mailbox:apache-james-mailbox-memory') implementation project(':apache-james-mailbox:apache-james-mailbox-memory') implementation project(':apache-james-mailbox:apache-james-mailbox-store') - testImplementation project(':james-backends-common:apache-james-backends-es') - testImplementation project(':apache-james-mailbox:apache-james-mailbox-event-memory') + + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-api', configuration: 'tests') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-memory', configuration: 'tests') + testImplementation project(path: ':james-backends-common:apache-james-backends-es', configuration: 'tests') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-memory', configuration: 'tests') +// testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-event-memory', configuration: 'tests') testImplementation project(':apache-james-mpt:apache-james-mpt-imapmailbox:apache-james-mpt-imapmailbox-core') testImplementation project(':james-server:james-server-testing') testImplementation project(':metrics:metrics-tests') - testImplementation project(':testing-base') + + testImplementation 'org.apache.commons:commons-lang3:3.9' + testImplementation 'javax.inject:javax.inject:1' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' +} + +test { + useJUnitPlatform() } description = 'Apache James MPT Imap Mailbox - ElasticSearch' diff --git a/mpt/impl/imap-mailbox/external-james/build.gradle b/mpt/impl/imap-mailbox/external-james/build.gradle index 69c0318..9297581 100644 --- a/mpt/impl/imap-mailbox/external-james/build.gradle +++ b/mpt/impl/imap-mailbox/external-james/build.gradle @@ -1,14 +1,39 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { implementation project(':apache-james-mailbox:apache-james-mailbox-api') implementation project(':apache-james-mpt:apache-james-mpt-core') + implementation 'ch.qos.logback:logback-classic:1.2.3' implementation 'com.google.inject:guice:4.2.2' implementation 'org.apache.commons:commons-lang3:3.9' + testImplementation project(':james-server:james-server-testing') + + testImplementation 'commons-net:commons-net:3.6' + testImplementation 'org.awaitility:awaitility:3.1.6' + testImplementation 'org.testcontainers:testcontainers:1.12.0' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' +} + +test { + //TODO: @ieugen: Disabled temporarily because they require an environment variable: JAMES_ADDRESS=127.0.0.1 https://issues.apache.org/jira/browse/JAMES-3260 + enabled = false + useJUnitPlatform() } description = 'Apache James MPT Imap Mailbox - External James' diff --git a/mpt/impl/imap-mailbox/inmemory/build.gradle b/mpt/impl/imap-mailbox/inmemory/build.gradle index 8637206..78b466c 100644 --- a/mpt/impl/imap-mailbox/inmemory/build.gradle +++ b/mpt/impl/imap-mailbox/inmemory/build.gradle @@ -1,14 +1,30 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { - testImplementation project(':apache-james-mailbox:apache-james-mailbox-api') - testImplementation project(':apache-james-mailbox:apache-james-mailbox-memory') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-api', configuration: 'tests') testImplementation project(':apache-james-mailbox:apache-james-mailbox-memory') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-memory', configuration: 'tests') testImplementation project(':apache-james-mpt:apache-james-mpt-imapmailbox:apache-james-mpt-imapmailbox-core') testImplementation project(':metrics:metrics-tests') - testImplementation project(':testing-base') + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' +} + +test { + useJUnitPlatform() } description = 'Apache James MPT Imap Mailbox - InMemory' diff --git a/mpt/impl/imap-mailbox/jpa/build.gradle b/mpt/impl/imap-mailbox/jpa/build.gradle index e466c9f..b500b6d 100644 --- a/mpt/impl/imap-mailbox/jpa/build.gradle +++ b/mpt/impl/imap-mailbox/jpa/build.gradle @@ -3,18 +3,32 @@ */ dependencies { - testImplementation project(':james-backends-common:apache-james-backends-jpa') - testImplementation project(':apache-james-mailbox:apache-james-mailbox-api') + testImplementation project(path: ':james-backends-common:apache-james-backends-jpa', configuration: 'tests') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-api', configuration: 'tests') testImplementation project(':apache-james-mailbox:apache-james-mailbox-event-memory') testImplementation project(':apache-james-mailbox:apache-james-mailbox-jpa') - testImplementation project(':apache-james-mailbox:apache-james-mailbox-jpa') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-jpa', configuration: 'tests') testImplementation project(':apache-james-mailbox:apache-james-mailbox-store') testImplementation project(':apache-james-mpt:apache-james-mpt-imapmailbox:apache-james-mpt-imapmailbox-core') testImplementation project(':metrics:metrics-tests') testImplementation 'org.apache.derby:derby:10.14.2.0' + testImplementation 'com.google.guava:guava:25.1-jre' + testImplementation 'io.projectreactor:reactor-core:3.3.4.RELEASE' + testImplementation 'org.apache.openjpa:openjpa:3.1.0' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' } +test { + useJUnitPlatform() +} + + description = 'Apache James MPT Imap Mailbox - JPA' tasks.register('testsJar', Jar) { diff --git a/mpt/impl/imap-mailbox/lucenesearch/build.gradle b/mpt/impl/imap-mailbox/lucenesearch/build.gradle index b99169b..42db5ae 100644 --- a/mpt/impl/imap-mailbox/lucenesearch/build.gradle +++ b/mpt/impl/imap-mailbox/lucenesearch/build.gradle @@ -1,19 +1,39 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { implementation project(':apache-james-mailbox:apache-james-mailbox-api') - implementation project(':apache-james-mailbox:apache-james-mailbox-api') implementation project(':apache-james-mailbox:apache-james-mailbox-event-memory') implementation project(':apache-james-mailbox:apache-james-mailbox-memory') - implementation project(':apache-james-mailbox:apache-james-mailbox-memory') - implementation project(':apache-james-mailbox:apache-james-mailbox-lucene') implementation project(':apache-james-mailbox:apache-james-mailbox-lucene') implementation project(':apache-james-mailbox:apache-james-mailbox-store') + + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-api', configuration: 'tests') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-memory', configuration: 'tests') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-lucene', configuration: 'tests') testImplementation project(':apache-james-mpt:apache-james-mpt-imapmailbox:apache-james-mpt-imapmailbox-core') testImplementation project(':metrics:metrics-tests') + testImplementation 'org.apache.commons:commons-lang3:3.9' + testImplementation 'com.github.fge:throwing-lambdas:0.5.0' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' +} + +test { + useJUnitPlatform() } description = 'Apache James MPT Imap Mailbox - LuceneSearch' @@ -23,4 +43,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/mpt/impl/imap-mailbox/maildir/build.gradle b/mpt/impl/imap-mailbox/maildir/build.gradle index f011f1c..1974234 100644 --- a/mpt/impl/imap-mailbox/maildir/build.gradle +++ b/mpt/impl/imap-mailbox/maildir/build.gradle @@ -1,16 +1,36 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { - testImplementation project(':apache-james-mailbox:apache-james-mailbox-api') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-api', configuration: 'tests') testImplementation project(':apache-james-mailbox:apache-james-mailbox-event-memory') testImplementation project(':apache-james-mailbox:apache-james-mailbox-maildir') testImplementation project(':apache-james-mpt:apache-james-mpt-imapmailbox:apache-james-mpt-imapmailbox-core') testImplementation project(':metrics:metrics-tests') + testImplementation 'org.apache.commons:commons-lang3:3.9' + testImplementation 'commons-io:commons-io:2.6' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' } +test { + useJUnitPlatform() +} + + description = 'Apache James MPT Imap Mailbox - Maildir' tasks.register('testsJar', Jar) { diff --git a/mpt/impl/imap-mailbox/rabbitmq/build.gradle b/mpt/impl/imap-mailbox/rabbitmq/build.gradle index bbc361a..ad78623 100644 --- a/mpt/impl/imap-mailbox/rabbitmq/build.gradle +++ b/mpt/impl/imap-mailbox/rabbitmq/build.gradle @@ -1,20 +1,40 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { implementation project(':james-backends-common:apache-james-backends-rabbitmq') - testImplementation project(':james-backends-common:apache-james-backends-rabbitmq') - testImplementation project(':apache-james-mailbox:apache-james-mailbox-api') + + testImplementation project(path: ':james-backends-common:apache-james-backends-rabbitmq', configuration: 'tests') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-api', configuration: 'tests') testImplementation project(':apache-james-mailbox:apache-james-mailbox-api') + testImplementation project(':apache-james-mailbox:apache-james-mailbox-event-memory') testImplementation project(':apache-james-mailbox:apache-james-mailbox-event-rabbitmq') - testImplementation project(':apache-james-mailbox:apache-james-mailbox-memory') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-memory', configuration: 'tests') testImplementation project(':apache-james-mailbox:apache-james-mailbox-memory') testImplementation project(':apache-james-mpt:apache-james-mpt-imapmailbox:apache-james-mpt-imapmailbox-core') testImplementation project(':james-server:james-server-testing') testImplementation project(':metrics:metrics-tests') testImplementation 'org.testcontainers:testcontainers:1.12.0' + testImplementation 'com.google.guava:guava:25.1-jre' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' +} + +test { + useJUnitPlatform() } description = 'Apache James MPT Imap Mailbox - RabbitMQ EventBus' diff --git a/mpt/impl/managesieve/cassandra/build.gradle b/mpt/impl/managesieve/cassandra/build.gradle index 4911d05..da7fc59 100644 --- a/mpt/impl/managesieve/cassandra/build.gradle +++ b/mpt/impl/managesieve/cassandra/build.gradle @@ -1,15 +1,34 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { - implementation project(':james-backends-common:apache-james-backends-cassandra') - implementation project(':james-backends-common:apache-james-backends-cassandra') - implementation project(':apache-james-mpt:apache-james-mpt-managesieve:apache-james-mpt-managesieve-core') - implementation project(':james-server:james-server-data-cassandra') - testImplementation project(':testing-base') + testImplementation project(path: ':james-backends-common:apache-james-backends-cassandra', configuration: 'tests') + testImplementation project(':james-backends-common:apache-james-backends-cassandra') + testImplementation project(':apache-james-mpt:apache-james-mpt-managesieve:apache-james-mpt-managesieve-core') + testImplementation project(':james-server:james-server-data-cassandra') + + testImplementation 'com.datastax.cassandra:cassandra-driver-core:3.7.2' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' +} + +test { + useJUnitPlatform() } + description = 'Apache James MPT ManageSieve Cassandra' tasks.register('testsJar', Jar) { diff --git a/mpt/impl/managesieve/file/build.gradle b/mpt/impl/managesieve/file/build.gradle index 0c520c6..9f480c7 100644 --- a/mpt/impl/managesieve/file/build.gradle +++ b/mpt/impl/managesieve/file/build.gradle @@ -1,14 +1,33 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { - implementation project(':apache-james-mpt:apache-james-mpt-managesieve:apache-james-mpt-managesieve-core') - implementation project(':james-server:james-server-data-file') - implementation project(':james-server:james-server-data-memory') + testImplementation project(':apache-james-mpt:apache-james-mpt-managesieve:apache-james-mpt-managesieve-core') + testImplementation project(':james-server:james-server-data-file') + testImplementation project(':james-server:james-server-data-memory') + + testImplementation 'commons-io:commons-io:2.6' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' } +test { + useJUnitPlatform() +} + + description = 'Apache James MPT ManageSieve File' tasks.register('testsJar', Jar) { diff --git a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/build.gradle b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/build.gradle index 685e319..c58dc22 100644 --- a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/build.gradle +++ b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/build.gradle @@ -1,22 +1,44 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { implementation project(':apache-james-mpt:apache-james-mpt-core') implementation project(':james-server:james-server-guice:james-server-cassandra-rabbitmq-guice') + implementation 'com.google.guava:guava:25.1-jre' implementation 'com.google.inject:guice:4.2.2' - testImplementation project(':james-backends-common:apache-james-backends-cassandra') - testImplementation project(':james-backends-common:apache-james-backends-rabbitmq') - testImplementation project(':james-server:james-server-blob:blob-objectstorage') - testImplementation project(':james-server:james-server-guice:blob-objectstorage-guice') + + testImplementation project(path: ':james-backends-common:apache-james-backends-cassandra', configuration: 'tests') + testImplementation project(path: ':james-backends-common:apache-james-backends-rabbitmq', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-blob:blob-objectstorage', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:blob-objectstorage-guice', configuration: 'tests') testImplementation project(':apache-james-mpt:apache-james-mpt-smtp:apache-james-mpt-smtp-core') - testImplementation project(':james-server:james-server-guice:james-server-cassandra-rabbitmq-guice') - testImplementation project(':james-server:james-server-guice:james-server-guice-common') + testImplementation project(path: ':james-server:james-server-guice:james-server-cassandra-rabbitmq-guice', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-common', configuration: 'tests') testImplementation project(':james-server:james-server-guice:james-server-guice-jmap') testImplementation project(':james-server:james-server-util') + testImplementation 'org.apache.commons:commons-configuration2:2.7' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' +} + +test { + useJUnitPlatform() + // TODO: @ieugen Disabled temporarily. Fails with class not found https://issues.apache.org/jira/browse/JAMES-3260 + enabled = false } description = 'Apache James MPT SMTP Cassandra RabbitMQ Object Storage' diff --git a/mpt/impl/smtp/cassandra/build.gradle b/mpt/impl/smtp/cassandra/build.gradle index 69a52e7..8e176fe 100644 --- a/mpt/impl/smtp/cassandra/build.gradle +++ b/mpt/impl/smtp/cassandra/build.gradle @@ -1,17 +1,36 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { implementation project(':james-server:james-server-guice:james-server-cassandra-guice') implementation 'com.google.guava:guava:25.1-jre' - testImplementation project(':james-backends-common:apache-james-backends-cassandra') + + testImplementation project(path: ':james-backends-common:apache-james-backends-cassandra', configuration: 'tests') testImplementation project(':apache-james-mpt:apache-james-mpt-smtp:apache-james-mpt-smtp-core') testImplementation project(':james-server:james-server-guice:james-server-cassandra-guice') testImplementation project(':james-server:james-server-guice:james-server-guice-common') testImplementation project(':james-server:james-server-guice:james-server-guice-jmap') testImplementation project(':james-server:james-server-util') + testImplementation 'org.apache.commons:commons-configuration2:2.7' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' +} + +test { + useJUnitPlatform() } description = 'Apache James MPT SMTP Cassandra' diff --git a/protocols/imap/build.gradle b/protocols/imap/build.gradle index 328bfaf..05afaff 100644 --- a/protocols/imap/build.gradle +++ b/protocols/imap/build.gradle @@ -11,12 +11,11 @@ configurations { dependencies { api project(':apache-james-mailbox:apache-james-mailbox-api') + api project(':james-core') + api project(':james-server:james-server-util') api project(':metrics:metrics-api') api project(':protocols:protocols-api') - implementation project(':james-core') - implementation project(':james-server:james-server-util') - implementation 'org.apache.james:apache-mime4j-core:0.8.3' implementation 'org.apache.james:apache-mime4j-dom:0.8.3' @@ -31,15 +30,21 @@ dependencies { implementation 'org.apache.commons:commons-lang3:3.9' implementation 'org.slf4j:slf4j-api:1.7.27' - testImplementation project(':apache-james-mailbox:apache-james-mailbox-api') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-api', configuration: 'tests') + testImplementation project(':apache-james-mailbox:apache-james-mailbox-event-memory') testImplementation project(':apache-james-mailbox:apache-james-mailbox-store') + testImplementation project(':james-server:james-server-data-memory') testImplementation project(':metrics:metrics-tests') + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.mockito:mockito-core:3.0.0' + testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.1.9' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' } test { diff --git a/protocols/lmtp/build.gradle b/protocols/lmtp/build.gradle index c8760b5..005e941 100644 --- a/protocols/lmtp/build.gradle +++ b/protocols/lmtp/build.gradle @@ -20,15 +20,20 @@ dependencies { implementation 'com.google.guava:guava:25.1-jre' testImplementation project(':metrics:metrics-tests') - testImplementation project(':protocols:protocols-api') + testImplementation project(path: ':protocols:protocols-api', configuration: 'tests') testImplementation project(':protocols:protocols-netty') - testImplementation project(':protocols:protocols-smtp') + testImplementation project(path: ':protocols:protocols-smtp', configuration: 'tests') + testImplementation 'io.netty:netty:3.10.6.Final' testImplementation 'commons-net:commons-net:3.6' + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' + } test { diff --git a/protocols/managesieve/build.gradle b/protocols/managesieve/build.gradle index 3457496..0c7db7f 100644 --- a/protocols/managesieve/build.gradle +++ b/protocols/managesieve/build.gradle @@ -20,9 +20,13 @@ dependencies { implementation 'javax.annotation:javax.annotation-api:1.3.2' implementation 'javax.inject:javax.inject:1' + testImplementation 'org.assertj:assertj-core:3.12.2' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' } test { diff --git a/protocols/netty/build.gradle b/protocols/netty/build.gradle index ee41785..1709726 100644 --- a/protocols/netty/build.gradle +++ b/protocols/netty/build.gradle @@ -10,23 +10,24 @@ configurations { } dependencies { + api project(':james-core') api project(':protocols:protocols-api') + api project(':james-server:james-server-util') - implementation project(':james-core') - implementation project(':james-server:james-server-util') + api 'io.netty:netty:3.10.6.Final' implementation 'com.google.guava:guava:25.1-jre' - implementation 'io.netty:netty:3.10.6.Final' implementation 'org.apache.commons:commons-lang3:3.9' implementation 'org.slf4j:slf4j-api:1.7.27' implementation 'javax.inject:javax.inject:1' - testImplementation project(':testing-base') testImplementation 'org.mockito:mockito-core:3.0.0' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' } test { diff --git a/protocols/pop3/build.gradle b/protocols/pop3/build.gradle index 40734a0..64cb068 100644 --- a/protocols/pop3/build.gradle +++ b/protocols/pop3/build.gradle @@ -17,15 +17,19 @@ dependencies { implementation 'com.google.guava:guava:25.1-jre' implementation 'org.slf4j:slf4j-api:1.7.27' - testImplementation project(':protocols:protocols-api') + testImplementation project(path: ':protocols:protocols-api', configuration: 'tests') testImplementation project(':protocols:protocols-netty') + testImplementation 'com.github.steveash.guavate:guavate:1.0.0' testImplementation 'commons-net:commons-net:3.6' testImplementation 'org.mockito:mockito-core:3.0.0' + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' } test { diff --git a/server/blob/blob-cassandra/build.gradle b/server/blob/blob-cassandra/build.gradle index cfdaad1..84c56d4 100644 --- a/server/blob/blob-cassandra/build.gradle +++ b/server/blob/blob-cassandra/build.gradle @@ -25,14 +25,14 @@ dependencies { implementation 'org.apache.commons:commons-configuration2:2.7' implementation 'com.github.fge:throwing-lambdas:0.5.0' - testImplementation project(':james-backends-common:apache-james-backends-cassandra') - testImplementation project(':james-server:james-server-blob:blob-api') + testImplementation project(path: ':james-backends-common:apache-james-backends-cassandra', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-blob:blob-api', configuration: 'tests') testImplementation project(':metrics:metrics-tests') - testImplementation project(':testing-base') testImplementation 'org.awaitility:awaitility:3.1.6' testImplementation 'org.testcontainers:testcontainers:1.12.0' testImplementation 'org.mockito:mockito-core:3.0.0' + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' diff --git a/server/blob/blob-export-api/build.gradle b/server/blob/blob-export-api/build.gradle index 327c5c3..dec20ef 100644 --- a/server/blob/blob-export-api/build.gradle +++ b/server/blob/blob-export-api/build.gradle @@ -10,14 +10,16 @@ configurations { } dependencies { + api project(':james-core') api project(':james-server:james-server-blob:blob-api') - implementation project(':james-core') - implementation 'org.apache.commons:commons-lang3:3.9' implementation 'com.google.guava:guava:25.1-jre' - testImplementation project(':james-server:james-server-blob:blob-api') + testImplementation project(path: ':james-server:james-server-blob:blob-api', configuration: 'tests') + + testImplementation 'org.assertj:assertj-core:3.12.2' + testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.1.9' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' diff --git a/server/blob/blob-memory/build.gradle b/server/blob/blob-memory/build.gradle index fe3303f..fb9940d 100644 --- a/server/blob/blob-memory/build.gradle +++ b/server/blob/blob-memory/build.gradle @@ -17,12 +17,13 @@ dependencies { implementation 'com.google.guava:guava:25.1-jre' implementation 'javax.inject:javax.inject:1' - testImplementation project(':james-server:james-server-blob:blob-api') + testImplementation project(path: ':james-server:james-server-blob:blob-api', configuration: 'tests') testImplementation project(':james-server:james-server-util') testImplementation project(':metrics:metrics-tests') testImplementation 'org.awaitility:awaitility:3.1.6' testImplementation 'org.mockito:mockito-core:3.0.0' + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' diff --git a/server/blob/blob-objectstorage/build.gradle b/server/blob/blob-objectstorage/build.gradle index fe8d912..4599a12 100644 --- a/server/blob/blob-objectstorage/build.gradle +++ b/server/blob/blob-objectstorage/build.gradle @@ -20,21 +20,40 @@ dependencies { implementation 'com.google.guava:guava:25.1-jre' implementation 'io.projectreactor:reactor-core:3.3.4.RELEASE' implementation 'org.apache.commons:commons-lang3:3.9' - implementation 'org.apache.jclouds.api:openstack-swift:2.1.2' - implementation 'org.apache.jclouds.api:s3:2.1.2' - implementation 'org.apache.jclouds.driver:jclouds-slf4j:2.1.2' + implementation('org.apache.jclouds.api:openstack-swift:2.1.2') { + exclude group: 'com.google.inject', module: 'guice' + } + implementation ('org.apache.jclouds.api:s3:2.1.2') { + exclude group: 'com.google.inject', module: 'guice' + } + implementation ('org.apache.jclouds.driver:jclouds-slf4j:2.1.2') implementation 'org.slf4j:jcl-over-slf4j:1.7.27' implementation 'org.slf4j:slf4j-api:1.7.27' - testImplementation project(':james-server:james-server-blob:blob-api') - testImplementation project(':metrics:metrics-tests') + testImplementation project(path: ':james-server:james-server-blob:blob-api', configuration: 'tests') + testImplementation project(':james-server:james-server-core') testImplementation project(':james-server:james-server-testing') + testImplementation project(':metrics:metrics-tests') + + testImplementation 'org.assertj:assertj-core:3.12.2' + testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.1.9' testImplementation 'org.awaitility:awaitility:3.1.6' testImplementation 'org.testcontainers:testcontainers:1.12.0' testImplementation 'org.mockito:mockito-core:3.0.0' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' +// testCompileOnly 'junit:junit:4.13' +// testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' } +test { + useJUnitPlatform() +} + + description = 'Apache James :: Server :: Blob :: Object storage' tasks.register('testsJar', Jar) { diff --git a/server/blob/blob-union/build.gradle b/server/blob/blob-union/build.gradle index fca76df..a3ddf92 100644 --- a/server/blob/blob-union/build.gradle +++ b/server/blob/blob-union/build.gradle @@ -18,10 +18,14 @@ dependencies { implementation 'org.apache.commons:commons-configuration2:2.7' implementation 'org.slf4j:jcl-over-slf4j:1.7.27' - testImplementation project(':james-server:james-server-blob:blob-api') + testImplementation project(path: ':james-server:james-server-blob:blob-api', configuration: 'tests') testImplementation project(':james-server:james-server-blob:blob-memory') testImplementation project(':james-server:james-server-testing') + testImplementation 'com.github.fge:throwing-lambdas:0.5.0' + testImplementation 'org.assertj:assertj-core:3.12.2' + testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.1.9' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' diff --git a/server/blob/mail-store/build.gradle b/server/blob/mail-store/build.gradle index d918861..ba8a1f8 100644 --- a/server/blob/mail-store/build.gradle +++ b/server/blob/mail-store/build.gradle @@ -23,7 +23,10 @@ dependencies { testImplementation project(':james-server:james-server-blob:blob-memory') testImplementation project(':james-core') + testImplementation 'io.projectreactor:reactor-core:3.3.4.RELEASE' + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.testcontainers:testcontainers:1.12.0' + testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.1.9' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' diff --git a/server/container/guice/blob-objectstorage-guice/build.gradle b/server/container/guice/blob-objectstorage-guice/build.gradle index 64ce392..8aa4b50 100644 --- a/server/container/guice/blob-objectstorage-guice/build.gradle +++ b/server/container/guice/blob-objectstorage-guice/build.gradle @@ -15,12 +15,16 @@ dependencies { api project(':james-server:james-server-guice:james-server-guice-configuration') implementation 'com.google.inject:guice:4.2.2' + implementation 'org.apache.commons:commons-configuration2:2.7' - testImplementation project(':james-server:james-server-blob:blob-objectstorage') - testImplementation project(':james-server:james-server-guice:james-server-guice-common') + testImplementation project(path: ':james-server:james-server-blob:blob-objectstorage', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-common', configuration: 'tests') testImplementation project(':james-server:james-server-testing') + testImplementation 'com.google.inject:guice:4.2.2' + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.testcontainers:testcontainers:1.12.0' + testImplementation 'org.reactivestreams:reactive-streams:1.0.3' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' @@ -29,6 +33,8 @@ dependencies { test { useJUnitPlatform() + //TODO: @ieugen: Disabled temporarily. Fails with java.lang.NoClassDefFoundError . Part of https://issues.apache.org/jira/browse/JAMES-3260 + enabled = false } description = 'Apache James :: Server :: Blob Store in object storage - guice injection' @@ -38,4 +44,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/server/container/guice/cassandra-guice/build.gradle b/server/container/guice/cassandra-guice/build.gradle index 907e2df..9632b94 100644 --- a/server/container/guice/cassandra-guice/build.gradle +++ b/server/container/guice/cassandra-guice/build.gradle @@ -58,29 +58,31 @@ dependencies { implementation 'com.linagora:logback-elasticsearch-appender:1.8.0' implementation 'com.google.inject:guice:4.2.2' implementation 'com.github.fge:throwing-lambdas:0.5.0' + implementation 'com.google.guava:guava:25.1-jre' implementation 'com.google.inject:guice:4.2.2' implementation 'com.datastax.cassandra:cassandra-driver-core:3.7.2' + implementation 'org.apache.commons:commons-configuration2:2.7' implementation 'org.awaitility:awaitility:3.1.6' - testImplementation project(':james-backends-common:apache-james-backends-cassandra') - testImplementation project(':james-backends-common:apache-james-backends-es') + testImplementation project(path: ':james-backends-common:apache-james-backends-cassandra', configuration: 'tests') + testImplementation project(path: ':james-backends-common:apache-james-backends-es', configuration: 'tests') testImplementation project(':apache-james-mailbox:apache-james-mailbox-cassandra') testImplementation project(':apache-james-mailbox:apache-james-mailbox-elasticsearch') - testImplementation project(':apache-james-mailbox:apache-james-mailbox-scanning-search') - testImplementation project(':apache-james-mailbox:apache-james-mailbox-tika') - testImplementation project(':third-party:apache-james-spamassassin') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-scanning-search', configuration: 'tests') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-tika', configuration: 'tests') testImplementation project(':event-sourcing:event-sourcing-event-store-cassandra') - testImplementation project(':james-server:james-server-guice:james-server-guice-common') - testImplementation project(':james-server:james-server-guice:james-server-guice-jmap') - testImplementation project(':james-server:jmap-draft-integration-testing:james-server-jmap-draft-integration-testing') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-common', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-jmap', configuration: 'tests') + testImplementation project(path: ':james-server:jmap-draft-integration-testing:james-server-jmap-draft-integration-testing', configuration: 'tests') testImplementation project(':james-server:james-server-testing') testImplementation project(':james-server:james-server-webadmin-core') - + testImplementation project(path: ':third-party:apache-james-spamassassin', configuration: 'tests') testImplementation 'io.rest-assured:rest-assured:4.0.0' testImplementation 'org.apache.pdfbox:pdfbox:2.0.16' testImplementation 'org.mockito:mockito-core:3.0.0' testImplementation 'org.testcontainers:testcontainers:1.12.0' + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' @@ -98,4 +100,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/server/container/guice/cassandra-ldap-guice/build.gradle b/server/container/guice/cassandra-ldap-guice/build.gradle index 76ead41..cd4ea74 100644 --- a/server/container/guice/cassandra-ldap-guice/build.gradle +++ b/server/container/guice/cassandra-ldap-guice/build.gradle @@ -16,19 +16,21 @@ dependencies { api project(':james-server:james-server-guice:james-server-guice-common') implementation 'com.google.inject:guice:4.2.2' - - testImplementation project(':james-backends-common:apache-james-backends-cassandra') - testImplementation project(':james-backends-common:apache-james-backends-es') - testImplementation project(':james-server:james-server-guice:james-server-cassandra-guice') - testImplementation project(':james-server:james-server-data-ldap') - testImplementation project(':james-server:james-server-guice:james-server-guice-common') - testImplementation project(':james-server:james-server-guice:james-server-guice-jmap') + implementation 'org.apache.commons:commons-configuration2:2.7' + + testImplementation project(path: ':james-backends-common:apache-james-backends-cassandra', configuration: 'tests') + testImplementation project(path: ':james-backends-common:apache-james-backends-es', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-cassandra-guice', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-data-ldap', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-common', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-jmap', configuration: 'tests') testImplementation project(':james-server:james-server-testing') testImplementation project(':james-server:james-server-util') testImplementation 'io.rest-assured:rest-assured:4.0.0' testImplementation 'org.awaitility:awaitility:3.1.6' testImplementation 'org.testcontainers:testcontainers:1.12.0' + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' @@ -47,4 +49,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/server/container/guice/cassandra-rabbitmq-guice/build.gradle b/server/container/guice/cassandra-rabbitmq-guice/build.gradle index 1a93697..1abb45e 100644 --- a/server/container/guice/cassandra-rabbitmq-guice/build.gradle +++ b/server/container/guice/cassandra-rabbitmq-guice/build.gradle @@ -19,28 +19,33 @@ dependencies { implementation 'com.github.fge:throwing-lambdas:0.5.0' implementation 'com.google.inject:guice:4.2.2' + implementation 'org.apache.commons:commons-configuration2:2.7' - testImplementation project(':james-backends-common:apache-james-backends-cassandra') - testImplementation project(':james-backends-common:apache-james-backends-es') - testImplementation project(':james-backends-common:apache-james-backends-rabbitmq') + testImplementation project(path: ':james-backends-common:apache-james-backends-cassandra', configuration: 'tests') + testImplementation project(path: ':james-backends-common:apache-james-backends-es', configuration: 'tests') + testImplementation project(path: ':james-backends-common:apache-james-backends-rabbitmq', configuration: 'tests') testImplementation project(':apache-james-mailbox:apache-james-mailbox-cassandra') testImplementation project(':apache-james-mailbox:apache-james-mailbox-elasticsearch') testImplementation project(':apache-james-mailbox:apache-james-mailbox-scanning-search') testImplementation project(':apache-james-mailbox:apache-james-mailbox-tika') - testImplementation project(':james-server:james-server-blob:blob-objectstorage') - testImplementation project(':james-server:james-server-guice:blob-objectstorage-guice') - testImplementation project(':james-server:james-server-guice:james-server-cassandra-guice') - testImplementation project(':james-server:james-server-guice:james-server-guice-common') - testImplementation project(':james-server:james-server-guice:james-server-guice-jmap') + testImplementation project(path: ':james-server:james-server-blob:blob-objectstorage', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:blob-objectstorage-guice', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-cassandra-guice', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-common', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-jmap', configuration: 'tests') testImplementation project(':james-server:jmap-draft-integration-testing:james-server-jmap-draft-integration-testing') testImplementation project(':james-server:james-server-testing') testImplementation project(':james-server:james-server-util') - testImplementation project(':james-server:james-server-webadmin-core') + testImplementation project(path: ':james-server:james-server-webadmin-core', configuration: 'tests') + testImplementation 'com.google.inject:guice:4.2.2' testImplementation 'io.rest-assured:rest-assured:4.0.0' testImplementation 'org.apache.pdfbox:pdfbox:2.0.16' testImplementation 'org.mockito:mockito-core:3.0.0' testImplementation 'org.testcontainers:testcontainers:1.12.0' + testImplementation 'org.assertj:assertj-core:3.12.2' + testImplementation 'org.awaitility:awaitility:3.1.6' + testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.1.9' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' @@ -49,6 +54,8 @@ dependencies { test { useJUnitPlatform() + //TODO: @ieugen: Temporarily disabled. Failes to load classes at runtime. Part of https://issues.apache.org/jira/browse/JAMES-3258 + enabled = false } description = 'Apache James :: Server :: Cassandra with RabbitMQ - guice injection' @@ -58,4 +65,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/build.gradle b/server/container/guice/cassandra-rabbitmq-ldap-guice/build.gradle index d4bc4cd..099527a 100644 --- a/server/container/guice/cassandra-rabbitmq-ldap-guice/build.gradle +++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/build.gradle @@ -21,14 +21,16 @@ dependencies { testImplementation project(':james-backends-common:apache-james-backends-rabbitmq') testImplementation project(':james-server:james-server-blob:blob-objectstorage') testImplementation project(':james-server:james-server-guice:blob-objectstorage-guice') - testImplementation project(':james-server:james-server-guice:james-server-cassandra-guice') - testImplementation project(':james-server:james-server-guice:james-server-cassandra-ldap-guice') - testImplementation project(':james-server:james-server-guice:james-server-cassandra-rabbitmq-guice') - testImplementation project(':james-server:james-server-data-ldap') - testImplementation project(':james-server:james-server-guice:james-server-guice-common') - testImplementation project(':james-server:james-server-guice:james-server-guice-jmap') + testImplementation project(path: ':james-server:james-server-guice:james-server-cassandra-guice', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-cassandra-ldap-guice', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-cassandra-rabbitmq-guice', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-data-ldap', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-common', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-jmap', configuration: 'tests') testImplementation project(':james-server:james-server-testing') + testImplementation 'org.assertj:assertj-core:3.12.2' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' @@ -36,6 +38,8 @@ dependencies { test { useJUnitPlatform() + //TODO: @ieugen: Temporarily disabled. Fails to load classes at runtime. Part of https://issues.apache.org/jira/browse/JAMES-3258 + enabled = false } description = 'Apache James :: Server :: Cassandra/Ldap with RabbitMQ - guice injection' diff --git a/server/container/guice/configuration/build.gradle b/server/container/guice/configuration/build.gradle index 71f4049..f8705ae 100644 --- a/server/container/guice/configuration/build.gradle +++ b/server/container/guice/configuration/build.gradle @@ -21,6 +21,7 @@ dependencies { implementation 'org.slf4j:slf4j-api:1.7.27' testImplementation 'com.github.stefanbirkner:system-rules:1.19.0' + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' diff --git a/server/container/guice/jmx/build.gradle b/server/container/guice/jmx/build.gradle index 7dc4ac2..8720917 100644 --- a/server/container/guice/jmx/build.gradle +++ b/server/container/guice/jmx/build.gradle @@ -28,6 +28,9 @@ dependencies { implementation 'org.apache.commons:commons-configuration2:2.7' implementation 'org.slf4j:slf4j-api:1.7.27' + testImplementation 'org.assertj:assertj-core:3.12.2' + testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.1.9' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' diff --git a/server/container/guice/jpa-common-guice/build.gradle b/server/container/guice/jpa-common-guice/build.gradle index 827a825..da9bf64 100644 --- a/server/container/guice/jpa-common-guice/build.gradle +++ b/server/container/guice/jpa-common-guice/build.gradle @@ -15,8 +15,11 @@ dependencies { api project(':james-server:james-server-guice:james-server-guice-common') implementation 'com.google.inject:guice:4.2.2' + implementation 'org.apache.commons:commons-configuration2:2.7' + implementation 'org.slf4j:slf4j-api:1.7.27' testImplementation 'org.apache.derby:derby:10.14.2.0' + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' @@ -34,4 +37,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/server/container/guice/jpa-guice/build.gradle b/server/container/guice/jpa-guice/build.gradle index 16d890e..a93ee16 100644 --- a/server/container/guice/jpa-guice/build.gradle +++ b/server/container/guice/jpa-guice/build.gradle @@ -42,20 +42,25 @@ dependencies { implementation 'org.awaitility:awaitility:3.1.6' testImplementation project(':apache-james-mailbox:apache-james-mailbox-jpa') - testImplementation project(':james-server:james-server-guice:james-server-guice-common') - testImplementation project(':james-server:james-server-guice:james-server-jpa-common-guice') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-common', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-jpa-common-guice', configuration: 'tests') testImplementation project(':james-server:james-server-testing') testImplementation 'io.rest-assured:rest-assured:4.0.0' + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.mockito:mockito-core:3.0.0' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' } test { useJUnitPlatform() + // TODO: @ieugen: Disabled temporarily. Fails with ` Database connection refused.` Part of https://issues.apache.org/jira/browse/JAMES-3260 + enabled = false } description = 'Apache James :: Server :: JPA - guice injection' diff --git a/server/container/guice/jpa-smtp-mariadb/build.gradle b/server/container/guice/jpa-smtp-mariadb/build.gradle index 387262c..5f1ca12 100644 --- a/server/container/guice/jpa-smtp-mariadb/build.gradle +++ b/server/container/guice/jpa-smtp-mariadb/build.gradle @@ -17,8 +17,11 @@ dependencies { testImplementation project(':james-backends-common:apache-james-backends-jpa') testImplementation project(':james-server:james-server-guice:james-server-guice-common') + testImplementation project(':james-server:james-server-guice:james-server-guice-smtp') + testImplementation project(':james-server:james-server-guice:james-server-jpa-common-guice') testImplementation 'org.apache.derby:derby:10.14.2.0' + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.testcontainers:mariadb:1.12.0' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' diff --git a/server/container/guice/jpa-smtp/build.gradle b/server/container/guice/jpa-smtp/build.gradle index 0fa7ac9..4599d7e 100644 --- a/server/container/guice/jpa-smtp/build.gradle +++ b/server/container/guice/jpa-smtp/build.gradle @@ -16,17 +16,23 @@ dependencies { implementation 'org.apache.derby:derby:10.14.2.0' - testImplementation project(':james-backends-common:apache-james-backends-jpa') - testImplementation project(':james-server:james-server-guice:james-server-jpa-common-guice') + testImplementation project(path: ':james-backends-common:apache-james-backends-jpa', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-jpa-common-guice', configuration: 'tests') + testImplementation project(':james-server:james-server-data-jpa') testImplementation project(':james-server:james-server-guice:james-server-guice-common') + testImplementation project(':james-server:james-server-guice:james-server-guice-smtp') + testImplementation 'org.apache.openjpa:openjpa:3.1.0' testImplementation 'io.rest-assured:rest-assured:4.0.0' testImplementation 'org.awaitility:awaitility:3.1.6' + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.mockito:mockito-core:3.0.0' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' } test { diff --git a/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/build.gradle b/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/build.gradle index 3037bea..4f72542 100644 --- a/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/build.gradle +++ b/server/container/guice/mailbox-plugin-deleted-messages-vault-guice/build.gradle @@ -36,4 +36,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/server/container/guice/mailbox-plugin-spamassassin/build.gradle b/server/container/guice/mailbox-plugin-spamassassin/build.gradle index cd86e1b..83d5416 100644 --- a/server/container/guice/mailbox-plugin-spamassassin/build.gradle +++ b/server/container/guice/mailbox-plugin-spamassassin/build.gradle @@ -19,9 +19,13 @@ dependencies { implementation 'org.slf4j:jcl-over-slf4j:1.7.27' implementation 'org.slf4j:log4j-over-slf4j:1.7.27' + testImplementation 'org.assertj:assertj-core:3.12.2' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' } test { diff --git a/server/container/guice/mailbox/build.gradle b/server/container/guice/mailbox/build.gradle index c73d12c..96b5e59 100644 --- a/server/container/guice/mailbox/build.gradle +++ b/server/container/guice/mailbox/build.gradle @@ -30,10 +30,13 @@ dependencies { implementation 'com.google.inject:guice:4.2.2' implementation 'org.slf4j:slf4j-api:1.7.27' - testImplementation project(':apache-james-mailbox:apache-james-mailbox-api') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-api', configuration: 'tests') testImplementation project(':metrics:metrics-tests') + testImplementation 'io.projectreactor:reactor-core:3.3.4.RELEASE' testImplementation 'org.mockito:mockito-core:3.0.0' + testImplementation 'org.assertj:assertj-core:3.12.2' + testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.1.9' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' diff --git a/server/container/guice/mailet/build.gradle b/server/container/guice/mailet/build.gradle index 8dea8e1..9791ec6 100644 --- a/server/container/guice/mailet/build.gradle +++ b/server/container/guice/mailet/build.gradle @@ -27,13 +27,16 @@ dependencies { implementation 'org.slf4j:slf4j-api:1.7.27' testImplementation project(':apache-mailet:apache-mailet-test') - testImplementation project(':james-server:james-server-filesystem-api') + testImplementation project(path: ':james-server:james-server-filesystem-api', configuration: 'tests') testImplementation 'org.mockito:mockito-core:3.0.0' + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' } test { diff --git a/server/container/guice/memory-guice/build.gradle b/server/container/guice/memory-guice/build.gradle index bb8f66a..d81de63 100644 --- a/server/container/guice/memory-guice/build.gradle +++ b/server/container/guice/memory-guice/build.gradle @@ -49,13 +49,14 @@ dependencies { implementation 'org.apache.commons:commons-configuration2:2.7' implementation 'com.google.inject:guice:4.2.2' - testImplementation project(':third-party:apache-james-linshare') + testImplementation project(':apache-james-mailbox:backup') testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-scanning-search', configuration: 'tests') testImplementation project(path: ':james-server:james-server-guice:blob-export-guice', configuration: 'tests') testImplementation project(path: ':james-server:james-server-guice:james-server-guice-common', configuration: 'tests') testImplementation project(path: ':james-server:james-server-guice:james-server-guice-jmap', configuration: 'tests') testImplementation project(':james-server:james-server-testing') testImplementation project(path: ':james-server:james-server-webadmin-core', configuration: 'tests') + testImplementation project(':third-party:apache-james-linshare') testImplementation 'io.rest-assured:rest-assured:4.0.0' testImplementation 'org.apache.pdfbox:pdfbox:2.0.16' @@ -70,6 +71,8 @@ dependencies { test { useJUnitPlatform() + //TODO: @Ieugen: Disabled temporarily . Part of https://issues.apache.org/jira/browse/JAMES-3260 + enabled = false } description = 'Apache James :: Server :: Memory - guice injection' diff --git a/server/container/guice/onami/build.gradle b/server/container/guice/onami/build.gradle index 22c2b37..3465728 100644 --- a/server/container/guice/onami/build.gradle +++ b/server/container/guice/onami/build.gradle @@ -13,9 +13,13 @@ dependencies { implementation 'com.google.inject:guice:4.2.2' implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation 'org.assertj:assertj-core:3.12.2' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' } test { diff --git a/server/container/guice/protocols/imap/build.gradle b/server/container/guice/protocols/imap/build.gradle index 97e001b..1464864 100644 --- a/server/container/guice/protocols/imap/build.gradle +++ b/server/container/guice/protocols/imap/build.gradle @@ -33,4 +33,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/server/container/guice/rabbitmq/build.gradle b/server/container/guice/rabbitmq/build.gradle index 6679721..61e7def 100644 --- a/server/container/guice/rabbitmq/build.gradle +++ b/server/container/guice/rabbitmq/build.gradle @@ -16,6 +16,7 @@ dependencies { api project(':james-server:james-server-queue-rabbitmq') implementation 'com.google.inject:guice:4.2.2' + implementation 'org.apache.commons:commons-configuration2:2.7' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' diff --git a/server/container/metrics/metrics-es-reporter/build.gradle b/server/container/metrics/metrics-es-reporter/build.gradle index 264a0c0..f2afadc 100644 --- a/server/container/metrics/metrics-es-reporter/build.gradle +++ b/server/container/metrics/metrics-es-reporter/build.gradle @@ -1,23 +1,44 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { - implementation project(':james-core') - implementation project(':james-server:james-server-lifecycle-api') + api project(':james-core') + api project(':james-server:james-server-lifecycle-api') + implementation 'com.google.guava:guava:25.1-jre' implementation 'com.linagora:metrics-elasticsearch-reporter:6.0.0-RC3' implementation 'io.dropwizard.metrics:metrics-core:4.1.0' implementation 'javax.annotation:javax.annotation-api:1.3.2' implementation 'javax.inject:javax.inject:1' + testImplementation project(':james-backends-common:apache-james-backends-es') - testImplementation project(':james-backends-common:apache-james-backends-es') + testImplementation project(path: ':james-backends-common:apache-james-backends-es', configuration: 'tests') testImplementation project(':james-server:james-server-testing') testImplementation project(':metrics:metrics-dropwizard') + testImplementation 'org.awaitility:awaitility:3.1.6' testImplementation 'io.rest-assured:rest-assured:4.0.0' testImplementation 'org.slf4j:jcl-over-slf4j:1.7.27' testImplementation 'org.testcontainers:testcontainers:1.12.0' + testImplementation 'org.assertj:assertj-core:3.12.2' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' +// testCompileOnly 'junit:junit:4.13' +// testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' +} + +test { + useJUnitPlatform() } description = 'Apache James :: Server :: Metrics ElasticSearch Reporter' @@ -27,4 +48,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/server/mailet/mock-smtp-server/build.gradle b/server/mailet/mock-smtp-server/build.gradle index b9e8f40..38000d3 100644 --- a/server/mailet/mock-smtp-server/build.gradle +++ b/server/mailet/mock-smtp-server/build.gradle @@ -28,13 +28,21 @@ dependencies { implementation 'org.slf4j:slf4j-api:1.7.27' implementation 'org.subethamail:subethasmtp:3.1.7' + testImplementation project(':apache-mailet:apache-mailet-api') + testImplementation project(':apache-mailet:apache-mailet-test') + + testImplementation 'commons-net:commons-net:3.6' + testImplementation 'com.github.fge:throwing-lambdas:0.5.0' testImplementation 'io.rest-assured:rest-assured:4.0.0' - testImplementation 'net.javacrumbs.json-unit:json-unit-assertj:2.8.0' testImplementation 'org.awaitility:awaitility:3.1.6' + testImplementation 'org.assertj:assertj-core:3.12.2' + testImplementation 'net.javacrumbs.json-unit:json-unit-assertj:2.8.0' + testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.1.9' implementation 'org.testcontainers:testcontainers:1.12.0' implementation 'junit:junit:4.13' implementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' // TODO: Move test helpers to java-test-fixtures and change this back to runtimeOnly diff --git a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/build.gradle b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/build.gradle index 8a7a9bd..b2b7450 100644 --- a/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/build.gradle +++ b/server/protocols/jmap-draft-integration-testing/cassandra-jmap-draft-integration-testing/build.gradle @@ -1,31 +1,41 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { implementation project(':james-server:james-server-dnsservice-test') - testImplementation project(':james-backends-common:apache-james-backends-es') - testImplementation project(':james-backends-common:apache-james-backends-cassandra') + + testImplementation project(path: ':james-backends-common:apache-james-backends-es', configuration: 'tests') + testImplementation project(path: ':james-backends-common:apache-james-backends-cassandra', configuration: 'tests') testImplementation project(':apache-james-mailbox:apache-james-mailbox-api') testImplementation project(':apache-james-mailbox:apache-james-mailbox-elasticsearch') - testImplementation project(':apache-james-mailbox:apache-james-mailbox-scanning-search') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-scanning-search', configuration: 'tests') testImplementation project(':apache-james-mailbox:apache-james-mailbox-spamassassin') testImplementation project(':apache-james-mailbox:apache-james-mailbox-tika') testImplementation project(':apache-mailet:apache-mailet-base') testImplementation project(':james-server:james-server-guice:blob-export-guice') testImplementation project(':james-server:james-server-guice:blob-objectstorage-guice') testImplementation project(':james-server:james-server-blob:blob-objectstorage') - testImplementation project(':james-server:james-server-guice:blob-objectstorage-guice') + testImplementation project(path: ':james-server:james-server-guice:blob-objectstorage-guice', configuration: 'tests') testImplementation project(':james-server:james-server-guice:james-server-cassandra-guice') - testImplementation project(':james-server:james-server-guice:james-server-cassandra-guice') - testImplementation project(':james-server:james-server-guice:james-server-guice-common') - testImplementation project(':james-server:james-server-guice:james-server-guice-jmap') - testImplementation project(':james-server:jmap-draft-integration-testing:james-server-jmap-draft-integration-testing') + testImplementation project(path: ':james-server:james-server-guice:james-server-cassandra-guice', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-common', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-jmap', configuration: 'tests') + testImplementation project(path: ':james-server:jmap-draft-integration-testing:james-server-jmap-draft-integration-testing', configuration: 'tests') testImplementation project(':third-party:apache-james-spamassassin') testImplementation project(':james-server:james-server-testing') testImplementation project(':james-server:james-server-util') testImplementation project(':javax-mail-extension') - testImplementation project(':testing-base') + + testImplementation 'org.apache.james:apache-mime4j-dom:0.8.3' + testImplementation 'com.github.fge:throwing-lambdas:0.5.0' testImplementation 'io.cucumber:cucumber-guice:2.4.0' testImplementation 'io.cucumber:cucumber-java:2.4.0' testImplementation 'io.cucumber:cucumber-junit:2.4.0' @@ -34,6 +44,17 @@ dependencies { testImplementation 'org.apache.pdfbox:pdfbox:2.0.16' testImplementation 'org.hamcrest:java-hamcrest:2.0.0.0' testImplementation 'org.testcontainers:testcontainers:1.12.0' + testImplementation 'org.assertj:assertj-core:3.12.2' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' +} + +test { + useJUnitPlatform() } description = 'Apache James :: Server :: JMAP (draft) :: Cassandra Integration testing' diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/build.gradle b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/build.gradle index f93bfa2..d22c713 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/build.gradle +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/build.gradle @@ -1,34 +1,67 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { implementation 'com.google.guava:guava:25.1-jre' implementation 'com.jayway.jsonpath:json-path:2.4.0' implementation 'org.apache.commons:commons-text:1.8' - testImplementation project(':apache-james-mailbox:apache-james-mailbox-api') + + testImplementation project(':apache-mailet:apache-mailet-test') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-api', configuration: 'tests') testImplementation project(':apache-james-mailbox:apache-james-mailbox-spamassassin') testImplementation project(':apache-james-mailbox:backup') + testImplementation project(':james-core') + testImplementation project(':james-server:james-server-core') + testImplementation project(':james-server:james-server-jmap-draft') testImplementation project(':james-server:james-server-data-jmap') testImplementation project(':james-server:james-server-dnsservice-test') testImplementation project(':james-server:james-server-guice:james-server-guice-common') - testImplementation project(':james-server:james-server-guice:james-server-guice-common') - testImplementation project(':james-server:james-server-guice:james-server-guice-jmap') - testImplementation project(':james-server:james-server-guice:james-server-guice-imap') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-common', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-jmap') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-jmap', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-imap') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-imap', configuration: 'tests') testImplementation project(':james-server:james-server-guice:james-server-guice-mailbox') testImplementation project(':james-server:james-server-guice:james-server-guice-smtp') testImplementation project(':james-server:james-server-guice:james-server-guice-webadmin') - testImplementation project(':third-party:apache-james-spamassassin') + testImplementation project(path: ':third-party:apache-james-spamassassin', configuration: 'tests') testImplementation project(':james-server:james-server-mailets') testImplementation project(':james-server:james-server-testing') - testImplementation project(':testing-base') + + testImplementation 'com.github.fge:throwing-lambdas:0.5.0' + testImplementation 'com.github.steveash.guavate:guavate:1.0.0' + testImplementation 'com.google.guava:guava:25.1-jre' + testImplementation 'commons-io:commons-io:2.6' + testImplementation 'commons-net:commons-net:3.6' + testImplementation 'io.projectreactor:reactor-core:3.3.4.RELEASE' testImplementation 'io.cucumber:cucumber-guice:2.4.0' testImplementation 'io.cucumber:cucumber-java:2.4.0' testImplementation 'io.cucumber:cucumber-junit:2.4.0' testImplementation 'io.rest-assured:rest-assured:4.0.0' - testImplementation 'net.javacrumbs.json-unit:json-unit-assertj:2.8.0' + testImplementation 'org.apache.commons:commons-configuration2:2.7' + testImplementation 'org.awaitility:awaitility:3.1.6' testImplementation 'org.hamcrest:java-hamcrest:2.0.0.0' testImplementation 'org.testcontainers:testcontainers:1.12.0' + testImplementation 'net.javacrumbs.json-unit:json-unit-assertj:2.8.0' + testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.9' + testImplementation 'org.apache.james:apache-mime4j-dom:0.8.3' + testImplementation 'org.reactivestreams:reactive-streams:1.0.3' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' +} + +test { + useJUnitPlatform() } description = 'Apache James :: Server :: JMAP (draft) :: Integration testing Common' @@ -38,4 +71,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/build.gradle b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/build.gradle index 4d53f7a..199c4ca 100644 --- a/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/build.gradle +++ b/server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/build.gradle @@ -1,25 +1,36 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { implementation project(':james-server:james-server-dnsservice-test') + implementation 'org.hamcrest:java-hamcrest:2.0.0.0' + + testImplementation project(':apache-james-mailbox:backup') testImplementation project(':apache-james-mailbox:apache-james-mailbox-api') - testImplementation project(':apache-james-mailbox:apache-james-mailbox-scanning-search') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-scanning-search', configuration: 'tests') testImplementation project(':apache-james-mailbox:apache-james-mailbox-spamassassin') testImplementation project(':apache-mailet:apache-mailet-base') testImplementation project(':james-server:james-server-guice:blob-export-guice') - testImplementation project(':james-server:james-server-guice:james-server-guice-common') - testImplementation project(':james-server:james-server-guice:james-server-guice-jmap') - testImplementation project(':james-server:jmap-draft-integration-testing:james-server-jmap-draft-integration-testing') - testImplementation project(':james-server:james-server-guice:james-server-memory-guice') - testImplementation project(':third-party:apache-james-spamassassin') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-common', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-jmap', configuration: 'tests') + testImplementation project(path: ':james-server:jmap-draft-integration-testing:james-server-jmap-draft-integration-testing', configuration: 'tests') testImplementation project(':james-server:james-server-guice:james-server-memory-guice') + testImplementation project(path: ':james-server:james-server-guice:james-server-memory-guice', configuration: 'tests') testImplementation project(':james-server:james-server-testing') testImplementation project(':james-server:james-server-util') testImplementation project(':javax-mail-extension') - testImplementation project(':testing-base') + testImplementation project(':third-party:apache-james-spamassassin') + + testImplementation 'com.google.guava:guava:25.1-jre' testImplementation 'io.cucumber:cucumber-guice:2.4.0' testImplementation 'io.cucumber:cucumber-java:2.4.0' testImplementation 'io.cucumber:cucumber-junit:2.4.0' @@ -27,6 +38,16 @@ dependencies { testImplementation 'net.javacrumbs.json-unit:json-unit-assertj:2.8.0' testImplementation 'org.apache.pdfbox:pdfbox:2.0.16' testImplementation 'org.testcontainers:testcontainers:1.12.0' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' +} + +test { + useJUnitPlatform() + // TODO: @ieugen: Disabled temporarily. Related to https://issues.apache.org/jira/browse/JAMES-3260 + enabled = false } description = 'Apache James :: Server :: JMAP (draft) :: Memory Integration testing' diff --git a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/build.gradle b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/build.gradle index 28912a1..9830e35 100644 --- a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/build.gradle +++ b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/build.gradle @@ -1,25 +1,33 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { - testImplementation project(':james-backends-common:apache-james-backends-cassandra') - testImplementation project(':james-backends-common:apache-james-backends-es') - testImplementation project(':james-backends-common:apache-james-backends-rabbitmq') + testImplementation project(path: ':james-backends-common:apache-james-backends-cassandra', configuration: 'tests') + testImplementation project(path: ':james-backends-common:apache-james-backends-es', configuration: 'tests') + testImplementation project(path: ':james-backends-common:apache-james-backends-rabbitmq', configuration: 'tests') testImplementation project(':apache-james-mailbox:apache-james-mailbox-api') - testImplementation project(':apache-james-mailbox:apache-james-mailbox-scanning-search') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-scanning-search', configuration: 'tests') testImplementation project(':third-party:apache-james-spamassassin') testImplementation project(':james-server:james-server-blob:blob-objectstorage') - testImplementation project(':james-server:james-server-guice:blob-objectstorage-guice') + testImplementation project(path: ':james-server:james-server-guice:blob-objectstorage-guice', configuration: 'tests') testImplementation project(':james-server:james-server-dnsservice-test') - testImplementation project(':james-server:james-server-guice:james-server-cassandra-guice') - testImplementation project(':james-server:james-server-guice:james-server-cassandra-rabbitmq-guice') + testImplementation project(path: ':james-server:james-server-guice:james-server-cassandra-guice', configuration: 'tests') testImplementation project(':james-server:james-server-guice:james-server-cassandra-rabbitmq-guice') - testImplementation project(':james-server:jmap-draft-integration-testing:james-server-jmap-draft-integration-testing') - testImplementation project(':james-server:james-server-guice:james-server-guice-common') - testImplementation project(':james-server:james-server-guice:james-server-guice-jmap') + testImplementation project(path: ':james-server:james-server-guice:james-server-cassandra-rabbitmq-guice', configuration: 'tests') + testImplementation project(path: ':james-server:jmap-draft-integration-testing:james-server-jmap-draft-integration-testing', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-common', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-jmap', configuration: 'tests') testImplementation project(':james-server:james-server-testing') + testImplementation 'com.github.fge:throwing-lambdas:0.5.0' testImplementation 'io.cucumber:cucumber-guice:2.4.0' testImplementation 'io.cucumber:cucumber-java:2.4.0' testImplementation 'io.cucumber:cucumber-junit:2.4.0' @@ -28,6 +36,16 @@ dependencies { testImplementation 'org.apache.pdfbox:pdfbox:2.0.16' testImplementation 'org.hamcrest:java-hamcrest:2.0.0.0' testImplementation 'org.testcontainers:testcontainers:1.12.0' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' +} + +test { + useJUnitPlatform() + // TODO: @ieugen: Disabled temporarily. Related to https://issues.apache.org/jira/browse/JAMES-3260 + enabled = false } description = 'Apache James :: Server :: JMAP (draft) :: RabbitMQ + Object Store + Cassandra Integration testing' diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/build.gradle b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/build.gradle index a837e23..74e040f 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/build.gradle +++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/build.gradle @@ -1,20 +1,37 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { - testImplementation project(':james-backends-common:apache-james-backends-cassandra') - testImplementation project(':james-backends-common:apache-james-backends-es') + testImplementation project(path: ':james-backends-common:apache-james-backends-cassandra', configuration: 'tests') + testImplementation project(path: ':james-backends-common:apache-james-backends-es', configuration: 'tests') testImplementation project(':james-backends-common:apache-james-backends-rabbitmq') testImplementation project(':james-server:james-server-blob:blob-objectstorage') testImplementation project(':james-server:james-server-guice:blob-objectstorage-guice') - testImplementation project(':james-server:james-server-guice:james-server-cassandra-guice') - testImplementation project(':james-server:james-server-guice:james-server-cassandra-rabbitmq-guice') + testImplementation project(path: ':james-server:james-server-guice:james-server-cassandra-guice', configuration: 'tests') testImplementation project(':james-server:james-server-guice:james-server-cassandra-rabbitmq-guice') - testImplementation project(':james-server:james-server-guice:james-server-guice-common') - testImplementation project(':james-server:james-server-guice:james-server-guice-jmap') + testImplementation project(path: ':james-server:james-server-guice:james-server-cassandra-rabbitmq-guice', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-common', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-jmap', configuration: 'tests') testImplementation project(':james-server:james-server-testing') testImplementation project(':james-server:jmap-rfc-8621-integration-tests:jmap-rfc-8621-integration-tests-common') + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' +} + +test { + useJUnitPlatform() + // TODO: @ieugen: Disabled temporarily. Related to https://issues.apache.org/jira/browse/JAMES-3260 + enabled = false } description = 'Apache James :: Server :: JMAP RFC-8621 :: Distributed Integration Testing' diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/build.gradle b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/build.gradle index 59395c3..e9b41b7 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/build.gradle +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/build.gradle @@ -1,14 +1,49 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' + id 'scala' +} + +configurations { + tests +} dependencies { implementation project(':james-server:james-server-guice:james-server-guice-common') implementation project(':james-server:james-server-guice:james-server-guice-jmap') - implementation project(':testing-base') + + //TODO: @ieugen: this uses code from netty 4 and we use netty 3 !!!! + implementation 'io.netty:netty-codec-http:4.1.48.Final' + + implementation 'org.apache.james:apache-mime4j-dom:0.8.3' implementation 'com.typesafe.play:play-json_2.13:2.8.1' implementation 'io.rest-assured:rest-assured:4.0.0' implementation 'net.javacrumbs.json-unit:json-unit-assertj:2.8.0' + + implementation 'junit:junit:4.13' + implementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1' +} + +test { + useJUnitPlatform() +} + +// https://stackoverflow.com/questions/23261075/compiling-scala-before-alongside-java-with-gradle +sourceSets { + main { + scala { + srcDirs = ['src/main/scala', 'src/main/java'] + } + java { + srcDirs = [] + } + } } description = 'Apache James :: Server :: JMAP RFC-8621 :: Contract for Integration Testing' diff --git a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/build.gradle b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/build.gradle index 83e8e73..df0b43b 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/build.gradle +++ b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/build.gradle @@ -1,12 +1,29 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-library' +} + +configurations { + tests +} dependencies { - testImplementation project(':james-server:james-server-guice:james-server-guice-common') - testImplementation project(':james-server:james-server-guice:james-server-guice-jmap') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-common', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-jmap', configuration: 'tests') testImplementation project(':james-server:james-server-guice:james-server-memory-guice') testImplementation project(':james-server:jmap-rfc-8621-integration-tests:jmap-rfc-8621-integration-tests-common') + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' +} + +test { + useJUnitPlatform() + // TODO: @ieugen: Disabled temporarily. Related to https://issues.apache.org/jira/browse/JAMES-3260 + enabled = false } description = 'Apache James :: Server :: JMAP RFC-8621 :: Memory Integration Testing' diff --git a/server/protocols/jmap-rfc-8621/build.gradle b/server/protocols/jmap-rfc-8621/build.gradle index 55fa946..c231429 100644 --- a/server/protocols/jmap-rfc-8621/build.gradle +++ b/server/protocols/jmap-rfc-8621/build.gradle @@ -67,4 +67,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/build.gradle b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/build.gradle index 8fae01f..9ee251a 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/build.gradle +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/build.gradle @@ -10,24 +10,41 @@ configurations { } dependencies { - testImplementation project(':james-backends-common:apache-james-backends-cassandra') - testImplementation project(':james-backends-common:apache-james-backends-rabbitmq') + testImplementation project(':apache-mailet:apache-mailet-test') + testImplementation project(path: ':james-backends-common:apache-james-backends-es', configuration: 'tests') + testImplementation project(path: ':james-backends-common:apache-james-backends-cassandra', configuration: 'tests') + testImplementation project(path: ':james-backends-common:apache-james-backends-rabbitmq', configuration: 'tests') testImplementation project(':apache-james-mailbox:apache-james-mailbox-elasticsearch') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-scanning-search', configuration: 'tests') testImplementation project(':james-server:james-server-blob:blob-objectstorage') - testImplementation project(':james-server:james-server-guice:blob-objectstorage-guice') - testImplementation project(':james-server:james-server-guice:james-server-cassandra-guice') - testImplementation project(':james-server:james-server-guice:james-server-cassandra-rabbitmq-guice') + testImplementation project(path: ':james-server:james-server-guice:blob-objectstorage-guice', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-jmap', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-cassandra-guice', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:blob-export-guice', configuration: 'tests') testImplementation project(':james-server:james-server-guice:james-server-cassandra-rabbitmq-guice') + testImplementation project(path: ':james-server:james-server-guice:james-server-cassandra-rabbitmq-guice', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-mailbox-plugin-deleted-messages-vault-guice', configuration: 'tests') testImplementation project(':james-server:james-server-webadmin-cassandra-data') testImplementation project(':james-server:webadmin-integration-test:james-server-webadmin-integration-test-common') + testImplementation 'org.apache.james:apache-mime4j-dom:0.8.3' + testImplementation 'com.datastax.cassandra:cassandra-driver-core:3.7.2' + testImplementation 'com.github.fge:throwing-lambdas:0.5.0' + testImplementation 'io.rest-assured:rest-assured:4.0.0' + testImplementation 'org.awaitility:awaitility:3.1.6' + testImplementation 'org.assertj:assertj-core:3.12.2' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testCompileOnly 'junit:junit:4.13' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' } test { useJUnitPlatform() + //TODO @Ieugen: Disabled temporarily. Hangs. + enabled = false } diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/build.gradle b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/build.gradle index 6a6bb08..53b4088 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/build.gradle +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/build.gradle @@ -11,8 +11,12 @@ configurations { dependencies { testImplementation project(':james-server:james-server-guice:james-server-memory-guice') - testImplementation project(':james-server:james-server-guice:james-server-memory-guice') + testImplementation project(path: ':james-server:james-server-guice:blob-export-guice', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-cassandra-guice', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-memory-guice', configuration: 'tests') + testImplementation project(path: ':james-server:james-server-guice:james-server-guice-jmap', configuration: 'tests') testImplementation project(':james-server:webadmin-integration-test:james-server-webadmin-integration-test-common') + testImplementation project(path: ':james-server:james-server-guice:james-server-mailbox-plugin-deleted-messages-vault-guice', configuration: 'tests') testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' @@ -21,6 +25,8 @@ dependencies { test { useJUnitPlatform() + //TODO: @ieugen Disabled temporarily. https://issues.apache.org/jira/browse/JAMES-3260 + enabled = false } description = 'Apache James :: Server :: Web Admin server integration tests :: Memory' diff --git a/server/protocols/webadmin/webadmin-mailrepository/build.gradle b/server/protocols/webadmin/webadmin-mailrepository/build.gradle index 0a844d5..e8befc6 100644 --- a/server/protocols/webadmin/webadmin-mailrepository/build.gradle +++ b/server/protocols/webadmin/webadmin-mailrepository/build.gradle @@ -55,7 +55,6 @@ test { useJUnitPlatform() } - description = 'Apache James :: Server :: Web Admin :: MailRepository' tasks.register('testsJar', Jar) { @@ -63,4 +62,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/server/testing/build.gradle b/server/testing/build.gradle index 65d808c..c5148e7 100644 --- a/server/testing/build.gradle +++ b/server/testing/build.gradle @@ -9,7 +9,6 @@ dependencies { implementation project(':apache-james-mailbox:apache-james-mailbox-api') implementation project(':apache-mailet:apache-mailet-api') implementation project(':apache-mailet:apache-mailet-test') - implementation project(':testing-base') implementation 'org.junit.jupiter:junit-jupiter-api:5.5.1' implementation 'org.junit.jupiter:junit-jupiter-params:5.5.1' --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org