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 0408607e1dc191cbb3ddd217c497893437536e8f Author: Eugen Stan <ieu...@apache.org> AuthorDate: Tue Jun 30 00:21:15 2020 +0300 JAMES-3260 Fixed memory-guice build - removed guava:*-android version --- build.gradle | 2 ++ server/container/guice/guice-common/build.gradle | 10 +++++----- server/container/guice/mailbox/build.gradle | 1 - server/container/guice/memory-guice/build.gradle | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index aa8923b..dc1d220 100644 --- a/build.gradle +++ b/build.gradle @@ -23,6 +23,8 @@ subprojects { targetCompatibility = '11' configurations.all { + // Guice depends on guava:*-android version that does not contain Streams class -> fails tests + resolutionStrategy.force 'com.google.guava:guava:25.1-jre' } java { diff --git a/server/container/guice/guice-common/build.gradle b/server/container/guice/guice-common/build.gradle index 8334d02..cf4aee4 100644 --- a/server/container/guice/guice-common/build.gradle +++ b/server/container/guice/guice-common/build.gradle @@ -35,16 +35,16 @@ dependencies { api 'com.google.inject:guice:4.2.2' - implementation 'io.dropwizard.metrics:metrics-core:4.1.0' implementation 'com.github.steveash.guavate:guavate:1.0.0' - implementation 'io.projectreactor:reactor-core:3.3.4.RELEASE' - implementation 'org.apache.commons:commons-configuration2:2.7' + implementation 'com.google.guava:guava:25.1-jre' 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' + implementation 'io.projectreactor:reactor-core:3.3.4.RELEASE' implementation 'javax.annotation:javax.annotation-api:1.3.2' implementation 'javax.inject:javax.inject:1' + implementation 'org.apache.commons:commons-configuration2:2.7' implementation 'org.scala-lang:scala-library:2.13.1' - implementation 'com.sun.mail:javax.mail:1.6.2' - implementation 'com.google.inject:guice:4.2.2' implementation 'org.slf4j:slf4j-api:1.7.27' testImplementation project(':james-server:james-server-guice:james-server-guice-mailbox') diff --git a/server/container/guice/mailbox/build.gradle b/server/container/guice/mailbox/build.gradle index 4102943..d2f694a 100644 --- a/server/container/guice/mailbox/build.gradle +++ b/server/container/guice/mailbox/build.gradle @@ -20,7 +20,6 @@ dependencies { api project(':james-server:james-server-guice:james-server-guice-utils') api project(':james-server:james-server-task-json') api project(':james-server:james-server-core') - api project(':james-server:james-server-spring') api project(':james-server:james-server-lifecycle-api') implementation 'com.github.fge:throwing-lambdas:0.5.0' diff --git a/server/container/guice/memory-guice/build.gradle b/server/container/guice/memory-guice/build.gradle index d81de63..a42a907 100644 --- a/server/container/guice/memory-guice/build.gradle +++ b/server/container/guice/memory-guice/build.gradle @@ -72,7 +72,7 @@ dependencies { test { useJUnitPlatform() //TODO: @Ieugen: Disabled temporarily . Part of https://issues.apache.org/jira/browse/JAMES-3260 - enabled = false + enabled = true } description = 'Apache James :: Server :: Memory - guice injection' --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org