You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ie...@apache.org on 2020/06/30 22:23:50 UTC
[james-project] 01/02: JAMES-3260 Removed guice from api
This is an automated email from the ASF dual-hosted git repository.
ieugen pushed a commit to branch JAMES-3225-autobuild
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit e29d661366781563f3d76814ff6d43a209069697
Author: Eugen Stan <ie...@apache.org>
AuthorDate: Wed Jul 1 01:21:20 2020 +0300
JAMES-3260 Removed guice from api
---
mpt/impl/smtp/cassandra/build.gradle | 3 ++-
.../guice/blob-objectstorage-guice/build.gradle | 16 +++++++++++-----
server/container/guice/guice-common/build.gradle | 3 +--
server/container/guice/jpa-guice/build.gradle | 1 +
server/container/guice/jpa-smtp-common/build.gradle | 1 +
server/container/guice/jpa-smtp-mariadb/build.gradle | 1 +
server/container/guice/jpa-smtp/build.gradle | 5 +++--
server/mailet/integration-testing/build.gradle | 1 +
.../build.gradle | 5 +++--
.../jmap-draft-integration-testing-common/build.gradle | 1 +
.../memory-jmap-draft-integration-testing/build.gradle | 1 +
.../rabbitmq-jmap-draft-integration-testing/build.gradle | 2 +-
.../build.gradle | 2 ++
.../memory-jmap-rfc-8621-integration-tests/build.gradle | 2 ++
.../distributed-webadmin-integration-test/build.gradle | 5 +++--
.../memory-webadmin-integration-test/build.gradle | 2 ++
.../webadmin-integration-test-common/build.gradle | 3 ++-
17 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/mpt/impl/smtp/cassandra/build.gradle b/mpt/impl/smtp/cassandra/build.gradle
index 8e176fe..861b3df 100644
--- a/mpt/impl/smtp/cassandra/build.gradle
+++ b/mpt/impl/smtp/cassandra/build.gradle
@@ -20,8 +20,9 @@ dependencies {
testImplementation project(':james-server:james-server-guice:james-server-guice-jmap')
testImplementation project(':james-server:james-server-util')
+ testImplementation 'com.google.inject:guice:4.2.2'
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'
diff --git a/server/container/guice/blob-objectstorage-guice/build.gradle b/server/container/guice/blob-objectstorage-guice/build.gradle
index b64447e..ca21911 100644
--- a/server/container/guice/blob-objectstorage-guice/build.gradle
+++ b/server/container/guice/blob-objectstorage-guice/build.gradle
@@ -11,19 +11,25 @@ configurations {
dependencies {
api project(':james-server:james-server-guice:blob-api-guice')
- api project(':james-server:james-server-blob:blob-objectstorage')
+ api(project(':james-server:james-server-blob:blob-objectstorage')){
+ exclude group: 'com.google.inject.extensions', module: 'guice-multibindings'
+ exclude group: 'com.google.inject', module: 'guice'
+ }
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(path: ':james-server:james-server-blob:blob-objectstorage', configuration: 'tests')
+ testImplementation(project(path: ':james-server:james-server-blob:blob-objectstorage', configuration: 'tests')) {
+ exclude group: 'com.google.inject.extensions', module: 'guice-multibindings'
+ exclude group: 'com.google.inject', module: 'guice'
+ }
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 'com.google.inject:guice:4.2.2'
testImplementation 'org.assertj:assertj-core:3.12.2'
- testImplementation 'org.testcontainers:testcontainers:1.12.0'
+ testImplementation 'org.testcontainers:testcontainers:1.14.3'
testImplementation 'org.reactivestreams:reactive-streams:1.0.3'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1'
@@ -34,7 +40,7 @@ dependencies {
test {
useJUnitPlatform()
// ObjectStorageBlobStoreModuleTest Error in custom provider, java.lang.NoClassDefFoundError: com/google/inject/internal/util/$Maps
- enabled = false
+// enabled = false
}
description = 'Apache James :: Server :: Blob Store in object storage - guice injection'
diff --git a/server/container/guice/guice-common/build.gradle b/server/container/guice/guice-common/build.gradle
index cf4aee4..b056c50 100644
--- a/server/container/guice/guice-common/build.gradle
+++ b/server/container/guice/guice-common/build.gradle
@@ -33,10 +33,9 @@ dependencies {
api project(':metrics:metrics-api')
api project(':metrics:metrics-dropwizard')
- api 'com.google.inject:guice:4.2.2'
-
implementation 'com.github.steveash.guavate:guavate:1.0.0'
implementation 'com.google.guava:guava:25.1-jre'
+ implementation 'com.google.inject:guice:4.2.2'
implementation 'com.github.fge:throwing-lambdas:0.5.0'
implementation 'com.sun.mail:javax.mail:1.6.2'
implementation 'io.dropwizard.metrics:metrics-core:4.1.0'
diff --git a/server/container/guice/jpa-guice/build.gradle b/server/container/guice/jpa-guice/build.gradle
index 7b4cdc4..a008407 100644
--- a/server/container/guice/jpa-guice/build.gradle
+++ b/server/container/guice/jpa-guice/build.gradle
@@ -38,6 +38,7 @@ dependencies {
implementation 'ch.qos.logback:logback-classic:1.2.3'
implementation 'com.linagora:logback-elasticsearch-appender:1.8.0'
+ implementation 'com.google.inject:guice:4.2.2'
implementation 'org.apache.derby:derby:10.14.2.0'
implementation 'org.awaitility:awaitility:3.1.6'
diff --git a/server/container/guice/jpa-smtp-common/build.gradle b/server/container/guice/jpa-smtp-common/build.gradle
index 0c3833a..29b025b 100644
--- a/server/container/guice/jpa-smtp-common/build.gradle
+++ b/server/container/guice/jpa-smtp-common/build.gradle
@@ -21,6 +21,7 @@ dependencies {
implementation project(':james-server:james-server-guice:james-server-guice-webadmin-mailrepository')
implementation project(':james-server:james-server-guice:james-server-jpa-common-guice')
+ implementation 'com.google.inject:guice:4.2.2'
implementation 'com.linagora:logback-elasticsearch-appender:1.8.0'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1'
diff --git a/server/container/guice/jpa-smtp-mariadb/build.gradle b/server/container/guice/jpa-smtp-mariadb/build.gradle
index 5f1ca12..38749f5 100644
--- a/server/container/guice/jpa-smtp-mariadb/build.gradle
+++ b/server/container/guice/jpa-smtp-mariadb/build.gradle
@@ -20,6 +20,7 @@ dependencies {
testImplementation project(':james-server:james-server-guice:james-server-guice-smtp')
testImplementation project(':james-server:james-server-guice:james-server-jpa-common-guice')
+ testImplementation 'com.google.inject:guice:4.2.2'
testImplementation 'org.apache.derby:derby:10.14.2.0'
testImplementation 'org.assertj:assertj-core:3.12.2'
testImplementation 'org.testcontainers:mariadb:1.12.0'
diff --git a/server/container/guice/jpa-smtp/build.gradle b/server/container/guice/jpa-smtp/build.gradle
index 4599d7e..a3d3e63 100644
--- a/server/container/guice/jpa-smtp/build.gradle
+++ b/server/container/guice/jpa-smtp/build.gradle
@@ -22,10 +22,11 @@ dependencies {
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 'com.google.inject:guice:4.2.2'
testImplementation 'io.rest-assured:rest-assured:4.0.0'
- testImplementation 'org.awaitility:awaitility:3.1.6'
+ testImplementation 'org.apache.openjpa:openjpa:3.1.0'
testImplementation 'org.assertj:assertj-core:3.12.2'
+ testImplementation 'org.awaitility:awaitility:3.1.6'
testImplementation 'org.mockito:mockito-core:3.0.0'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1'
diff --git a/server/mailet/integration-testing/build.gradle b/server/mailet/integration-testing/build.gradle
index 46a1c62..bdcd65f 100644
--- a/server/mailet/integration-testing/build.gradle
+++ b/server/mailet/integration-testing/build.gradle
@@ -39,6 +39,7 @@ dependencies {
testImplementation project(':third-party:apache-james-spamassassin')
testImplementation 'commons-io:commons-io:2.6'
+ testImplementation 'com.google.inject:guice:4.2.2'
testImplementation 'com.jayway.jsonpath:json-path:2.4.0'
testImplementation 'com.rabbitmq:amqp-client:5.7.3'
testImplementation 'io.rest-assured:rest-assured:4.0.0'
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 bf3aaa7..24fc688 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
@@ -34,17 +34,18 @@ dependencies {
testImplementation project(':james-server:james-server-util')
testImplementation project(':javax-mail-extension')
- testImplementation 'org.apache.james:apache-mime4j-dom:0.8.3'
testImplementation 'com.github.fge:throwing-lambdas:0.5.0'
+ testImplementation 'com.google.inject:guice:4.2.2'
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.james:apache-mime4j-dom:0.8.3'
testImplementation 'org.apache.pdfbox:pdfbox:2.0.16'
+ testImplementation 'org.assertj:assertj-core:3.12.2'
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'
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 f1ab01a..a603946 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
@@ -39,6 +39,7 @@ dependencies {
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 'com.google.inject:guice:4.2.2'
testImplementation 'commons-io:commons-io:2.6'
testImplementation 'commons-net:commons-net:3.6'
testImplementation 'io.projectreactor:reactor-core:3.3.4.RELEASE'
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 70072de..de58fcc 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
@@ -30,6 +30,7 @@ dependencies {
testImplementation project(':javax-mail-extension')
testImplementation project(':third-party:apache-james-spamassassin')
+ testImplementation 'com.google.inject:guice:4.2.2'
testImplementation 'com.google.guava:guava:25.1-jre'
testImplementation 'io.cucumber:cucumber-guice:2.4.0'
testImplementation 'io.cucumber:cucumber-java:2.4.0'
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 66fa7a4..079f42f 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
@@ -28,7 +28,7 @@ dependencies {
testImplementation project(':james-server:james-server-testing')
testImplementation 'com.github.fge:throwing-lambdas:0.5.0'
- testImplementation 'com.google.inject:guice:3.0'
+ testImplementation 'com.google.inject:guice:4.2.2'
testImplementation 'io.cucumber:cucumber-guice:2.4.0'
testImplementation 'io.cucumber:cucumber-java:2.4.0'
testImplementation 'io.cucumber:cucumber-junit:2.4.0'
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 fb92251..082b080 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
@@ -23,6 +23,8 @@ dependencies {
testImplementation project(':james-server:james-server-testing')
testImplementation project(':james-server:jmap-rfc-8621-integration-tests:jmap-rfc-8621-integration-tests-common')
+ testImplementation 'com.google.inject:guice:4.2.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'
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 84283cc..7ed702c 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
@@ -15,6 +15,8 @@ dependencies {
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 'com.google.inject:guice:4.2.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'
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 0aa804f..9b3613d 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
@@ -27,10 +27,11 @@ dependencies {
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.google.inject:guice:4.2.2'
testImplementation 'com.github.fge:throwing-lambdas:0.5.0'
testImplementation 'io.rest-assured:rest-assured:4.0.0'
+ testImplementation 'org.apache.james:apache-mime4j-dom:0.8.3'
testImplementation 'org.awaitility:awaitility:3.1.6'
testImplementation 'org.assertj:assertj-core:3.12.2'
@@ -44,7 +45,7 @@ dependencies {
test {
useJUnitPlatform()
failFast = true
- // RabbitMQForwardIntegrationTest Error in custom provider, java.lang.NoClassDefFoundError: com/google/inject/internal/util/$Maps
+ // RabbitMQForwardIntegrationTest Error in custom provider, java.lang.NoClassDefFoundError: com/google/inject/internal/util/$Maps
enabled = false
// maxParallelForks = Runtime.getRuntime().availableProcessors();
}
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 b58e17b..b0ec0a8 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
@@ -18,6 +18,8 @@ dependencies {
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 'com.google.inject:guice:4.2.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'
diff --git a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/build.gradle b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/build.gradle
index b832b37..a44eebf 100644
--- a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/build.gradle
+++ b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/build.gradle
@@ -31,8 +31,9 @@ dependencies {
api project(':james-server:james-server-webadmin-swagger')
api project(path: ':third-party:apache-james-linshare', configuration: 'tests')
- implementation 'org.awaitility:awaitility:3.1.6'
+ implementation 'com.google.inject:guice:4.2.2'
implementation 'io.rest-assured:rest-assured:4.0.0'
+ implementation 'org.awaitility:awaitility:3.1.6'
implementation 'org.hamcrest:java-hamcrest:2.0.0.0'
implementation 'org.testcontainers:testcontainers:1.12.0'
implementation 'org.assertj:assertj-core:3.12.2'
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org