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 f474d88d50fd5722fb433a46aa1f6f3ada83a441 Author: Eugen Stan <ieu...@apache.org> AuthorDate: Sun Jun 21 11:58:45 2020 +0300 JAMES-3260 Builds up to :apache-james-mailbox:backup:compileJava * Using same assertj version as maven --- backends-common/cassandra/build.gradle | 22 ++++++++++++++++++++++ core/build.gradle | 2 +- json/build.gradle | 8 ++++++++ mailbox/api/build.gradle | 13 ++++++++++--- mailbox/cassandra/build.gradle | 30 +++++++++++++++++++++++++----- mailbox/store/build.gradle | 23 ++++++++++++++++++++++- mailbox/tools/quota-recompute/build.gradle | 18 +++++++++++++++++- mdn/build.gradle | 2 +- 8 files changed, 106 insertions(+), 12 deletions(-) diff --git a/backends-common/cassandra/build.gradle b/backends-common/cassandra/build.gradle index f8c6d77..48f05a5 100644 --- a/backends-common/cassandra/build.gradle +++ b/backends-common/cassandra/build.gradle @@ -1,6 +1,13 @@ /* * This file was generated by the Gradle 'init' task. */ +plugins { + id 'java-test-fixtures' +} + +configurations { + tests +} dependencies { implementation project(':james-core') @@ -28,11 +35,22 @@ dependencies { testImplementation project(':james-server:james-server-task-memory') testImplementation project(':testing-base') + testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.9.9' testImplementation 'commons-beanutils:commons-beanutils:1.9.4' testImplementation 'net.javacrumbs.json-unit:json-unit-assertj:2.8.0' testImplementation 'org.hamcrest:java-hamcrest:2.0.0.0' testImplementation 'org.mockito:mockito-core:3.0.0' 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' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' +} + +test { + useJUnitPlatform() } description = 'Apache James Cassandra backend' @@ -42,4 +60,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/core/build.gradle b/core/build.gradle index e98d634..d12464c 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -14,7 +14,7 @@ dependencies { testImplementation project(':james-server:james-server-util') testImplementation project(':testing-base') - testImplementation 'org.assertj:assertj-core:3.16.1' + 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' diff --git a/json/build.gradle b/json/build.gradle index 0287d31..634a1a6 100644 --- a/json/build.gradle +++ b/json/build.gradle @@ -2,6 +2,10 @@ * This file was generated by the Gradle 'init' task. */ +configurations { + tests +} + dependencies { implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.9' implementation 'com.fasterxml.jackson.datatype:jackson-datatype-guava:2.9.9' @@ -32,4 +36,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/mailbox/api/build.gradle b/mailbox/api/build.gradle index 2466237..d8ae3b4 100644 --- a/mailbox/api/build.gradle +++ b/mailbox/api/build.gradle @@ -2,6 +2,10 @@ * This file was generated by the Gradle 'init' task. */ +configurations { + tests +} + dependencies { implementation project(':james-core') implementation project(':james-server:james-server-task-api') @@ -21,16 +25,15 @@ dependencies { testImplementation project(':james-server:james-server-task-memory') testImplementation project(':metrics:metrics-tests') testImplementation project(':testing-base') + testImplementation project(":james-server:james-server-util") testImplementation 'org.awaitility:awaitility:3.1.6' testImplementation 'org.hamcrest:java-hamcrest:2.0.0.0' testImplementation 'org.mockito:mockito-core:3.0.0' - testImplementation 'org.assertj:assertj-core:3.16.1' + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.1.9' - testImplementation project(":james-server:james-server-util") - 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' @@ -47,4 +50,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/mailbox/cassandra/build.gradle b/mailbox/cassandra/build.gradle index 11149cf..50edcac 100644 --- a/mailbox/cassandra/build.gradle +++ b/mailbox/cassandra/build.gradle @@ -28,24 +28,44 @@ dependencies { implementation 'javax.inject:javax.inject:1' implementation 'org.slf4j:slf4j-api:1.7.27' - testImplementation project(':james-backends-common:apache-james-backends-cassandra') - testImplementation project(':apache-james-mailbox:apache-james-mailbox-api') + 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-store', configuration: 'tests') + testImplementation project(path: ':james-json', configuration: 'tests') + testImplementation project(':apache-james-mailbox:apache-james-mailbox-event-memory') - testImplementation project(':apache-james-mailbox:apache-james-mailbox-store') - testImplementation project(':apache-james-mailbox:apache-james-mailbox-tools-quota-recompute') testImplementation project(':apache-james-mailbox:apache-james-mailbox-tools-quota-recompute') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-tools-quota-recompute', configuration: 'tests') + testImplementation project(':james-server:james-server-lifecycle-api') testImplementation project(':james-server:james-server-blob:blob-cassandra') - testImplementation project(':james-json') + testImplementation project(':james-server:james-server-data-api') + testImplementation project(':james-server:james-server-data-library') testImplementation project(':james-server:james-server-data-cassandra') testImplementation project(':james-server:james-server-task-memory') + testImplementation project(':metrics:metrics-api') testImplementation project(':metrics:metrics-tests') testImplementation project(':testing-base') + testImplementation project(":james-server:james-server-util") + testImplementation 'org.apache.james:apache-mime4j-dom:0.8.3' testImplementation 'com.google.inject:guice:4.2.2' testImplementation 'net.javacrumbs.json-unit:json-unit-assertj:2.8.0' testImplementation 'org.awaitility:awaitility:3.1.6' testImplementation 'org.mockito:mockito-core:3.0.0' testImplementation 'org.testcontainers:testcontainers:1.12.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' + // TODO: Move test helpers to java-test-fixtures and change this back to runtimeOnly + // testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.1' + testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.5.1' +} + +test { + useJUnitPlatform() } description = 'Apache James :: Mailbox :: Cassandra' diff --git a/mailbox/store/build.gradle b/mailbox/store/build.gradle index 81aff0e..440e47f 100644 --- a/mailbox/store/build.gradle +++ b/mailbox/store/build.gradle @@ -2,6 +2,10 @@ * This file was generated by the Gradle 'init' task. */ +configurations { + tests +} + dependencies { implementation project(':apache-james-mailbox:apache-james-mailbox-api') implementation project(':apache-james-mailbox:apache-james-mailbox-event-memory') @@ -26,14 +30,27 @@ dependencies { implementation 'io.projectreactor:reactor-core:3.3.4.RELEASE' implementation 'com.github.fge:throwing-lambdas:0.5.0' - testImplementation project(':apache-james-mailbox:apache-james-mailbox-api') + testImplementation project(path: ':apache-james-mailbox:apache-james-mailbox-api', configuration: 'tests') testImplementation project(':james-mdn') + testImplementation project(':james-json') testImplementation project(':metrics:metrics-tests') testImplementation project(':testing-base') testImplementation 'net.javacrumbs.json-unit:json-unit-assertj:2.8.0' testImplementation 'org.awaitility:awaitility:3.1.6' testImplementation 'org.mockito:mockito-core:3.0.0' + testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.1.9' + testImplementation 'org.assertj:assertj-core:3.12.2' + + //TODO: Remove dependency on junit 4 + testImplementation 'junit:junit:4.13' + 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 :: Mailbox :: Store Framework' @@ -43,4 +60,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/mailbox/tools/quota-recompute/build.gradle b/mailbox/tools/quota-recompute/build.gradle index 73a4994..7dd3d30 100644 --- a/mailbox/tools/quota-recompute/build.gradle +++ b/mailbox/tools/quota-recompute/build.gradle @@ -1,6 +1,9 @@ /* * This file was generated by the Gradle 'init' task. */ +configurations { + tests +} dependencies { implementation project(":james-core") @@ -21,11 +24,20 @@ dependencies { implementation 'org.slf4j:slf4j-api:1.7.27' implementation 'javax.inject:javax.inject:1' - testImplementation project(':james-json') testImplementation project(':testing-base') + testImplementation project(path: ':james-json', configuration: 'tests') testImplementation 'net.javacrumbs.json-unit:json-unit-assertj:2.8.0' testImplementation 'org.mockito:mockito-core:3.0.0' + testImplementation 'org.apache.james:apache-mime4j-dom:0.8.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 :: Mailbox :: Tools :: Quota recompute' @@ -35,4 +47,8 @@ tasks.register('testsJar', Jar) { from(sourceSets.test.output) } +artifacts { + tests testsJar +} + publishing.publications.maven.artifact(testsJar) diff --git a/mdn/build.gradle b/mdn/build.gradle index 95b5823..94fefbb 100644 --- a/mdn/build.gradle +++ b/mdn/build.gradle @@ -14,7 +14,7 @@ dependencies { testImplementation project(':testing-base') testImplementation 'org.scala-lang.modules:scala-java8-compat_2.13:0.9.0' - testImplementation 'org.assertj:assertj-core:3.16.1' + testImplementation 'org.assertj:assertj-core:3.12.2' testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.1.9' testImplementation "junit:junit:4.13" --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org