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:35 UTC
[10/29] james-project git commit: JAMES-2124 automatically sort all
dependencies
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailbox/spring/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/spring/pom.xml b/mailbox/spring/pom.xml
index de815fc..1192e7d 100644
--- a/mailbox/spring/pom.xml
+++ b/mailbox/spring/pom.xml
@@ -28,8 +28,8 @@
</parent>
<artifactId>apache-james-mailbox-spring</artifactId>
- <name>Apache James :: Mailbox :: Spring</name>
<packaging>bundle</packaging>
+ <name>Apache James :: Mailbox :: Spring</name>
<dependencies>
<dependency>
@@ -38,72 +38,101 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
+ <artifactId>apache-james-mailbox-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
+ <!-- TODO: enable after fix maibox-hbase -->
+ <!--<dependency>-->
+ <!--<groupId>${project.groupId}</groupId>-->
+ <!--<artifactId>apache-james-mailbox-hbase</artifactId>-->
+ <!--</dependency>-->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-lucene</artifactId>
+ <artifactId>apache-james-mailbox-jcr</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
+ <artifactId>apache-james-mailbox-jpa</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jpa</artifactId>
+ <artifactId>apache-james-mailbox-lucene</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-maildir</artifactId>
</dependency>
- <!-- TODO: enable after fix maibox-hbase -->
- <!--<dependency>-->
- <!--<groupId>${project.groupId}</groupId>-->
- <!--<artifactId>apache-james-mailbox-hbase</artifactId>-->
- <!--</dependency>-->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jcr</artifactId>
+ <artifactId>apache-james-mailbox-memory</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tool</artifactId>
+ <artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-tool</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>xercesImpl</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</dependency>
<dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
<exclusions>
<exclusion>
- <artifactId>xercesImpl</artifactId>
- <groupId>xerces</groupId>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>jruby-complete</artifactId>
+ <groupId>org.jruby</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
- <!--
+ <!--
JCR temporary desactivated because jackrabbit still uses lucene 2
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -130,49 +159,20 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jruby</groupId>
- <artifactId>jruby-complete</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <scope>test</scope>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailbox/store/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/store/pom.xml b/mailbox/store/pom.xml
index 92f8548..6261ef0 100644
--- a/mailbox/store/pom.xml
+++ b/mailbox/store/pom.xml
@@ -28,8 +28,8 @@
</parent>
<artifactId>apache-james-mailbox-store</artifactId>
- <name>Apache James :: Mailbox :: Store Framework</name>
<packaging>bundle</packaging>
+ <name>Apache James :: Mailbox :: Store Framework</name>
<dependencies>
<dependency>
@@ -38,25 +38,39 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mime4j-core</artifactId>
+ <artifactId>apache-james-mailbox-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mime4j-james-utils</artifactId>
+ <artifactId>apache-mime4j-core</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-mime4j-james-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
+ <groupId>com.github.steveash.guavate</groupId>
+ <artifactId>guavate</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
</dependency>
@@ -69,12 +83,13 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>com.github.steveash.guavate</groupId>
- <artifactId>guavate</artifactId>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>net.javacrumbs.json-unit</groupId>
@@ -89,22 +104,18 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <groupId>nl.jqno.equalsverifier</groupId>
+ <artifactId>equalsverifier</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>nl.jqno.equalsverifier</groupId>
- <artifactId>equalsverifier</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-guava</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -118,19 +129,12 @@
<version>0.7.0-p9</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <type>test-jar</type>
- <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.assertj</groupId>
- <artifactId>assertj-guava</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailbox/tika/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml
index f8241da..3cc4470 100644
--- a/mailbox/tika/pom.xml
+++ b/mailbox/tika/pom.xml
@@ -28,9 +28,8 @@
</parent>
<artifactId>apache-james-mailbox-tika</artifactId>
- <description>Apache James Mailbox project for optional Tika dependency, to extract attachment textual content before indexation</description>
<name>Apache James :: Mailbox :: Tika</name>
-
+ <description>Apache James Mailbox project for optional Tika dependency, to extract attachment textual content before indexation</description>
<dependencies>
<dependency>
@@ -70,6 +69,11 @@
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.3.2</version>
@@ -94,11 +98,6 @@
<artifactId>testcontainers</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailbox/tool/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/tool/pom.xml b/mailbox/tool/pom.xml
index 369ff17..77b0e92 100644
--- a/mailbox/tool/pom.xml
+++ b/mailbox/tool/pom.xml
@@ -28,8 +28,8 @@
</parent>
<artifactId>apache-james-mailbox-tool</artifactId>
- <name>Apache James :: Mailbox :: Tools</name>
<packaging>bundle</packaging>
+ <name>Apache James :: Mailbox :: Tools</name>
<dependencies>
<dependency>
@@ -42,19 +42,23 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
+ <artifactId>apache-james-mailbox-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-store</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
@@ -65,15 +69,8 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <type>test-jar</type>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -82,9 +79,12 @@
<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>
+ <artifactId>slf4j-simple</artifactId>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailbox/zoo-seq-provider/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/zoo-seq-provider/pom.xml b/mailbox/zoo-seq-provider/pom.xml
index e6efcb2..ab2fe34 100644
--- a/mailbox/zoo-seq-provider/pom.xml
+++ b/mailbox/zoo-seq-provider/pom.xml
@@ -28,8 +28,8 @@
</parent>
<artifactId>zookeeper-sequence-provider</artifactId>
- <name>Apache James :: Mailbox :: Zookeeper Sequence Provider</name>
<packaging>bundle</packaging>
+ <name>Apache James :: Mailbox :: Zookeeper Sequence Provider</name>
<description>High performance distribuited sequence provider based on ZooKeepr</description>
<properties>
@@ -38,19 +38,6 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
@@ -59,14 +46,15 @@
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>com.netflix.curator</groupId>
- <artifactId>curator-recipes</artifactId>
- <version>${curator.version}</version>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>13.0</version><!--$NO-MVN-MAN-VER$-->
+ <version>13.0</version>
+ <!--$NO-MVN-MAN-VER$-->
+ </dependency>
+ <dependency>
+ <groupId>com.netflix.curator</groupId>
+ <artifactId>curator-client</artifactId>
+ <version>${curator.version}</version>
</dependency>
<dependency>
<groupId>com.netflix.curator</groupId>
@@ -75,7 +63,7 @@
</dependency>
<dependency>
<groupId>com.netflix.curator</groupId>
- <artifactId>curator-client</artifactId>
+ <artifactId>curator-recipes</artifactId>
<version>${curator.version}</version>
</dependency>
<dependency>
@@ -84,5 +72,18 @@
<version>${curator.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailet/ai/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/ai/pom.xml b/mailet/ai/pom.xml
index db66dc5..17c6499 100644
--- a/mailet/ai/pom.xml
+++ b/mailet/ai/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
+ <groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailet/api/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/api/pom.xml b/mailet/api/pom.xml
index 2669cd7..55e3c46 100644
--- a/mailet/api/pom.xml
+++ b/mailet/api/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
+ <groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
@@ -55,11 +55,11 @@
<version>1.7.5</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailet/base/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/base/pom.xml b/mailet/base/pom.xml
index 1fb13a5..2e596b5 100644
--- a/mailet/base/pom.xml
+++ b/mailet/base/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
+ <groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
@@ -31,11 +31,9 @@
<packaging>bundle</packaging>
<name>Apache James :: Basic Mailet Toolkit</name>
- <description>
- Apache James Basic Mailet Toolkit is a collection of utilities and lightweight framework
+ <description>Apache James Basic Mailet Toolkit is a collection of utilities and lightweight framework
aimed at developers and testers of mailets. This toolkit is extensively used elsewhere in
- James.
- </description>
+ James.</description>
<url>http://james.apache.org/mailet/base/</url>
<inceptionYear>2008</inceptionYear>
@@ -49,11 +47,6 @@
<artifactId>apache-mime4j-core</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
@@ -62,6 +55,16 @@
<artifactId>javax.mail</artifactId>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
@@ -71,11 +74,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<version>1.7.5</version>
@@ -92,13 +90,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <scope>test</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
@@ -131,4 +129,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailet/crypto/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/crypto/pom.xml b/mailet/crypto/pom.xml
index 3afa2cf..fdcbfd3 100644
--- a/mailet/crypto/pom.xml
+++ b/mailet/crypto/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
+ <groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
@@ -31,15 +31,22 @@
<packaging>bundle</packaging>
<name>Apache James :: Crypto Mailets</name>
- <description>
- Apache James Cryptographic Mailets is a collection of mailets which use cryptography.
- This includes matching signatures, decrypting, encrypting and signing.
- </description>
+ <description>Apache James Cryptographic Mailets is a collection of mailets which use cryptography.
+ This includes matching signatures, decrypting, encrypting and signing.</description>
<url>http://james.apache.org/mailet/crypto/</url>
<inceptionYear>2008</inceptionYear>
<dependencies>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-mailet-base</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
</dependency>
@@ -48,21 +55,12 @@
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk15on</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-base</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
- <version>${project.version}</version>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcmail-jdk15on</artifactId>
</dependency>
</dependencies>
@@ -73,9 +71,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Export-Package>
- org.apache.james.mailet.crypto.*
- </Export-Package>
+ <Export-Package>org.apache.james.mailet.crypto.*</Export-Package>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailet/icalendar/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/icalendar/pom.xml b/mailet/icalendar/pom.xml
index 5eba44b..c169617 100644
--- a/mailet/icalendar/pom.xml
+++ b/mailet/icalendar/pom.xml
@@ -18,12 +18,12 @@
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-mailet</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>apache-mailet-icalendar</artifactId>
@@ -47,11 +47,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.fge</groupId>
- <artifactId>throwing-lambdas</artifactId>
- <version>0.5.0</version>
- </dependency>
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
@@ -60,6 +55,11 @@
<artifactId>jackson-datatype-jdk8</artifactId>
</dependency>
<dependency>
+ <groupId>com.github.fge</groupId>
+ <artifactId>throwing-lambdas</artifactId>
+ <version>0.5.0</version>
+ </dependency>
+ <dependency>
<groupId>com.github.steveash.guavate</groupId>
<artifactId>guavate</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailet/mailetdocs-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/mailetdocs-maven-plugin/pom.xml b/mailet/mailetdocs-maven-plugin/pom.xml
index 6e71ed7..c055f19 100644
--- a/mailet/mailetdocs-maven-plugin/pom.xml
+++ b/mailet/mailetdocs-maven-plugin/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
+ <groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
@@ -31,55 +31,53 @@
<packaging>maven-plugin</packaging>
<name>Apache James :: Mailetdocs Maven Plugin</name>
- <description>
- This plugin generates documentation for Mailets by collating
- information available from implementation source.
- </description>
+ <description>This plugin generates documentation for Mailets by collating
+ information available from implementation source.</description>
<url>http://james.apache.org/mailet/maven-mailetdocs-plugin/</url>
<inceptionYear>2008</inceptionYear>
<dependencies>
<dependency>
- <groupId>org.apache.maven.artifact</groupId>
- <artifactId>maven-artifact</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-annotations</artifactId>
- <scope>provided</scope>
+ <groupId>com.thoughtworks.qdox</groupId>
+ <artifactId>qdox</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-impl</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-api</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-api</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>org.apache.maven.artifact</groupId>
+ <artifactId>maven-artifact</artifactId>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.thoughtworks.qdox</groupId>
- <artifactId>qdox</artifactId>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-impl</artifactId>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailet/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/pom.xml b/mailet/pom.xml
index 5073e66..3dac297 100644
--- a/mailet/pom.xml
+++ b/mailet/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
+ <groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
</parent>
@@ -34,6 +34,30 @@
<url>http://james.apache.org/mailet/</url>
<inceptionYear>2008</inceptionYear>
+ <mailingLists>
+ <mailingList>
+ <name>Apache Mailet API List</name>
+ <subscribe>mailet-api-subscribe@james.apache.org</subscribe>
+ <unsubscribe>mailet-api-unsubscribe@james.apache.org</unsubscribe>
+ <post>mailet-api-@james.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/james-mailet-api/</archive>
+ </mailingList>
+ </mailingLists>
+
+ <modules>
+ <module>ai</module>
+ <module>api</module>
+ <module>base</module>
+ <module>crypto</module>
+ <module>icalendar</module>
+ <module>mailetdocs-maven-plugin</module>
+ <module>standard</module>
+ </modules>
+
+ <issueManagement>
+ <url>http://issues.apache.org/jira/browse/MAILET</url>
+ </issueManagement>
+
<properties>
<!-- Override the source descriptor -->
<sourceReleaseAssemblyDescriptor>project</sourceReleaseAssemblyDescriptor>
@@ -61,17 +85,6 @@
<apache-commons-io.version>1.3.2</apache-commons-io.version>
</properties>
-
- <modules>
- <module>api</module>
- <module>base</module>
- <module>mailetdocs-maven-plugin</module>
- <module>crypto</module>
- <module>standard</module>
- <module>ai</module>
- <module>icalendar</module>
- </modules>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -96,6 +109,26 @@
<version>${mime4j.version}</version>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson-data.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jdk8</artifactId>
+ <version>${jackson-data.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.steveash.guavate</groupId>
+ <artifactId>guavate</artifactId>
+ <version>${guavate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>18.0</version>
+ </dependency>
+ <dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
<version>4.0.0</version>
@@ -106,6 +139,21 @@
<version>1.5.4</version>
</dependency>
<dependency>
+ <groupId>com.thoughtworks.qdox</groupId>
+ <artifactId>qdox</artifactId>
+ <version>${qdox.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>${activation.version}</version>
@@ -116,9 +164,10 @@
<version>${javax.inject.version}</version>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk15on</artifactId>
- <version>1.52</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -126,9 +175,20 @@
<version>${apache-commons-io.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.artifact</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${maven-artifact.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons-lang3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <version>${httpclient-osgi.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -136,50 +196,24 @@
<version>${maven-plugin-api.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.artifact</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>${maven-artifact.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>${maven-plugin-annotations.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-impl</artifactId>
- <version>${maven-reporting-impl.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
<version>${maven-reporting-api.version}</version>
</dependency>
<dependency>
- <groupId>org.mnode.ical4j</groupId>
- <artifactId>ical4j</artifactId>
- <version>${ical4j.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons-lang3.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-osgi</artifactId>
- <version>${httpclient-osgi.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-impl</artifactId>
+ <version>${maven-reporting-impl.version}</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
@@ -194,25 +228,14 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.thoughtworks.qdox</groupId>
- <artifactId>qdox</artifactId>
- <version>${qdox.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- <version>${junit.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>18.0</version>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcmail-jdk15on</artifactId>
+ <version>1.52</version>
</dependency>
<dependency>
- <groupId>com.github.steveash.guavate</groupId>
- <artifactId>guavate</artifactId>
- <version>${guavate.version}</version>
+ <groupId>org.mnode.ical4j</groupId>
+ <artifactId>ical4j</artifactId>
+ <version>${ical4j.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
@@ -224,16 +247,6 @@
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson-data.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jdk8</artifactId>
- <version>${jackson-data.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -261,7 +274,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <inherited>true</inherited>
<executions>
<execution>
<phase>verify</phase>
@@ -289,6 +301,7 @@
</configuration>
</execution>
</executions>
+ <inherited>true</inherited>
</plugin>
<!-- Add NOTICE and LICENSE to generated JAR -->
<plugin>
@@ -306,8 +319,7 @@
<properties>
<!-- <preProjectText>PRE PROCESS TEXT</preProjectText> -->
<postProjectText>This file is automatically generated by dependencies declared in
- pom.xml
- </postProjectText>
+ pom.xml</postProjectText>
<addLicense>true</addLicense>
</properties>
</configuration>
@@ -336,18 +348,4 @@
</plugins>
</reporting>
- <mailingLists>
- <mailingList>
- <name>Apache Mailet API List</name>
- <subscribe>mailet-api-subscribe@james.apache.org</subscribe>
- <unsubscribe>mailet-api-unsubscribe@james.apache.org</unsubscribe>
- <post>mailet-api-@james.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/james-mailet-api/</archive>
- </mailingList>
- </mailingLists>
-
- <issueManagement>
- <url>http://issues.apache.org/jira/browse/MAILET</url>
- </issueManagement>
-
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailet/standard/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml
index 41446fc..0551644 100644
--- a/mailet/standard/pom.xml
+++ b/mailet/standard/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
+ <groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
@@ -31,10 +31,8 @@
<packaging>bundle</packaging>
<name>Apache James :: Standard Mailets</name>
- <description>
- Apache James Standard Mailets is a rich collection of general purpose mailets
- with limited dependencies. These mailets can be used in any mailet container.
- </description>
+ <description>Apache James Standard Mailets is a rich collection of general purpose mailets
+ with limited dependencies. These mailets can be used in any mailet container.</description>
<url>http://james.apache.org/mailet/standard/</url>
<inceptionYear>2008</inceptionYear>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/metrics/metrics-api/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/metrics-api/pom.xml b/metrics/metrics-api/pom.xml
index 8956bc7..7ba3157 100644
--- a/metrics/metrics-api/pom.xml
+++ b/metrics/metrics-api/pom.xml
@@ -18,12 +18,12 @@
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>metrics</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>metrics-api</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/metrics/metrics-dropwizard/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/metrics-dropwizard/pom.xml b/metrics/metrics-dropwizard/pom.xml
index 7c99f0b..9a211f3 100644
--- a/metrics/metrics-dropwizard/pom.xml
+++ b/metrics/metrics-dropwizard/pom.xml
@@ -18,12 +18,12 @@
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>metrics</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>metrics-dropwizard</artifactId>
@@ -43,10 +43,6 @@
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-jvm</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
@@ -55,6 +51,10 @@
<artifactId>metrics-core</artifactId>
</dependency>
<dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-jvm</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/metrics/metrics-logger/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/metrics-logger/pom.xml b/metrics/metrics-logger/pom.xml
index a872988..e5fb6f9 100644
--- a/metrics/metrics-logger/pom.xml
+++ b/metrics/metrics-logger/pom.xml
@@ -18,12 +18,12 @@
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>metrics</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>metrics-logger</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/pom.xml b/metrics/pom.xml
index 04978e1..ac03444 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -89,9 +89,8 @@
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
- <version>${javax.inject.version}</version>
+ <version>${javax.inject.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/all/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/all/pom.xml b/mpt/all/pom.xml
index 7cf6424..d5f8679 100644
--- a/mpt/all/pom.xml
+++ b/mpt/all/pom.xml
@@ -28,18 +28,16 @@
<artifactId>apache-james-mpt-all</artifactId>
<packaging>pom</packaging>
<name>Apache James MPT All</name>
- <description>
-This module assembles distributions
-MPT is a functional test framework specialised for the ASCII line-base protocols common in mail.
- </description>
+ <description>This module assembles distributions
+MPT is a functional test framework specialised for the ASCII line-base protocols common in mail.</description>
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>jmock</groupId>
@@ -47,6 +45,10 @@ MPT is a functional test framework specialised for the ASCII line-base protocols
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</dependency>
@@ -55,28 +57,25 @@ MPT is a functional test framework specialised for the ASCII line-base protocols
<artifactId>ant-antunit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
- </configuration>
<executions>
<execution>
<id>make-assembly</id>
- <phase>package</phase> <!-- append to the packaging phase. -->
+ <phase>package</phase>
+ <!-- append to the packaging phase. -->
<goals>
<goal>attached</goal>
</goals>
</execution>
</executions>
+ <configuration>
+ <descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -101,7 +100,7 @@ MPT is a functional test framework specialised for the ASCII line-base protocols
<generateReports>false</generateReports>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</pluginManagement>
</build>
</profile>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/antlib/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/antlib/pom.xml b/mpt/antlib/pom.xml
index 3f24564..0eec84d 100644
--- a/mpt/antlib/pom.xml
+++ b/mpt/antlib/pom.xml
@@ -47,15 +47,6 @@ to the library requiring no extra coding.</description>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-antunit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
@@ -68,6 +59,15 @@ to the library requiring no extra coding.</description>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-antunit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -84,10 +84,10 @@ to the library requiring no extra coding.</description>
<configuration>
<tasks>
<ant antfile="src/test/resources/build.xml" inheritAll="false" inheritRefs="false">
- <property name="jar.name" location="${project.build.outputDirectory}" />
- <property name="base.dir" location="${basedir}" />
- <property name="test.skipped" value="${maven.test.skip}" />
- <property name="test.classpath" refid="maven.test.classpath" />
+ <property location="${project.build.outputDirectory}" name="jar.name"></property>
+ <property location="${basedir}" name="base.dir"></property>
+ <property name="test.skipped" value="${maven.test.skip}"></property>
+ <property name="test.classpath" refid="maven.test.classpath"></property>
</ant>
</tasks>
</configuration>
@@ -105,6 +105,13 @@ to the library requiring no extra coding.</description>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -120,18 +127,12 @@ to the library requiring no extra coding.</description>
</manifestEntries>
</archive>
</configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
<executions>
<execution>
<id>bundle-manifest</id>
@@ -141,7 +142,6 @@ to the library requiring no extra coding.</description>
</goals>
</execution>
</executions>
- <extensions>true</extensions>
<configuration>
<instructions>
<Export-Package>org.apache.james.mpt.ant</Export-Package>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/core/pom.xml b/mpt/core/pom.xml
index 4aec954..982e03f 100644
--- a/mpt/core/pom.xml
+++ b/mpt/core/pom.xml
@@ -27,23 +27,11 @@
</parent>
<artifactId>apache-james-mpt-core</artifactId>
<name>Apache James MPT Core</name>
- <description>
- Apache James Mail Protocol Tester (MPT) is a library providing a framework for the
- scriptable functional testing of ASCII based line protocols.
- </description>
+ <description>Apache James Mail Protocol Tester (MPT) is a library providing a framework for the
+ scriptable functional testing of ASCII based line protocols.</description>
<url>http://james.apache.org/mpt/main</url>
<dependencies>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-imap</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-imap</artifactId>
- <type>test-jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
@@ -85,6 +73,16 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-imap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-imap</artifactId>
+ <type>test-jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
@@ -99,6 +97,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>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -114,17 +119,11 @@
</manifestEntries>
</archive>
</configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
<executions>
<execution>
<id>bundle-manifest</id>
@@ -134,7 +133,6 @@
</goals>
</execution>
</executions>
- <extensions>true</extensions>
<configuration>
<instructions>
<Export-Package>org.apache.james.mpt</Export-Package>
@@ -160,7 +158,7 @@
</build>
<profiles>
- <profile>
+ <profile>
<id>doclint-java8-disable</id>
<activation>
<jdk>[1.8,)</jdk>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/impl/imap-mailbox/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cassandra/pom.xml b/mpt/impl/imap-mailbox/cassandra/pom.xml
index 8cfb5b5..b1b6cbb 100644
--- a/mpt/impl/imap-mailbox/cassandra/pom.xml
+++ b/mpt/impl/imap-mailbox/cassandra/pom.xml
@@ -38,8 +38,8 @@
<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>
@@ -56,4 +56,3 @@
</dependency>
</dependencies>
</project>
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/impl/imap-mailbox/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/core/pom.xml b/mpt/impl/imap-mailbox/core/pom.xml
index 2faf72e..0de4204 100644
--- a/mpt/impl/imap-mailbox/core/pom.xml
+++ b/mpt/impl/imap-mailbox/core/pom.xml
@@ -33,19 +33,6 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-imap</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-imap</artifactId>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
@@ -55,6 +42,10 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mpt-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
</dependency>
<dependency>
@@ -86,17 +77,17 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
- <!-- As mime4j use commons-logging we need to specify the binding here -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-imap</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-imap</artifactId>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
@@ -106,6 +97,14 @@
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
</dependency>
+ <!-- As mime4j use commons-logging we need to specify the binding here -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/impl/imap-mailbox/cyrus/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/cyrus/pom.xml b/mpt/impl/imap-mailbox/cyrus/pom.xml
index 6a1ebc1..cc253d3 100644
--- a/mpt/impl/imap-mailbox/cyrus/pom.xml
+++ b/mpt/impl/imap-mailbox/cyrus/pom.xml
@@ -32,6 +32,10 @@
<dependencies>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mpt-imapmailbox-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.jayway.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>1.6.5</version>
@@ -40,10 +44,5 @@
<groupId>com.spotify</groupId>
<artifactId>docker-client</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-mpt-imapmailbox-core</artifactId>
- </dependency>
</dependencies>
</project>
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/impl/imap-mailbox/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/elasticsearch/pom.xml b/mpt/impl/imap-mailbox/elasticsearch/pom.xml
index a8e9eb1..6f02d43 100644
--- a/mpt/impl/imap-mailbox/elasticsearch/pom.xml
+++ b/mpt/impl/imap-mailbox/elasticsearch/pom.xml
@@ -58,12 +58,12 @@
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/impl/imap-mailbox/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/pom.xml b/mpt/impl/imap-mailbox/hbase/pom.xml
index 598729d..dcd4605 100644
--- a/mpt/impl/imap-mailbox/hbase/pom.xml
+++ b/mpt/impl/imap-mailbox/hbase/pom.xml
@@ -33,16 +33,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-imapmailbox-core</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-hbase</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-imap</artifactId>
- <scope>test</scope>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -50,6 +45,11 @@
<version>13.0</version>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<type>test-jar</type>
@@ -61,10 +61,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-imap</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/impl/imap-mailbox/inmemory/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/pom.xml b/mpt/impl/imap-mailbox/inmemory/pom.xml
index e79b847..812ea5e 100644
--- a/mpt/impl/imap-mailbox/inmemory/pom.xml
+++ b/mpt/impl/imap-mailbox/inmemory/pom.xml
@@ -33,13 +33,12 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-imapmailbox-core</artifactId>
+ <artifactId>apache-james-mailbox-memory</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
- <scope>test</scope>
+ <artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
</dependencies>
</project>
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/impl/imap-mailbox/jcr/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jcr/pom.xml b/mpt/impl/imap-mailbox/jcr/pom.xml
index 6c1e12a..08e590a 100644
--- a/mpt/impl/imap-mailbox/jcr/pom.xml
+++ b/mpt/impl/imap-mailbox/jcr/pom.xml
@@ -33,11 +33,16 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-imapmailbox-core</artifactId>
+ <artifactId>apache-james-mailbox-jcr</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jcr</artifactId>
+ <artifactId>apache-james-mpt-imapmailbox-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
<scope>test</scope>
</dependency>
<!-- Use lucene 2.4.1 for now to let jcr tests pass -->
@@ -47,11 +52,5 @@
<version>${lucene-core.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/impl/imap-mailbox/jpa/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/pom.xml b/mpt/impl/imap-mailbox/jpa/pom.xml
index 3be39ae..662f32d 100644
--- a/mpt/impl/imap-mailbox/jpa/pom.xml
+++ b/mpt/impl/imap-mailbox/jpa/pom.xml
@@ -39,11 +39,13 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-imapmailbox-core</artifactId>
+ <artifactId>apache-james-mailbox-jpa</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -53,9 +55,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jpa</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
+ <artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
@@ -64,4 +64,3 @@
</dependency>
</dependencies>
</project>
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/impl/imap-mailbox/lucenesearch/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/lucenesearch/pom.xml b/mpt/impl/imap-mailbox/lucenesearch/pom.xml
index d5205bd..824f9db 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/pom.xml
+++ b/mpt/impl/imap-mailbox/lucenesearch/pom.xml
@@ -43,29 +43,25 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-lucene</artifactId>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-lucene</artifactId>
+ <artifactId>apache-james-mailbox-jpa</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jpa</artifactId>
+ <artifactId>apache-james-mailbox-lucene</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
+ <artifactId>apache-james-mailbox-lucene</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -76,6 +72,10 @@
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/impl/imap-mailbox/maildir/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/pom.xml b/mpt/impl/imap-mailbox/maildir/pom.xml
index 58bdc7f..54b2405 100644
--- a/mpt/impl/imap-mailbox/maildir/pom.xml
+++ b/mpt/impl/imap-mailbox/maildir/pom.xml
@@ -33,13 +33,12 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-imapmailbox-core</artifactId>
+ <artifactId>apache-james-mailbox-maildir</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-maildir</artifactId>
- <scope>test</scope>
+ <artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
</dependencies>
</project>
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/impl/imap-mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/pom.xml b/mpt/impl/imap-mailbox/pom.xml
index 2491aa9..506c098 100644
--- a/mpt/impl/imap-mailbox/pom.xml
+++ b/mpt/impl/imap-mailbox/pom.xml
@@ -29,12 +29,12 @@
</parent>
<artifactId>apache-james-mpt-imapmailbox</artifactId>
- <name>Apache James MPT Imap Mailbox</name>
<packaging>pom</packaging>
+ <name>Apache James MPT Imap Mailbox</name>
<modules>
- <module>core</module>
<module>cassandra</module>
+ <module>core</module>
<module>cyrus</module>
<module>elasticsearch</module>
<module>external-james</module>
@@ -42,10 +42,22 @@
<module>inmemory</module>
<module>jcr</module>
<module>jpa</module>
- <module>maildir</module>
<module>lucenesearch</module>
+ <module>maildir</module>
</modules>
-
+
+ <properties>
+ <cassandra.includes>empty</cassandra.includes>
+ <hbase.includes>empty</hbase.includes>
+ <inmemory.includes>empty</inmemory.includes>
+ <jcr.includes>empty</jcr.includes>
+ <jpa.includes>empty</jpa.includes>
+ <maildir.includes>empty</maildir.includes>
+ <cyrus.includes>empty</cyrus.includes>
+ <elasticsearch.includes>empty</elasticsearch.includes>
+ <jpa-lucene.includes>empty</jpa-lucene.includes>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -62,66 +74,75 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-imapmailbox-hbase</artifactId>
+ <artifactId>apache-james-mpt-imapmailbox-cyrus</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-imapmailbox-inmemory</artifactId>
+ <artifactId>apache-james-mpt-imapmailbox-elasticsearch</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-imapmailbox-jcr</artifactId>
+ <artifactId>apache-james-mpt-imapmailbox-hbase</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-imapmailbox-jpa</artifactId>
+ <artifactId>apache-james-mpt-imapmailbox-inmemory</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-imapmailbox-maildir</artifactId>
+ <artifactId>apache-james-mpt-imapmailbox-jcr</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-imapmailbox-cyrus</artifactId>
+ <artifactId>apache-james-mpt-imapmailbox-jpa</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-imapmailbox-elasticsearch</artifactId>
+ <artifactId>apache-james-mpt-imapmailbox-jpa-lucene</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-imapmailbox-jpa-lucene</artifactId>
+ <artifactId>apache-james-mpt-imapmailbox-maildir</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
- <properties>
- <cassandra.includes>empty</cassandra.includes>
- <hbase.includes>empty</hbase.includes>
- <inmemory.includes>empty</inmemory.includes>
- <jcr.includes>empty</jcr.includes>
- <jpa.includes>empty</jpa.includes>
- <maildir.includes>empty</maildir.includes>
- <cyrus.includes>empty</cyrus.includes>
- <elasticsearch.includes>empty</elasticsearch.includes>
- <jpa-lucene.includes>empty</jpa-lucene.includes>
- </properties>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <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}, ${hbase.includes}, ${inmemory.includes}, ${jcr.includes}, ${jpa.includes}, ${maildir.includes}, ${cyrus.includes},
+${elasticsearch.includes}, ${jpa-lucene.includes}</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<profiles>
<profile>
@@ -179,26 +200,4 @@
</properties>
</profile>
</profiles>
-
- <build>
- <pluginManagement>
- <plugins>
- <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}, ${hbase.includes}, ${inmemory.includes}, ${jcr.includes}, ${jpa.includes}, ${maildir.includes}, ${cyrus.includes},
-${elasticsearch.includes}, ${jpa-lucene.includes}</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
</project>
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mpt/impl/managesieve/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/pom.xml b/mpt/impl/managesieve/cassandra/pom.xml
index 02ddd90..13b0e83 100644
--- a/mpt/impl/managesieve/cassandra/pom.xml
+++ b/mpt/impl/managesieve/cassandra/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-cassandra</artifactId>
@@ -33,16 +33,16 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-managesieve-core</artifactId>
+ <artifactId>apache-james-backends-cassandra</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
- <type>test-jar</type>
+ <artifactId>apache-james-mpt-managesieve-core</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -69,4 +69,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/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/core/pom.xml b/mpt/impl/managesieve/core/pom.xml
index f55808c..fe7cb21 100644
--- a/mpt/impl/managesieve/core/pom.xml
+++ b/mpt/impl/managesieve/core/pom.xml
@@ -18,12 +18,12 @@
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>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>apache-james-mpt-managesieve-core</artifactId>
@@ -38,11 +38,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-managesieve</artifactId>
- </dependency>
-
<dependency>
<groupId>com.google.inject</groupId>
@@ -53,6 +48,10 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-managesieve</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org