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 2904b0ca1fc9c66c8a8083db85a9d3b0aba15643 Author: Benoit Tellier <[email protected]> AuthorDate: Thu Sep 12 14:33:46 2019 +0700 JAMES-2855 Guice now includes multibinding --- pom.xml | 5 --- server/container/guice/es-metric-reporter/pom.xml | 4 --- .../apache/james/modules/server/SieveModule.java | 36 ---------------------- server/container/guice/jmx/pom.xml | 4 --- .../guice/mailbox-plugin-spamassassin/pom.xml | 4 --- server/container/guice/mailbox/pom.xml | 4 --- server/container/guice/mailet/pom.xml | 4 --- server/container/guice/protocols/imap/pom.xml | 4 --- .../container/guice/protocols/jmap-draft/pom.xml | 4 --- server/container/guice/protocols/lmtp/pom.xml | 4 --- .../container/guice/protocols/managedsieve/pom.xml | 4 --- server/container/guice/protocols/netty/pom.xml | 4 --- server/container/guice/protocols/pop/pom.xml | 4 --- server/container/guice/protocols/smtp/pom.xml | 4 --- .../protocols/webadmin-cassandra-data/pom.xml | 4 --- .../guice/protocols/webadmin-cassandra/pom.xml | 4 --- .../guice/protocols/webadmin-data/pom.xml | 4 --- .../guice/protocols/webadmin-mailbox/pom.xml | 4 --- .../guice/protocols/webadmin-mailqueue/pom.xml | 4 --- .../protocols/webadmin-mailrepository/pom.xml | 4 --- .../guice/protocols/webadmin-swagger/pom.xml | 4 --- server/container/guice/protocols/webadmin/pom.xml | 4 --- 22 files changed, 121 deletions(-) diff --git a/pom.xml b/pom.xml index 1e7eed7..4bb8902 100644 --- a/pom.xml +++ b/pom.xml @@ -1923,11 +1923,6 @@ <version>${guice.version}</version> </dependency> <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - <version>${guice.version}</version> - </dependency> - <dependency> <groupId>com.ibm.icu</groupId> <artifactId>icu4j</artifactId> <version>64.2</version> diff --git a/server/container/guice/es-metric-reporter/pom.xml b/server/container/guice/es-metric-reporter/pom.xml index 39698ee..34e531f 100644 --- a/server/container/guice/es-metric-reporter/pom.xml +++ b/server/container/guice/es-metric-reporter/pom.xml @@ -58,10 +58,6 @@ <artifactId>guice</artifactId> </dependency> <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-configuration2</artifactId> </dependency> diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/SieveModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/SieveModule.java deleted file mode 100644 index b41ddfa..0000000 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/SieveModule.java +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - -package org.apache.james.modules.server; - -import org.apache.james.managesieve.api.SieveParser; -import org.apache.james.managesieve.jsieve.Parser; - -import com.google.inject.AbstractModule; -import com.google.inject.Scopes; - -public class SieveModule extends AbstractModule { - - @Override - protected void configure() { - bind(Parser.class).in(Scopes.SINGLETON); - bind(SieveParser.class).to(Parser.class); - } - -} diff --git a/server/container/guice/jmx/pom.xml b/server/container/guice/jmx/pom.xml index ef1e58a..6690a1e 100644 --- a/server/container/guice/jmx/pom.xml +++ b/server/container/guice/jmx/pom.xml @@ -86,10 +86,6 @@ <artifactId>guice</artifactId> </dependency> <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> diff --git a/server/container/guice/mailbox-plugin-spamassassin/pom.xml b/server/container/guice/mailbox-plugin-spamassassin/pom.xml index c96f014..db9d445 100644 --- a/server/container/guice/mailbox-plugin-spamassassin/pom.xml +++ b/server/container/guice/mailbox-plugin-spamassassin/pom.xml @@ -50,10 +50,6 @@ <artifactId>guice</artifactId> </dependency> <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-configuration2</artifactId> </dependency> diff --git a/server/container/guice/mailbox/pom.xml b/server/container/guice/mailbox/pom.xml index 0a407e5..7db97a0 100644 --- a/server/container/guice/mailbox/pom.xml +++ b/server/container/guice/mailbox/pom.xml @@ -62,10 +62,6 @@ <artifactId>guice</artifactId> </dependency> <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> diff --git a/server/container/guice/mailet/pom.xml b/server/container/guice/mailet/pom.xml index f583795..8dc163d 100644 --- a/server/container/guice/mailet/pom.xml +++ b/server/container/guice/mailet/pom.xml @@ -84,9 +84,5 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> </dependencies> </project> diff --git a/server/container/guice/protocols/imap/pom.xml b/server/container/guice/protocols/imap/pom.xml index 722a3a2..416e99f 100644 --- a/server/container/guice/protocols/imap/pom.xml +++ b/server/container/guice/protocols/imap/pom.xml @@ -53,9 +53,5 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> </dependencies> </project> diff --git a/server/container/guice/protocols/jmap-draft/pom.xml b/server/container/guice/protocols/jmap-draft/pom.xml index 4be18e8..27a8f6f 100644 --- a/server/container/guice/protocols/jmap-draft/pom.xml +++ b/server/container/guice/protocols/jmap-draft/pom.xml @@ -71,10 +71,6 @@ <artifactId>guice</artifactId> </dependency> <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> - <dependency> <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> <scope>test</scope> diff --git a/server/container/guice/protocols/lmtp/pom.xml b/server/container/guice/protocols/lmtp/pom.xml index cb38d44..cc95306 100644 --- a/server/container/guice/protocols/lmtp/pom.xml +++ b/server/container/guice/protocols/lmtp/pom.xml @@ -49,9 +49,5 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> </dependencies> </project> diff --git a/server/container/guice/protocols/managedsieve/pom.xml b/server/container/guice/protocols/managedsieve/pom.xml index 10ce419..c8247cc 100644 --- a/server/container/guice/protocols/managedsieve/pom.xml +++ b/server/container/guice/protocols/managedsieve/pom.xml @@ -54,10 +54,6 @@ <artifactId>guice</artifactId> </dependency> <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> - <dependency> <groupId>${james.protocols.groupId}</groupId> <artifactId>protocols-managesieve</artifactId> </dependency> diff --git a/server/container/guice/protocols/netty/pom.xml b/server/container/guice/protocols/netty/pom.xml index a1fcb01..76c0061 100644 --- a/server/container/guice/protocols/netty/pom.xml +++ b/server/container/guice/protocols/netty/pom.xml @@ -49,9 +49,5 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> </dependencies> </project> diff --git a/server/container/guice/protocols/pop/pom.xml b/server/container/guice/protocols/pop/pom.xml index 62484f0..de4dbf1 100644 --- a/server/container/guice/protocols/pop/pom.xml +++ b/server/container/guice/protocols/pop/pom.xml @@ -49,9 +49,5 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> </dependencies> </project> diff --git a/server/container/guice/protocols/smtp/pom.xml b/server/container/guice/protocols/smtp/pom.xml index 34580a7..660f10b 100644 --- a/server/container/guice/protocols/smtp/pom.xml +++ b/server/container/guice/protocols/smtp/pom.xml @@ -49,9 +49,5 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> </dependencies> </project> diff --git a/server/container/guice/protocols/webadmin-cassandra-data/pom.xml b/server/container/guice/protocols/webadmin-cassandra-data/pom.xml index 16a43c4..06e3602 100644 --- a/server/container/guice/protocols/webadmin-cassandra-data/pom.xml +++ b/server/container/guice/protocols/webadmin-cassandra-data/pom.xml @@ -50,9 +50,5 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> </dependencies> </project> \ No newline at end of file diff --git a/server/container/guice/protocols/webadmin-cassandra/pom.xml b/server/container/guice/protocols/webadmin-cassandra/pom.xml index df29402..492499b 100644 --- a/server/container/guice/protocols/webadmin-cassandra/pom.xml +++ b/server/container/guice/protocols/webadmin-cassandra/pom.xml @@ -53,9 +53,5 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> </dependencies> </project> diff --git a/server/container/guice/protocols/webadmin-data/pom.xml b/server/container/guice/protocols/webadmin-data/pom.xml index 2ee10b0..94fa530 100644 --- a/server/container/guice/protocols/webadmin-data/pom.xml +++ b/server/container/guice/protocols/webadmin-data/pom.xml @@ -53,9 +53,5 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> </dependencies> </project> diff --git a/server/container/guice/protocols/webadmin-mailbox/pom.xml b/server/container/guice/protocols/webadmin-mailbox/pom.xml index 9b896c9..6668c66 100644 --- a/server/container/guice/protocols/webadmin-mailbox/pom.xml +++ b/server/container/guice/protocols/webadmin-mailbox/pom.xml @@ -53,9 +53,5 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> </dependencies> </project> diff --git a/server/container/guice/protocols/webadmin-mailqueue/pom.xml b/server/container/guice/protocols/webadmin-mailqueue/pom.xml index b823781..1a2d3b5 100644 --- a/server/container/guice/protocols/webadmin-mailqueue/pom.xml +++ b/server/container/guice/protocols/webadmin-mailqueue/pom.xml @@ -55,9 +55,5 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> </dependencies> </project> diff --git a/server/container/guice/protocols/webadmin-mailrepository/pom.xml b/server/container/guice/protocols/webadmin-mailrepository/pom.xml index 5b9bf79..00f2449 100644 --- a/server/container/guice/protocols/webadmin-mailrepository/pom.xml +++ b/server/container/guice/protocols/webadmin-mailrepository/pom.xml @@ -55,9 +55,5 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> </dependencies> </project> \ No newline at end of file diff --git a/server/container/guice/protocols/webadmin-swagger/pom.xml b/server/container/guice/protocols/webadmin-swagger/pom.xml index cae710d..c42198b 100644 --- a/server/container/guice/protocols/webadmin-swagger/pom.xml +++ b/server/container/guice/protocols/webadmin-swagger/pom.xml @@ -53,9 +53,5 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> </dependencies> </project> diff --git a/server/container/guice/protocols/webadmin/pom.xml b/server/container/guice/protocols/webadmin/pom.xml index e83ce05..0a9180c 100644 --- a/server/container/guice/protocols/webadmin/pom.xml +++ b/server/container/guice/protocols/webadmin/pom.xml @@ -49,9 +49,5 @@ <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> - <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-multibindings</artifactId> - </dependency> </dependencies> </project> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
