http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/fetchmail/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/pom.xml b/server/protocols/fetchmail/pom.xml index e928da4..388de19 100644 --- a/server/protocols/fetchmail/pom.xml +++ b/server/protocols/fetchmail/pom.xml @@ -35,51 +35,51 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-queue-api</artifactId> + <artifactId>apache-mailet-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> + <artifactId>james-server-core</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-util</artifactId> + <artifactId>james-server-data-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-api</artifactId> + <artifactId>james-server-dnsservice-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-core</artifactId> + <artifactId>james-server-lifecycle-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-api</artifactId> + <artifactId>james-server-queue-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-mailet-api</artifactId> + <artifactId>james-server-util</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> </dependency> <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-annotation_1.1_spec</artifactId> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> </dependency> </dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml index f544fb3..c38eeed 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml @@ -17,8 +17,7 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> @@ -66,31 +65,31 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>james-server-cassandra-guice</artifactId> - <scope>test</scope> <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-common</artifactId> - <scope>test</scope> + <artifactId>james-server-dnsservice-api</artifactId> <type>test-jar</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-jmap</artifactId> - <scope>test</scope> + <artifactId>james-server-guice-common</artifactId> <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-jmap-integration-testing</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-api</artifactId> + <artifactId>james-server-jmap-integration-testing</artifactId> <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -110,12 +109,12 @@ </dependency> <dependency> <groupId>info.cukes</groupId> - <artifactId>cucumber-java</artifactId> + <artifactId>cucumber-guice</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>info.cukes</groupId> - <artifactId>cucumber-guice</artifactId> + <artifactId>cucumber-java</artifactId> <scope>test</scope> </dependency> <dependency> @@ -145,12 +144,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-util-java8</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml index 8b7400a..8ac2e49 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml @@ -32,7 +32,6 @@ <name>Apache James :: Server :: JMAP :: Integration testing Common</name> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> @@ -41,34 +40,34 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-common</artifactId> + <artifactId>james-server-dnsservice-api</artifactId> + <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>james-server-guice-common</artifactId> <scope>test</scope> - <type>test-jar</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-jmap</artifactId> + <artifactId>james-server-guice-common</artifactId> + <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-mailbox</artifactId> + <artifactId>james-server-guice-jmap</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-testing</artifactId> + <artifactId>james-server-guice-mailbox</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-api</artifactId> - <type>test-jar</type> + <artifactId>james-server-testing</artifactId> <scope>test</scope> </dependency> <dependency> @@ -80,7 +79,8 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>18.0</version> <!--$NO-MVN-MAN-VER$--> + <version>18.0</version> + <!--$NO-MVN-MAN-VER$--> </dependency> <dependency> <groupId>com.jayway.jsonpath</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml index a4939a4..2522c75 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml @@ -17,8 +17,7 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> @@ -36,6 +35,11 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-server-dnsservice-api</artifactId> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-guice-common</artifactId> <type>test-jar</type> <scope>test</scope> @@ -54,29 +58,29 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-testing</artifactId> + <artifactId>james-server-memory-guice</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>james-server-memory-guice</artifactId> + <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-util-java8</artifactId> - <type>test-jar</type> + <artifactId>james-server-testing</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-api</artifactId> + <artifactId>james-server-util-java8</artifactId> <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-memory-guice</artifactId> - <type>test-jar</type> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> <scope>test</scope> </dependency> <dependency> @@ -86,17 +90,17 @@ </dependency> <dependency> <groupId>info.cukes</groupId> - <artifactId>cucumber-java</artifactId> + <artifactId>cucumber-guice</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>info.cukes</groupId> - <artifactId>cucumber-junit</artifactId> + <artifactId>cucumber-java</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>info.cukes</groupId> - <artifactId>cucumber-guice</artifactId> + <artifactId>cucumber-junit</artifactId> <scope>test</scope> </dependency> <dependency> @@ -105,11 +109,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> @@ -119,8 +118,8 @@ <artifactId>java-hamcrest</artifactId> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>org.testcontainers</groupId> + <artifactId>testcontainers</artifactId> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/jmap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/pom.xml index fd7f96a..906fc2c 100644 --- a/server/protocols/jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/pom.xml @@ -29,8 +29,8 @@ </parent> <artifactId>jmap-integration-testing</artifactId> - <name>Apache James :: Server :: JMAP :: Integration testing</name> <packaging>pom</packaging> + <name>Apache James :: Server :: JMAP :: Integration testing</name> <modules> <module>jmap-integration-testing-common</module> @@ -51,4 +51,3 @@ </profile> </profiles> </project> - http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/jmap/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml index 9a9ecec..7674f20 100644 --- a/server/protocols/jmap/pom.xml +++ b/server/protocols/jmap/pom.xml @@ -40,8 +40,8 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-james-mailbox-api</artifactId> - <scope>test</scope> <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -51,8 +51,8 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-james-mailbox-memory</artifactId> - <scope>test</scope> <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -68,8 +68,8 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-mailet-base</artifactId> - <scope>test</scope> <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -100,8 +100,8 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>james-server-data-library</artifactId> - <scope>test</scope> <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/jwt/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jwt/pom.xml b/server/protocols/jwt/pom.xml index 269fc0f..f5cf54c 100644 --- a/server/protocols/jwt/pom.xml +++ b/server/protocols/jwt/pom.xml @@ -18,13 +18,13 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>james-server-jwt</artifactId> <packaging>jar</packaging> @@ -33,10 +33,6 @@ <dependencies> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> @@ -45,6 +41,10 @@ <artifactId>jjwt</artifactId> </dependency> <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -88,4 +88,4 @@ </build> </profile> </profiles> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/protocols-imap4/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-imap4/pom.xml b/server/protocols/protocols-imap4/pom.xml index b22acf6..9dcfa66 100644 --- a/server/protocols/protocols-imap4/pom.xml +++ b/server/protocols/protocols-imap4/pom.xml @@ -35,11 +35,11 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-protocols-library</artifactId> + <artifactId>james-server-filesystem-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> + <artifactId>james-server-protocols-library</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -54,18 +54,6 @@ <artifactId>metrics-logger</artifactId> </dependency> <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-imap</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-netty</artifactId> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.1_spec</artifactId> - </dependency> - <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> </dependency> @@ -78,16 +66,12 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - </dependency> - <dependency> <groupId>io.netty</groupId> <artifactId>netty</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> </dependency> <dependency> @@ -96,10 +80,26 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.1_spec</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-imap</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-netty</artifactId> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/protocols-library/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/pom.xml b/server/protocols/protocols-library/pom.xml index f6cffa7..083d05a 100644 --- a/server/protocols/protocols-library/pom.xml +++ b/server/protocols/protocols-library/pom.xml @@ -35,11 +35,11 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> + <artifactId>james-server-filesystem-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> + <artifactId>james-server-lifecycle-api</artifactId> </dependency> <dependency> @@ -47,8 +47,8 @@ <artifactId>james-server-util</artifactId> <exclusions> <exclusion> - <groupId>javax.mail</groupId> <artifactId>mail</artifactId> + <groupId>javax.mail</groupId> </exclusion> </exclusions> </dependency> @@ -57,18 +57,6 @@ <artifactId>metrics-api</artifactId> </dependency> <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-netty</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> </dependency> @@ -77,12 +65,24 @@ <artifactId>netty</artifactId> </dependency> <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-annotation_1.1_spec</artifactId> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-netty</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/protocols-lmtp/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-lmtp/pom.xml b/server/protocols/protocols-lmtp/pom.xml index ac12269..4c141ef 100644 --- a/server/protocols/protocols-lmtp/pom.xml +++ b/server/protocols/protocols-lmtp/pom.xml @@ -35,41 +35,69 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>apache-james-mailbox-api</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>apache-mailet-api</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-core</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-data-api</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-lifecycle-api</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-protocols-library</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-protocols-smtp</artifactId> <exclusions> <exclusion> - <groupId>${project.groupId}</groupId> <artifactId>james-server-dnsservice-api</artifactId> + <groupId>${project.groupId}</groupId> </exclusion> <exclusion> - <groupId>${project.groupId}</groupId> <artifactId>james-server-dnsservice-library</artifactId> + <groupId>${project.groupId}</groupId> </exclusion> <exclusion> - <groupId>${project.groupId}</groupId> <artifactId>james-server-queue-api</artifactId> + <groupId>${project.groupId}</groupId> </exclusion> <exclusion> - <groupId>org.apache.james.jspf</groupId> <artifactId>apache-jspf-resolver</artifactId> + <groupId>org.apache.james.jspf</groupId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-core</artifactId> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-protocols-library</artifactId> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>apache-mailet-api</artifactId> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.1_spec</artifactId> </dependency> <dependency> <groupId>org.apache.james.protocols</groupId> @@ -77,7 +105,7 @@ </dependency> <dependency> <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-smtp</artifactId> + <artifactId>protocols-lmtp</artifactId> </dependency> <dependency> <groupId>org.apache.james.protocols</groupId> @@ -85,40 +113,12 @@ </dependency> <dependency> <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-lmtp</artifactId> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-api</artifactId> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-api</artifactId> + <artifactId>protocols-smtp</artifactId> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - </dependency> - <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.1_spec</artifactId> - </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/protocols-managesieve/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-managesieve/pom.xml b/server/protocols/protocols-managesieve/pom.xml index 0e54923..f11516c 100644 --- a/server/protocols/protocols-managesieve/pom.xml +++ b/server/protocols/protocols-managesieve/pom.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>james-server-protocols-managesieve</artifactId> @@ -15,25 +15,17 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-protocols-library</artifactId> + <artifactId>james-server-filesystem-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> + <artifactId>james-server-protocols-library</artifactId> </dependency> <dependency> <groupId>org.apache.james</groupId> <artifactId>james-server-util-java8</artifactId> </dependency> <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-managesieve</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-netty</artifactId> - </dependency> - <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> </dependency> @@ -54,9 +46,17 @@ <artifactId>geronimo-annotation_1.1_spec</artifactId> </dependency> <dependency> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-managesieve</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-netty</artifactId> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> </dependencies> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/protocols-pop3/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/pom.xml b/server/protocols/protocols-pop3/pom.xml index 357aef9..4558066 100644 --- a/server/protocols/protocols-pop3/pom.xml +++ b/server/protocols/protocols-pop3/pom.xml @@ -35,83 +35,61 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-protocols-library</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-netty</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-api</artifactId> + <artifactId>apache-james-mailbox-api</artifactId> </dependency> + <!-- Test dependencies --> <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-api</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>apache-james-mailbox-memory</artifactId> <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-pop3</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - </dependency> - <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> - </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> + <artifactId>apache-james-mailbox-store</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> + <artifactId>james-server-data-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-api</artifactId> + <artifactId>james-server-data-library</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.1_spec</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-data-library</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-filesystem-api</artifactId> </dependency> - <!-- Test dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-memory</artifactId> + <artifactId>james-server-filesystem-api</artifactId> + <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-store</artifactId> - <scope>test</scope> + <artifactId>james-server-protocols-library</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> + <artifactId>james-server-protocols-library</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> - <scope>test</scope> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> + </dependency> + <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> </dependency> <dependency> <groupId>commons-net</groupId> @@ -119,22 +97,44 @@ <scope>test</scope> </dependency> <dependency> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> - <scope>test</scope> - <type>test-jar</type> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.1_spec</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-protocols-library</artifactId> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-api</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-netty</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-pop3</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/protocols-smtp/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml index 842addd..3326d74 100644 --- a/server/protocols/protocols-smtp/pom.xml +++ b/server/protocols/protocols-smtp/pom.xml @@ -34,28 +34,44 @@ <dependencies> <dependency> + <groupId>${javax.activation.groupId}</groupId> + <artifactId>${javax.activation.artifactId}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-util</artifactId> + <artifactId>apache-mailet-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-library</artifactId> + <artifactId>apache-mailet-base</artifactId> + <classifier>tests</classifier> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-queue-api</artifactId> + <artifactId>james-server-core</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> + <artifactId>james-server-data-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>james-server-data-api</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> + <artifactId>james-server-data-library</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-data-library</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -63,140 +79,136 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-core</artifactId> + <artifactId>james-server-dnsservice-api</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>metrics-api</artifactId> + <artifactId>james-server-dnsservice-library</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-protocols-library</artifactId> + <artifactId>james-server-filesystem-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-mailet-api</artifactId> + <artifactId>james-server-filesystem-api</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-api</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-lifecycle-api</artifactId> </dependency> - <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-smtp</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-protocols-library</artifactId> </dependency> <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-netty</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-protocols-library</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.james.jspf</groupId> - <artifactId>apache-jspf-resolver</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-queue-api</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-queue-api</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-util</artifactId> </dependency> <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>metrics-api</artifactId> </dependency> <dependency> - <groupId>${javax.activation.groupId}</groupId> - <artifactId>${javax.activation.artifactId}</artifactId> - <scope>provided</scope> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.1_spec</artifactId> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + <scope>test</scope> </dependency> <!-- Test dependencies --> <dependency> - <artifactId>dnsjava</artifactId> <groupId>dnsjava</groupId> + <artifactId>dnsjava</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-queue-api</artifactId> - <type>test-jar</type> - <scope>test</scope> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> - <scope>test</scope> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> - <type>test-jar</type> + <groupId>junit</groupId> + <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-api</artifactId> - <type>test-jar</type> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-smtp</artifactId> - <type>test-jar</type> - <scope>test</scope> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.1_spec</artifactId> </dependency> <dependency> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - <scope>test</scope> + <groupId>org.apache.james.jspf</groupId> + <artifactId>apache-jspf-resolver</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>apache-mailet-base</artifactId> - <classifier>tests</classifier> - <scope>test</scope> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-api</artifactId> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-api</artifactId> + <type>test-jar</type> <scope>test</scope> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-api</artifactId> - <scope>test</scope> - <type>test-jar</type> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-netty</artifactId> </dependency> + <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> - <scope>test</scope> - <type>test-jar</type> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-smtp</artifactId> </dependency> <dependency> <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-api</artifactId> + <artifactId>protocols-smtp</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-protocols-library</artifactId> - <type>test-jar</type> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> <dependency> @@ -205,20 +217,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/webadmin-integration-test/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/pom.xml index bd6b0c8..6566433 100644 --- a/server/protocols/webadmin-integration-test/pom.xml +++ b/server/protocols/webadmin-integration-test/pom.xml @@ -52,35 +52,35 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-jmap</artifactId> + <artifactId>james-server-cassandra-guice</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-webadmin-core</artifactId> + <artifactId>james-server-guice-common</artifactId> + <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-webadmin-data</artifactId> + <artifactId>james-server-guice-jmap</artifactId> + <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-webadmin-mailbox</artifactId> + <artifactId>james-server-webadmin-core</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-cassandra-guice</artifactId> - <type>test-jar</type> + <artifactId>james-server-webadmin-data</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-common</artifactId> - <type>test-jar</type> + <artifactId>james-server-webadmin-mailbox</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/webadmin/webadmin-core/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml index 55c3909..e3b1c74 100644 --- a/server/protocols/webadmin/webadmin-core/pom.xml +++ b/server/protocols/webadmin/webadmin-core/pom.xml @@ -35,7 +35,7 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-util-java8</artifactId> + <artifactId>james-server-jwt</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -43,7 +43,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-jwt</artifactId> + <artifactId>james-server-util-java8</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -80,20 +80,26 @@ <version>1.5.8</version> </dependency> <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> <version>2.0.1</version> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>nl.jqno.equalsverifier</groupId> + <artifactId>equalsverifier</artifactId> + <version>1.7.6</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> @@ -108,12 +114,6 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>nl.jqno.equalsverifier</groupId> - <artifactId>equalsverifier</artifactId> - <version>1.7.6</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/webadmin/webadmin-data/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml index 6aef53b..51bc1d6 100644 --- a/server/protocols/webadmin/webadmin-data/pom.xml +++ b/server/protocols/webadmin/webadmin-data/pom.xml @@ -32,14 +32,9 @@ <name>Apache James :: Server :: Web Admin :: data</name> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-util-java8</artifactId> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>james-server-data-api</artifactId> </dependency> <dependency> @@ -49,6 +44,10 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-server-util-java8</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-webadmin-core</artifactId> </dependency> @@ -87,13 +86,13 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> + <groupId>org.hamcrest</groupId> + <artifactId>java-hamcrest</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>java-hamcrest</artifactId> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/webadmin/webadmin-mailbox/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml index 3381291..12e1a48 100644 --- a/server/protocols/webadmin/webadmin-mailbox/pom.xml +++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml @@ -44,10 +44,6 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-util-java8</artifactId> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>james-server-data-api</artifactId> </dependency> <dependency> @@ -57,6 +53,10 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-server-util-java8</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-webadmin-core</artifactId> </dependency> <dependency> @@ -98,13 +98,13 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> + <groupId>org.hamcrest</groupId> + <artifactId>java-hamcrest</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>java-hamcrest</artifactId> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/queue/queue-activemq/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-activemq/pom.xml b/server/queue/queue-activemq/pom.xml index f28ea0d..2e839b9 100644 --- a/server/queue/queue-activemq/pom.xml +++ b/server/queue/queue-activemq/pom.xml @@ -35,11 +35,7 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-queue-api</artifactId> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-queue-jms</artifactId> + <artifactId>apache-mailet-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -51,38 +47,27 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-mailet-api</artifactId> + <artifactId>james-server-queue-api</artifactId> </dependency> <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-broker</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-queue-jms</artifactId> </dependency> <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-kahadb-store</artifactId> - <version>${activemq.version}</version> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-queue-jms</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-jms-client</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.1_spec</artifactId> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> @@ -94,20 +79,35 @@ <scope>test</scope> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-queue-jms</artifactId> - <type>test-jar</type> - <scope>test</scope> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-broker</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-kahadb-store</artifactId> + <version>${activemq.version}</version> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>artemis-jms-client</artifactId> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.1_spec</artifactId> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/queue/queue-api/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-api/pom.xml b/server/queue/queue-api/pom.xml index 84d76e5..f71380e 100644 --- a/server/queue/queue-api/pom.xml +++ b/server/queue/queue-api/pom.xml @@ -37,6 +37,12 @@ <groupId>${project.groupId}</groupId> <artifactId>apache-mailet-api</artifactId> </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-core</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>james-server-lifecycle-api</artifactId> @@ -49,12 +55,6 @@ <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-core</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -65,7 +65,7 @@ <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> - <dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> @@ -92,4 +92,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/queue/queue-file/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-file/pom.xml b/server/queue/queue-file/pom.xml index 5d9362c..2ab4292 100644 --- a/server/queue/queue-file/pom.xml +++ b/server/queue/queue-file/pom.xml @@ -32,11 +32,10 @@ <name>Apache James :: Server :: Mail Queue :: File</name> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-queue-api</artifactId> + <artifactId>james-server-core</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -44,20 +43,20 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-core</artifactId> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>james-server-lifecycle-api</artifactId> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-queue-api</artifactId> </dependency> <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> <!-- test dependencies --> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/queue/queue-jms/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml index 8c3e61a..7c455af 100644 --- a/server/queue/queue-jms/pom.xml +++ b/server/queue/queue-jms/pom.xml @@ -47,37 +47,26 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>metrics-api</artifactId> + <artifactId>james-server-protocols-smtp</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>james-server-queue-api</artifactId> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>metrics-api</artifactId> </dependency> <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>artemis-jms-client</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.1_spec</artifactId> - </dependency> - <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-smtp</artifactId> - </dependency> - <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> @@ -89,25 +78,36 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-broker</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.activemq</groupId> - <artifactId>activemq-broker</artifactId> - <scope>test</scope> + <artifactId>artemis-jms-client</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-protocols-smtp</artifactId> - <scope>test</scope> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.1_spec</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-smtp</artifactId> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
