This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit f85ac38dd14ff5501f623c998febe29d084c4729 Author: Benoit Tellier <[email protected]> AuthorDate: Sun Jun 21 15:57:29 2020 +0700 JAMES-3142 Small dependency fixes for API packages --- backends-common/cassandra/pom.xml | 4 ++++ event-sourcing/event-sourcing-pojo/pom.xml | 4 ---- event-sourcing/event-store-api/pom.xml | 4 ---- .../apache/james/eventsourcing/eventstore/EventStore.scala | 1 - mailbox/lucene/pom.xml | 4 ++++ mailet/ai/pom.xml | 4 ++++ metrics/metrics-api/pom.xml | 4 ---- protocols/managesieve/pom.xml | 4 ++++ server/container/util/pom.xml | 4 ---- server/data/data-library/pom.xml | 12 ++++++++---- server/protocols/webadmin/webadmin-core/pom.xml | 4 ++++ server/task/task-api/pom.xml | 8 -------- 12 files changed, 28 insertions(+), 29 deletions(-) diff --git a/backends-common/cassandra/pom.xml b/backends-common/cassandra/pom.xml index bfc6d5b..f7a56b2 100644 --- a/backends-common/cassandra/pom.xml +++ b/backends-common/cassandra/pom.xml @@ -89,6 +89,10 @@ <artifactId>reactor-core</artifactId> </dependency> <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </dependency> + <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> diff --git a/event-sourcing/event-sourcing-pojo/pom.xml b/event-sourcing/event-sourcing-pojo/pom.xml index a3c3467..0a3977a 100644 --- a/event-sourcing/event-sourcing-pojo/pom.xml +++ b/event-sourcing/event-sourcing-pojo/pom.xml @@ -45,10 +45,6 @@ <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> </dependency> - <dependency> - <groupId>org.scala-lang.modules</groupId> - <artifactId>scala-java8-compat_${scala.base}</artifactId> - </dependency> </dependencies> <build> <plugins> diff --git a/event-sourcing/event-store-api/pom.xml b/event-sourcing/event-store-api/pom.xml index 2bffd38..19b01d4 100644 --- a/event-sourcing/event-store-api/pom.xml +++ b/event-sourcing/event-store-api/pom.xml @@ -64,10 +64,6 @@ <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> </dependency> - <dependency> - <groupId>org.scala-lang.modules</groupId> - <artifactId>scala-java8-compat_${scala.base}</artifactId> - </dependency> </dependencies> <build> <plugins> diff --git a/event-sourcing/event-store-api/src/main/scala/org/apache/james/eventsourcing/eventstore/EventStore.scala b/event-sourcing/event-store-api/src/main/scala/org/apache/james/eventsourcing/eventstore/EventStore.scala index fcfac47..fb3a786 100644 --- a/event-sourcing/event-store-api/src/main/scala/org/apache/james/eventsourcing/eventstore/EventStore.scala +++ b/event-sourcing/event-store-api/src/main/scala/org/apache/james/eventsourcing/eventstore/EventStore.scala @@ -21,7 +21,6 @@ package org.apache.james.eventsourcing.eventstore import org.apache.james.eventsourcing.{AggregateId, Event} import scala.annotation.varargs -import scala.jdk.CollectionConverters._ import org.reactivestreams.Publisher trait EventStore { diff --git a/mailbox/lucene/pom.xml b/mailbox/lucene/pom.xml index 531eebf..15a822f 100644 --- a/mailbox/lucene/pom.xml +++ b/mailbox/lucene/pom.xml @@ -91,6 +91,10 @@ <artifactId>javax.mail</artifactId> </dependency> <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </dependency> + <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-analyzers</artifactId> <version>${lucene.version}</version> diff --git a/mailet/ai/pom.xml b/mailet/ai/pom.xml index 6c76ba5..177fcc2 100644 --- a/mailet/ai/pom.xml +++ b/mailet/ai/pom.xml @@ -53,5 +53,9 @@ <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </dependency> </dependencies> </project> diff --git a/metrics/metrics-api/pom.xml b/metrics/metrics-api/pom.xml index 931374e..943fe86 100644 --- a/metrics/metrics-api/pom.xml +++ b/metrics/metrics-api/pom.xml @@ -36,10 +36,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> <groupId>org.reactivestreams</groupId> <artifactId>reactive-streams</artifactId> </dependency> diff --git a/protocols/managesieve/pom.xml b/protocols/managesieve/pom.xml index 6940f68..dfd8fe7 100644 --- a/protocols/managesieve/pom.xml +++ b/protocols/managesieve/pom.xml @@ -55,6 +55,10 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </dependency> + <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> diff --git a/server/container/util/pom.xml b/server/container/util/pom.xml index f7955ba..4b650c6 100644 --- a/server/container/util/pom.xml +++ b/server/container/util/pom.xml @@ -60,10 +60,6 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>com.ibm.icu</groupId> - <artifactId>icu4j</artifactId> - </dependency> - <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> diff --git a/server/data/data-library/pom.xml b/server/data/data-library/pom.xml index 7e9c405..1f8725e 100644 --- a/server/data/data-library/pom.xml +++ b/server/data/data-library/pom.xml @@ -90,10 +90,6 @@ <artifactId>javax.mail</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-configuration2</artifactId> - </dependency> - <dependency> <groupId>io.cucumber</groupId> <artifactId>cucumber-java</artifactId> <scope>test</scope> @@ -104,10 +100,18 @@ <scope>test</scope> </dependency> <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </dependency> + <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml index 1f28dee..5ce9a32 100644 --- a/server/protocols/webadmin/webadmin-core/pom.xml +++ b/server/protocols/webadmin/webadmin-core/pom.xml @@ -117,6 +117,10 @@ <version>1.5.22</version> </dependency> <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </dependency> + <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> diff --git a/server/task/task-api/pom.xml b/server/task/task-api/pom.xml index 15d4c4d..2b18578 100644 --- a/server/task/task-api/pom.xml +++ b/server/task/task-api/pom.xml @@ -48,10 +48,6 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> - </dependency> - <dependency> <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> <scope>test</scope> @@ -66,10 +62,6 @@ <artifactId>scala-library</artifactId> </dependency> <dependency> - <groupId>org.scala-lang.modules</groupId> - <artifactId>scala-java8-compat_${scala.base}</artifactId> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
