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 bt...@apache.org on 2017/08/25 11:21:34 UTC
[09/29] james-project git commit: JAMES-2124 automatically sort all
dependencies
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/impl/managesieve/file/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/pom.xml b/mpt/impl/managesieve/file/pom.xml
index f016946..1794e4b 100644
--- a/mpt/impl/managesieve/file/pom.xml
+++ b/mpt/impl/managesieve/file/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>apache-james-mpt-managesieve</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>apache-james-mpt-managesieve-file</artifactId>
@@ -59,4 +59,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/impl/managesieve/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/pom.xml b/mpt/impl/managesieve/pom.xml
index f5b4afc..8d04ac0b 100644
--- a/mpt/impl/managesieve/pom.xml
+++ b/mpt/impl/managesieve/pom.xml
@@ -18,23 +18,23 @@
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>apache-james-mpt</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <name>Apache James MPT ManageSieve</name>
<artifactId>apache-james-mpt-managesieve</artifactId>
<packaging>pom</packaging>
+ <name>Apache James MPT ManageSieve</name>
+
<modules>
+ <module>cassandra</module>
<module>core</module>
<module>file</module>
- <module>cassandra</module>
</modules>
<dependencyManagement>
@@ -47,14 +47,14 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-managesieve-file</artifactId>
+ <artifactId>apache-james-mpt-managesieve-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-managesieve-core</artifactId>
+ <artifactId>apache-james-mpt-managesieve-file</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
@@ -102,4 +102,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/impl/smtp/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/pom.xml b/mpt/impl/smtp/cassandra/pom.xml
index e6c2e21..7035762 100644
--- a/mpt/impl/smtp/cassandra/pom.xml
+++ b/mpt/impl/smtp/cassandra/pom.xml
@@ -18,35 +18,34 @@
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>apache-james-mpt-smtp</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <name>Apache James MPT SMTP Cassandra</name>
<artifactId>apache-james-mpt-smtp-cassandra</artifactId>
<packaging>jar</packaging>
+ <name>Apache James MPT SMTP Cassandra</name>
+
<properties>
<cassandra.includes>empty</cassandra.includes>
</properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -69,20 +68,20 @@
<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>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -106,6 +105,29 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/suite/*.java</exclude>
+ <exclude>**/suite/**/*.java</exclude>
+ </excludes>
+ <includes>
+ <include>${cassandra.includes}</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>noTest</id>
@@ -134,27 +156,4 @@
</profile>
</profiles>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
- <includes>
- <include>${cassandra.includes}</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/impl/smtp/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/pom.xml b/mpt/impl/smtp/core/pom.xml
index 21bd7fa..a3b2259 100644
--- a/mpt/impl/smtp/core/pom.xml
+++ b/mpt/impl/smtp/core/pom.xml
@@ -18,18 +18,18 @@
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>apache-james-mpt-smtp</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <name>Apache James MPT SMTP Core</name>
<artifactId>apache-james-mpt-smtp-core</artifactId>
<packaging>jar</packaging>
+ <name>Apache James MPT SMTP Core</name>
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/impl/smtp/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/pom.xml b/mpt/impl/smtp/pom.xml
index 2f7e44e..3f255a3 100644
--- a/mpt/impl/smtp/pom.xml
+++ b/mpt/impl/smtp/pom.xml
@@ -18,21 +18,21 @@
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>apache-james-mpt</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>apache-james-mpt-smtp</artifactId>
- <name>Apache James MPT SMTP</name>
<packaging>pom</packaging>
+ <name>Apache James MPT SMTP</name>
<modules>
- <module>core</module>
<module>cassandra</module>
+ <module>core</module>
</modules>
<dependencyManagement>
@@ -64,10 +64,10 @@
<includes>
<include>**/cassandra/**/*.java</include>
</includes>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
+ <excludes>
+ <exclude>**/suite/*.java</exclude>
+ <exclude>**/suite/**/*.java</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/mavenplugin/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/mavenplugin/pom.xml b/mpt/mavenplugin/pom.xml
index f1fa538..ea9eb9c 100644
--- a/mpt/mavenplugin/pom.xml
+++ b/mpt/mavenplugin/pom.xml
@@ -48,14 +48,14 @@ to the library requiring no extra coding.</description>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
</dependencies>
<build>
@@ -187,7 +187,7 @@ to the library requiring no extra coding.</description>
<generateReports>false</generateReports>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</pluginManagement>
</build>
</profile>
@@ -207,6 +207,6 @@ to the library requiring no extra coding.</description>
</plugin>
</plugins>
</build>
- </profile>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/pom.xml b/mpt/pom.xml
index 49eab10..5bea082 100644
--- a/mpt/pom.xml
+++ b/mpt/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -36,9 +36,9 @@
<inceptionYear>2008</inceptionYear>
<modules>
+ <module>all</module>
<module>antlib</module>
<module>app</module>
- <module>all</module>
<module>core</module>
<module>impl/imap-mailbox</module>
<module>impl/managesieve</module>
@@ -69,164 +69,163 @@
<logback.version>1.1.7</logback.version>
</properties>
-
<dependencyManagement>
<dependencies>
- <!-- MPT dependencies -->
+ <!-- Other Apache James sub projects -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-antlib</artifactId>
+ <artifactId>apache-james-backends-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-antlib</artifactId>
+ <artifactId>apache-james-backends-cassandra</artifactId>
<version>${project.version}</version>
- <classifier>tests</classifier>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-app</artifactId>
+ <artifactId>apache-james-backends-es</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-app</artifactId>
+ <artifactId>apache-james-backends-es</artifactId>
<version>${project.version}</version>
- <classifier>tests</classifier>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-core</artifactId>
+ <artifactId>apache-james-backends-jpa</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-core</artifactId>
+ <artifactId>apache-james-mailbox-api</artifactId>
<version>${project.version}</version>
- <classifier>tests</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-core</artifactId>
+ <artifactId>apache-james-mailbox-cassandra</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
</dependency>
- <!-- Other Apache James sub projects -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
+ <artifactId>apache-james-mailbox-cassandra</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
- <type>test-jar</type>
+ <artifactId>apache-james-mailbox-elasticsearch</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-es</artifactId>
+ <artifactId>apache-james-mailbox-elasticsearch</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-es</artifactId>
- <type>test-jar</type>
+ <artifactId>apache-james-mailbox-hbase</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-jpa</artifactId>
- <type>test-jar</type>
+ <artifactId>apache-james-mailbox-jcr</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
+ <artifactId>apache-james-mailbox-jpa</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-cassandra</artifactId>
+ <artifactId>apache-james-mailbox-jpa</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-elasticsearch</artifactId>
+ <artifactId>apache-james-mailbox-lucene</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-elasticsearch</artifactId>
- <type>test-jar</type>
+ <artifactId>apache-james-mailbox-lucene</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-cassandra</artifactId>
+ <artifactId>apache-james-mailbox-maildir</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-hbase</artifactId>
+ <artifactId>apache-james-mailbox-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jcr</artifactId>
+ <artifactId>apache-james-mailbox-store</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jpa</artifactId>
+ <artifactId>apache-james-mailbox-store</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jpa</artifactId>
+ <artifactId>apache-james-mailbox-tika</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
+ <!-- MPT dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-lucene</artifactId>
+ <artifactId>apache-james-mpt-antlib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-lucene</artifactId>
+ <artifactId>apache-james-mpt-antlib</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
+ <classifier>tests</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-maildir</artifactId>
+ <artifactId>apache-james-mpt-app</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
+ <artifactId>apache-james-mpt-app</artifactId>
<version>${project.version}</version>
+ <classifier>tests</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
+ <artifactId>apache-james-mpt-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <type>test-jar</type>
+ <artifactId>apache-james-mpt-core</artifactId>
<version>${project.version}</version>
+ <classifier>tests</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tika</artifactId>
- <type>test-jar</type>
+ <artifactId>apache-james-mpt-core</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -237,8 +236,8 @@
<groupId>${project.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -257,11 +256,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailbox-adapter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<version>${project.version}</version>
</dependency>
@@ -273,8 +267,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
- <type>test-jar</type>
<version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -290,6 +284,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>james-server-mailbox-adapter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
@@ -305,34 +304,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-imap</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-imap</artifactId>
- <type>test-jar</type>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-managesieve</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!-- Other dependencies -->
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-antunit</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
@@ -343,6 +314,16 @@
<version>2.6.3</version>
</dependency>
<dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>${guice.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.jayway.restassured</groupId>
<artifactId>rest-assured</artifactId>
<version>2.6.0</version>
@@ -353,6 +334,11 @@
<version>3.5.10</version>
</dependency>
<dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>1.5.4</version>
+ </dependency>
+ <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.1</version>
@@ -385,22 +371,45 @@
<groupId>log4j</groupId>
</exclusion>
<exclusion>
- <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ </dependency>
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>1.1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ </dependency>
+ <!-- Other dependencies -->
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-antunit</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby.version}</version>
</dependency>
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>${h2.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-test</artifactId>
<version>${hadoop.version}</version>
@@ -413,34 +422,29 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
- <type>test-jar</type>
<version>${hbase.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>${guice.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <version>1.5.4</version>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>${jackrabbit-core.version}</version>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-imap</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>1.1.0</version>
- <scope>test</scope>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-imap</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <version>${jackrabbit-core.version}</version>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-managesieve</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
@@ -448,6 +452,11 @@
<version>3.8.0</version>
</dependency>
<dependency>
+ <groupId>org.cassandraunit</groupId>
+ <artifactId>cassandra-unit</artifactId>
+ <version>2.1.9.2</version>
+ </dependency>
+ <dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
<version>${jmock.version}</version>
@@ -457,25 +466,15 @@
<artifactId>jmock-junit4</artifactId>
<version>${jmock.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- </dependency>
- <dependency>
- <groupId>org.cassandraunit</groupId>
- <artifactId>cassandra-unit</artifactId>
- <version>2.1.9.2</version>
- </dependency>
+ <!-- As mime4j use commons-logging we need to specify the binding here -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
- <!-- As mime4j use commons-logging we need to specify the binding here -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
+ <artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
@@ -495,6 +494,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<archive>
<manifest>
@@ -503,13 +509,6 @@
</manifest>
</archive>
</configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9fd241c..4ac9afa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,10 +24,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
<artifactId>apache</artifactId>
+ <groupId>org.apache</groupId>
<version>18</version>
- <relativePath />
+ <relativePath></relativePath>
</parent>
<groupId>org.apache.james</groupId>
@@ -36,16 +36,14 @@
<packaging>pom</packaging>
<name>Apache James Project</name>
- <description>
- The Apache Java Enterprise Mail Server (a.k.a. Apache James) is a 100% pure Java SMTP, IMAP, JMAP and POP3 Mail
+ <description>The Apache Java Enterprise Mail Server (a.k.a. Apache James) is a 100% pure Java SMTP, IMAP, JMAP and POP3 Mail
server.
We have designed James to be a complete and portable enterprise mail engine solution based on currently
available open protocols. James is also a mail application platform. We have developed a Java API to let
you write Java code to process emails that we call the mailet API. A mailet can generate an automatic reply,
update a database, prevent spam, build a message archive, or whatever you can imagine. A matcher determines
whether your mailet should process an email in the server. The James project hosts the Mailet API, and James
- provides an implementation of this mail application platform API.
- </description>
+ provides an implementation of this mail application platform API.</description>
<url>http://james.apache.org/</url>
<inceptionYear>2006</inceptionYear>
@@ -61,103 +59,101 @@
<id>bago</id>
<name>Stefano Bagnara</name>
<email>bago@apache.org</email>
- <timezone>2</timezone>
<roles>
<role>Developer</role>
<role>PMC Member</role>
</roles>
+ <timezone>2</timezone>
</developer>
<developer>
<id>norman</id>
<name>Norman Maurer</name>
<email>norman@apache.org</email>
- <timezone>2</timezone>
<roles>
<role>Developer</role>
<role>PMC Member</role>
</roles>
+ <timezone>2</timezone>
</developer>
<developer>
<id>serge</id>
<name>Serge Knystautas</name>
<email>sergek@lokitech.com</email>
- <timezone />
<roles>
<role>Developer</role>
</roles>
+ <timezone></timezone>
<properties>
<Donator>Serge was the original donator of the James code, which has since been massively
improved by people smarter than him. He tries to answer questions on the listserv and make
code
- contributions when he does get a rare bit of free time.
- </Donator>
+ contributions when he does get a rare bit of free time.</Donator>
</properties>
</developer>
<developer>
<id>benrdf</id>
<name>Bernd Fondermann</name>
<email>bf_jak@brainlounge.de</email>
- <timezone />
<roles>
<role>Developer</role>
</roles>
+ <timezone></timezone>
</developer>
<developer>
<id>sbrewin</id>
<name>Steve Brewin</name>
<email>sbrewin@synsys.com</email>
- <timezone />
<roles>
<role>Developer</role>
<role>PMC Member</role>
</roles>
+ <timezone></timezone>
</developer>
<developer>
<id>hilmer</id>
<name>Søren Hilmer</name>
<email>sh@widetrail.dk</email>
- <timezone />
<roles>
<role>Developer</role>
<role>PMC Member</role>
</roles>
+ <timezone></timezone>
</developer>
<developer>
<id>noel</id>
<name>Noel J. Bergman</name>
<email>noel@devtech.com</email>
- <timezone />
<roles>
<role>Developer</role>
<role>PMC Member</role>
</roles>
+ <timezone></timezone>
</developer>
<developer>
<id>danny</id>
<name>Danny Angus</name>
<email>danny@apache.org</email>
- <timezone />
+ <organization>Student Loans Company ltd</organization>
+ <organizationUrl>http://www.slc.co.uk</organizationUrl>
<roles>
<role>Developer</role>
<role>PMC Member</role>
</roles>
- <organization>Student Loans Company ltd</organization>
- <organizationUrl>http://www.slc.co.uk</organizationUrl>
+ <timezone></timezone>
<properties>
<Description>Danny is a member of the Apache Software Foundation and married father
of two by night, and by day works as lead technical consultant for the Student Loans
- Company ltd.
- </Description>
+ Company ltd.</Description>
</properties>
</developer>
<developer>
<id>adc</id>
<name>Alan D. Cabrera</name>
<email>list@toolazydogs.com</email>
- <timezone>-8</timezone>
<roles>
<role>Developer</role>
</roles>
+ <timezone>-8</timezone>
</developer>
<developer>
<id>hbedi</id>
@@ -179,21 +175,21 @@
<id>vincenzo</id>
<name>Vincenzo Gianferrari Pini</name>
<email>vincenzo.gianferraripini@praxis.it</email>
- <timezone />
<roles>
<role>Developer</role>
<role>PMC Member</role>
</roles>
+ <timezone></timezone>
</developer>
<developer>
<id>rdonkin</id>
<name>Robert Burrell Donkin</name>
<email>rdonkin@apache.org</email>
- <timezone />
<roles>
<role>Developer</role>
<role>PMC Member</role>
</roles>
+ <timezone></timezone>
</developer>
<developer>
<id>niklas</id>
@@ -217,68 +213,68 @@
<id>mwiederkehr</id>
<name>Markus Wiederkehr</name>
<email>mwiederkehr@apache.org</email>
- <timezone />
<roles>
<role>Developer</role>
</roles>
+ <timezone></timezone>
</developer>
<developer>
<id>olegk</id>
<name>Oleg Kalnichevski</name>
<email>olegk@apache.org</email>
- <timezone />
<roles>
<role>Developer</role>
<role>PMC Member</role>
</roles>
+ <timezone></timezone>
</developer>
<developer>
<id>manolo</id>
<name>Manuel Carrasco Monino</name>
<email>manolo@apache.org</email>
- <timezone />
<roles>
<role>Developer</role>
<role>PMC Member</role>
</roles>
+ <timezone></timezone>
</developer>
<developer>
<id>eric</id>
<name>Eric Charles</name>
<email>eric@apache.org</email>
- <timezone />
<roles>
<role>Developer</role>
<role>PMC Chair</role>
</roles>
+ <timezone></timezone>
</developer>
<developer>
<id>felixk</id>
<name>Felix Knecht</name>
<email>felixk@apache.org</email>
- <timezone>1</timezone>
<roles>
<role>Emeritus</role>
</roles>
+ <timezone>1</timezone>
</developer>
<developer>
<id>ieugen</id>
<name>Ioan Eugen Stan</name>
<email>ieugen@apache.org</email>
- <timezone />
<roles>
<role>PMC Member</role>
<role>Developer</role>
</roles>
+ <timezone></timezone>
</developer>
<developer>
<id>matthieu</id>
<name>Matthieu Baechler</name>
<email>matthieu@apache.org</email>
- <timezone />
<roles>
<role>Developer</role>
</roles>
+ <timezone></timezone>
</developer>
<developer>
<id>btellier</id>
@@ -286,11 +282,11 @@
<email>btellier@linagora.com</email>
<organization>Linagora</organization>
<organizationUrl>https://linagora.com</organizationUrl>
- <timezone />
<roles>
<role>PMC Member</role>
<role>Developer</role>
</roles>
+ <timezone></timezone>
</developer>
<developer>
<id>aduprat</id>
@@ -298,11 +294,11 @@
<email>aduprat@linagora.com</email>
<organization>Linagora</organization>
<organizationUrl>https://linagora.com</organizationUrl>
- <timezone />
<roles>
<role>PMC Member</role>
<role>Developer</role>
</roles>
+ <timezone></timezone>
</developer>
<developer>
<id>rouazana</id>
@@ -310,10 +306,10 @@
<email>rouazana@linagora.com</email>
<organization>Linagora</organization>
<organizationUrl>https://linagora.com</organizationUrl>
- <timezone />
<roles>
<role>Developer</role>
</roles>
+ <timezone></timezone>
</developer>
</developers>
@@ -531,11 +527,21 @@
<maven>3.0.2</maven>
</prerequisites>
+ <modules>
+ <module>backends-common</module>
+ <module>mailbox</module>
+ <module>mailet</module>
+ <module>metrics</module>
+ <module>mpt</module>
+ <module>protocols</module>
+ <module>server</module>
+ </modules>
+
<scm>
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/james-project.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/james-project.git</developerConnection>
+ <tag>HEAD</tag>
<url>http://git-wip-us.apache.org/repos/asf/james-project.git</url>
- <tag>HEAD</tag>
</scm>
<issueManagement>
@@ -571,19 +577,9 @@
This property contains the directory where to deploy when running using "-Psite-reports" profile
to avoid accidently overriding the common modules website. Empty by default.
-->
- <deployTechnicalSiteDirectory />
+ <deployTechnicalSiteDirectory></deployTechnicalSiteDirectory>
</properties>
- <modules>
- <module>backends-common</module>
- <module>mailbox</module>
- <module>mailet</module>
- <module>metrics</module>
- <module>mpt</module>
- <module>protocols</module>
- <module>server</module>
- </modules>
-
<build>
<extensions>
<extension>
@@ -940,7 +936,7 @@
<execute>
<runOnIncremental>false</runOnIncremental>
</execute>
- <ignore />
+ <ignore></ignore>
</action>
</pluginExecution>
<pluginExecution>
@@ -956,7 +952,7 @@
<execute>
<runOnIncremental>false</runOnIncremental>
</execute>
- <ignore />
+ <ignore></ignore>
</action>
</pluginExecution>
<pluginExecution>
@@ -972,7 +968,7 @@
<execute>
<runOnIncremental>false</runOnIncremental>
</execute>
- <ignore />
+ <ignore></ignore>
</action>
</pluginExecution>
<pluginExecution>
@@ -986,7 +982,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore></ignore>
</action>
</pluginExecution>
<pluginExecution>
@@ -999,7 +995,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
@@ -1120,13 +1116,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java18</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
<executions>
<execution>
<id>check_java_8</id>
@@ -1136,6 +1125,13 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <signature>
+ <groupId>org.codehaus.mojo.signature</groupId>
+ <artifactId>java18</artifactId>
+ <version>1.0</version>
+ </signature>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -1147,13 +1143,6 @@
-->
<profile>
<id>site-reports</id>
- <properties>
- <!--
- This property contains the directory where to deploy when running using "-Psite-reports" profile
- to avoid accidently overriding the common modules website
- -->
- <deployTechnicalSiteDirectory>technical-reports/</deployTechnicalSiteDirectory>
- </properties>
<build>
<pluginManagement>
@@ -1161,6 +1150,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.3</version>
+ </dependency>
+ </dependencies>
<configuration>
<siteDirectory>${basedir}/src/reporting-site</siteDirectory>
<reportPlugins combine.children="append">
@@ -1343,17 +1339,17 @@
-->
</reportPlugins>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>
</build>
+ <properties>
+ <!--
+ This property contains the directory where to deploy when running using "-Psite-reports" profile
+ to avoid accidently overriding the common modules website
+ -->
+ <deployTechnicalSiteDirectory>technical-reports/</deployTechnicalSiteDirectory>
+ </properties>
</profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/protocols/api/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/api/pom.xml b/protocols/api/pom.xml
index d0c9fe3..f53e17f 100644
--- a/protocols/api/pom.xml
+++ b/protocols/api/pom.xml
@@ -35,26 +35,26 @@
<dependencies>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
<groupId>com.github.steveash.guavate</groupId>
<artifactId>guavate</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</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/protocols/imap/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml
index f145813..4ce0ca7 100644
--- a/protocols/imap/pom.xml
+++ b/protocols/imap/pom.xml
@@ -38,7 +38,42 @@
<groupId>${project.groupId}</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.1.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.beetstra.jutf7</groupId>
+ <artifactId>jutf7</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>nl.jqno.equalsverifier</groupId>
+ <artifactId>equalsverifier</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
@@ -49,7 +84,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox-store</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-core</artifactId>
@@ -72,38 +111,6 @@
<artifactId>metrics-api</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>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.1.7</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.beetstra.jutf7</groupId>
- <artifactId>jutf7</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
@@ -121,13 +128,13 @@
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
+ <scope>test</scope>
<exclusions>
<exclusion>
- <groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
+ <groupId>junit</groupId>
</exclusion>
</exclusions>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
@@ -135,20 +142,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>nl.jqno.equalsverifier</groupId>
- <artifactId>equalsverifier</artifactId>
- <scope>test</scope>
+ <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/protocols/lmtp/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/lmtp/pom.xml b/protocols/lmtp/pom.xml
index 47ddbcb..90da688 100644
--- a/protocols/lmtp/pom.xml
+++ b/protocols/lmtp/pom.xml
@@ -40,7 +40,24 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>protocols-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>protocols-netty</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>protocols-smtp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>protocols-smtp</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -62,27 +79,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>protocols-netty</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>protocols-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>protocols-smtp</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/protocols/managesieve/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/managesieve/pom.xml b/protocols/managesieve/pom.xml
index 20a6d80..0b85749 100644
--- a/protocols/managesieve/pom.xml
+++ b/protocols/managesieve/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
<artifactId>protocols</artifactId>
+ <groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -35,14 +35,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-jsieve-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-data-api</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
@@ -60,6 +52,14 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-data-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
@@ -71,5 +71,4 @@
</dependency>
</dependencies>
-
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/protocols/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/pom.xml b/protocols/pom.xml
index b5558b0..6994d53 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -61,243 +61,6 @@
<mockito-core.version>1.9.0</mockito-core.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-util</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-util-java8</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-pop3</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-lmtp</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-smtp</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-smtp</artifactId>
- <type>test-jar</type>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-netty</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>metrics-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
-
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>1.1.7</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.9</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-digester</artifactId>
- <groupId>commons-digester</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-beanutils-core</artifactId>
- <groupId>commons-beanutils</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- <version>${apache-commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>com.github.steveash.guavate</groupId>
- <artifactId>guavate</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>18.0</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-data-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-jsieve-core</artifactId>
- <version>${jsieve.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!--
- START Mail
- -->
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j-core</artifactId>
- <version>${apache-mime4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- <version>${apache-mime4j.version}</version>
- </dependency>
- <!--
- END Mail
- -->
- <dependency>
- <groupId>com.beetstra.jutf7</groupId>
- <artifactId>jutf7</artifactId>
- <version>${jutf7.version}</version>
- </dependency>
-
- <!--
- START Testing
- -->
-
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>${jmock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- <version>${jmock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>${commons-net.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <scope>test</scope>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <version>1.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>3.8.0</version>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-guava</artifactId>
- <version>1.3.1</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito-core.version}</version>
- </dependency>
- <dependency>
- <groupId>nl.jqno.equalsverifier</groupId>
- <artifactId>equalsverifier</artifactId>
- <version>1.7.6</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/protocols/pop3/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/pop3/pom.xml b/protocols/pop3/pom.xml
index d2564d8..30fc2ce 100644
--- a/protocols/pop3/pom.xml
+++ b/protocols/pop3/pom.xml
@@ -39,19 +39,10 @@
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>protocols-api</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -59,6 +50,15 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -70,4 +70,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/protocols/smtp/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/smtp/pom.xml b/protocols/smtp/pom.xml
index cc59f46..36b5884 100644
--- a/protocols/smtp/pom.xml
+++ b/protocols/smtp/pom.xml
@@ -35,28 +35,20 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-util</artifactId>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>protocols-api</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>protocols-netty</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>metrics-api</artifactId>
- </dependency>
- <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</dependency>
@@ -65,6 +57,11 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<optional>true</optional>
@@ -88,9 +85,12 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>metrics-api</artifactId>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
@@ -134,7 +134,7 @@
</relocation>
</relocations>
<transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"></transformer>
</transformers>
</configuration>
</execution>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org