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:26 UTC
[01/29] james-project git commit: JAMES-2124 use project groupId for
internal dependencies
Repository: james-project
Updated Branches:
refs/heads/master 10d76ab6e -> 1b670aecc
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 03c6dad..f6160bc 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -196,197 +196,197 @@
<version>${pax-logging-api.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-cli</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-spring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-cassandra-ldap-guice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-onami</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-mailbox</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-jetty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-file</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-jms</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-jms</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-activemq</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-library</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-dnsjava</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
<version>${project.version}</version>
<exclusions>
@@ -397,7 +397,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<version>${project.version}</version>
<exclusions>
@@ -412,7 +412,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
@@ -429,7 +429,7 @@
<version>${activmq-artemis.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -442,7 +442,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-standard</artifactId>
<version>${project.version}</version>
<exclusions>
@@ -453,7 +453,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-standard</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -467,17 +467,17 @@
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-dropwizard</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
<version>${project.version}</version>
</dependency>
@@ -528,182 +528,182 @@
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailetcontainer-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailetcontainer-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailetcontainer-camel</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailbox-adapter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<type>test-jar</type>
<scope>test</scope>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-hbase</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-file</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-jdbc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-jmap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-jmap</artifactId>
<scope>test</scope>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-jmap-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-jcr</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-memory-guice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-memory-guice</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-jmap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-jmap-integration-testing</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-jmap-integration-testing</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-data</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-mailbox</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-swagger</artifactId>
<version>${project.version}</version>
</dependency>
@@ -715,57 +715,57 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-cassandra</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-kafka</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<version>${project.version}</version>
<exclusions>
@@ -788,18 +788,18 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-spring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
<version>${project.version}</version>
</dependency>
@@ -815,29 +815,29 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-hbase</artifactId>
<classifier>tests</classifier>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-ldap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-ldap-integration-testing</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-jwt</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-lmtp</artifactId>
<version>${project.version}</version>
</dependency>
@@ -848,70 +848,70 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-smtp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-imap4</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-pop3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-fetchmail</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailets</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-maildir</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-tool</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jcr</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<version>${project.version}</version>
<exclusions>
@@ -926,7 +926,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
@@ -942,7 +942,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-smtp</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
@@ -981,17 +981,17 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-jsieve-core</artifactId>
<version>${jsieve.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
<version>${apache-mime4j.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-james-utils</artifactId>
<version>${apache-mime4j.version}</version>
</dependency>
@@ -1545,7 +1545,7 @@
<!-- Apache Felix Karaf integration -->
<dependency>
- <groupId>org.apache.james.karaf</groupId>
+ <groupId>org.apache.james</groupId>
<artifactId>james-karaf-distribution</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -1563,7 +1563,7 @@
</dependency>
<dependency>
- <groupId>org.apache.james.karaf</groupId>
+ <groupId>org.apache.james</groupId>
<artifactId>james-karaf-features</artifactId>
<version>${project.version}</version>
<type>pom</type>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/protocols/fetchmail/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/pom.xml b/server/protocols/fetchmail/pom.xml
index cbbfc82..e928da4 100644
--- a/server/protocols/fetchmail/pom.xml
+++ b/server/protocols/fetchmail/pom.xml
@@ -34,31 +34,31 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
index a7536a0..f544fb3 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -59,46 +59,46 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-jmap-integration-testing</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -145,7 +145,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
index 7835ba0..8b7400a 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
@@ -35,44 +35,44 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-jmap</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-mailbox</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
index c9e475d..a4939a4 100644
--- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
@@ -47,34 +47,34 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-jmap-integration-testing</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-memory-guice</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-memory-guice</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/protocols/jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml
index c3b996d..9a9ecec 100644
--- a/server/protocols/jmap/pom.xml
+++ b/server/protocols/jmap/pom.xml
@@ -34,111 +34,111 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-core</artifactId>
<version>${apache-mime4j.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-jmap</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-jetty</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-jwt</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/protocols/protocols-imap4/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/pom.xml b/server/protocols/protocols-imap4/pom.xml
index 68ca0cf..b22acf6 100644
--- a/server/protocols/protocols-imap4/pom.xml
+++ b/server/protocols/protocols-imap4/pom.xml
@@ -34,23 +34,23 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/protocols/protocols-library/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/pom.xml b/server/protocols/protocols-library/pom.xml
index 1b5ea6a..f6cffa7 100644
--- a/server/protocols/protocols-library/pom.xml
+++ b/server/protocols/protocols-library/pom.xml
@@ -34,16 +34,16 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<exclusions>
<exclusion>
@@ -53,7 +53,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/protocols/protocols-lmtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-lmtp/pom.xml b/server/protocols/protocols-lmtp/pom.xml
index 60c862a..ac12269 100644
--- a/server/protocols/protocols-lmtp/pom.xml
+++ b/server/protocols/protocols-lmtp/pom.xml
@@ -34,19 +34,19 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-smtp</artifactId>
<exclusions>
<exclusion>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-library</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</exclusion>
<exclusion>
@@ -56,19 +56,19 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
@@ -88,11 +88,11 @@
<artifactId>protocols-lmtp</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/protocols/protocols-managesieve/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-managesieve/pom.xml b/server/protocols/protocols-managesieve/pom.xml
index 5bbcbb6..0e54923 100644
--- a/server/protocols/protocols-managesieve/pom.xml
+++ b/server/protocols/protocols-managesieve/pom.xml
@@ -14,11 +14,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/protocols/protocols-pop3/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-pop3/pom.xml b/server/protocols/protocols-pop3/pom.xml
index 30d3e21..357aef9 100644
--- a/server/protocols/protocols-pop3/pom.xml
+++ b/server/protocols/protocols-pop3/pom.xml
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
@@ -56,7 +56,7 @@
<artifactId>protocols-pop3</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
@@ -76,11 +76,11 @@
<artifactId>netty</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
@@ -93,23 +93,23 @@
</dependency>
<!-- Test dependencies -->
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<scope>test</scope>
</dependency>
@@ -124,13 +124,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/protocols/protocols-smtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml
index 5dd26e6..842addd 100644
--- a/server/protocols/protocols-smtp/pom.xml
+++ b/server/protocols/protocols-smtp/pom.xml
@@ -34,47 +34,47 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-library</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
@@ -131,24 +131,24 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -165,7 +165,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
@@ -176,13 +176,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
@@ -194,7 +194,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/protocols/webadmin-integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/pom.xml
index c3fb28d..bd6b0c8 100644
--- a/server/protocols/webadmin-integration-test/pom.xml
+++ b/server/protocols/webadmin-integration-test/pom.xml
@@ -34,51 +34,51 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-data</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-mailbox</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/protocols/webadmin/webadmin-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-cassandra/pom.xml b/server/protocols/webadmin/webadmin-cassandra/pom.xml
index 3991a6d..623462d 100644
--- a/server/protocols/webadmin/webadmin-cassandra/pom.xml
+++ b/server/protocols/webadmin/webadmin-cassandra/pom.xml
@@ -34,15 +34,15 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/protocols/webadmin/webadmin-core/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml
index 80a9c7f..55c3909 100644
--- a/server/protocols/webadmin/webadmin-core/pom.xml
+++ b/server/protocols/webadmin/webadmin-core/pom.xml
@@ -34,23 +34,23 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-jwt</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/protocols/webadmin/webadmin-data/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml
index 1c19c03..6aef53b 100644
--- a/server/protocols/webadmin/webadmin-data/pom.xml
+++ b/server/protocols/webadmin/webadmin-data/pom.xml
@@ -35,25 +35,25 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/protocols/webadmin/webadmin-mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml
index 59602fc..3381291 100644
--- a/server/protocols/webadmin/webadmin-mailbox/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml
@@ -34,33 +34,33 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/protocols/webadmin/webadmin-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-swagger/pom.xml b/server/protocols/webadmin/webadmin-swagger/pom.xml
index 8df5afb..a2a7bce 100644
--- a/server/protocols/webadmin/webadmin-swagger/pom.xml
+++ b/server/protocols/webadmin/webadmin-swagger/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/queue/queue-activemq/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-activemq/pom.xml b/server/queue/queue-activemq/pom.xml
index f6d1ccd..f28ea0d 100644
--- a/server/queue/queue-activemq/pom.xml
+++ b/server/queue/queue-activemq/pom.xml
@@ -34,23 +34,23 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-jms</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
@@ -94,7 +94,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-jms</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/queue/queue-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-api/pom.xml b/server/queue/queue-api/pom.xml
index 218f159..84d76e5 100644
--- a/server/queue/queue-api/pom.xml
+++ b/server/queue/queue-api/pom.xml
@@ -34,11 +34,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
@@ -51,7 +51,7 @@
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/queue/queue-file/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-file/pom.xml b/server/queue/queue-file/pom.xml
index 0ba5e22..5d9362c 100644
--- a/server/queue/queue-file/pom.xml
+++ b/server/queue/queue-file/pom.xml
@@ -35,19 +35,19 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/queue/queue-jms/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml
index ac42806..8c3e61a 100644
--- a/server/queue/queue-jms/pom.xml
+++ b/server/queue/queue-jms/pom.xml
@@ -34,23 +34,23 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
@@ -99,7 +99,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-smtp</artifactId>
<scope>test</scope>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[04/29] james-project git commit: JAMES-2124 automatically sort all
dependencies
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/fetchmail/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/pom.xml b/server/protocols/fetchmail/pom.xml
index e928da4..388de19 100644
--- a/server/protocols/fetchmail/pom.xml
+++ b/server/protocols/fetchmail/pom.xml
@@ -35,51 +35,51 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-api</artifactId>
+ <artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>james-server-core</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
+ <artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-core</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
+ <artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-api</artifactId>
+ <artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
index f544fb3..c38eeed 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
@@ -17,8 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -66,31 +65,31 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-common</artifactId>
- <scope>test</scope>
+ <artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-jmap</artifactId>
- <scope>test</scope>
+ <artifactId>james-server-guice-common</artifactId>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-jmap-integration-testing</artifactId>
+ <artifactId>james-server-guice-jmap</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
+ <artifactId>james-server-jmap-integration-testing</artifactId>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -110,12 +109,12 @@
</dependency>
<dependency>
<groupId>info.cukes</groupId>
- <artifactId>cucumber-java</artifactId>
+ <artifactId>cucumber-guice</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>info.cukes</groupId>
- <artifactId>cucumber-guice</artifactId>
+ <artifactId>cucumber-java</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -145,12 +144,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-util-java8</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
index 8b7400a..8ac2e49 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
@@ -32,7 +32,6 @@
<name>Apache James :: Server :: JMAP :: Integration testing Common</name>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -41,34 +40,34 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-common</artifactId>
+ <artifactId>james-server-dnsservice-api</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<scope>test</scope>
- <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-jmap</artifactId>
+ <artifactId>james-server-guice-common</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-mailbox</artifactId>
+ <artifactId>james-server-guice-jmap</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-testing</artifactId>
+ <artifactId>james-server-guice-mailbox</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- <type>test-jar</type>
+ <artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -80,7 +79,8 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version> <!--$NO-MVN-MAN-VER$-->
+ <version>18.0</version>
+ <!--$NO-MVN-MAN-VER$-->
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
index a4939a4..2522c75 100644
--- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
@@ -17,8 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -36,6 +35,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>james-server-dnsservice-api</artifactId>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -54,29 +58,29 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-testing</artifactId>
+ <artifactId>james-server-memory-guice</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>james-server-memory-guice</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util-java8</artifactId>
- <type>test-jar</type>
+ <artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
+ <artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-memory-guice</artifactId>
- <type>test-jar</type>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -86,17 +90,17 @@
</dependency>
<dependency>
<groupId>info.cukes</groupId>
- <artifactId>cucumber-java</artifactId>
+ <artifactId>cucumber-guice</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>info.cukes</groupId>
- <artifactId>cucumber-junit</artifactId>
+ <artifactId>cucumber-java</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>info.cukes</groupId>
- <artifactId>cucumber-guice</artifactId>
+ <artifactId>cucumber-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -105,11 +109,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
@@ -119,8 +118,8 @@
<artifactId>java-hamcrest</artifactId>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/pom.xml
index fd7f96a..906fc2c 100644
--- a/server/protocols/jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/pom.xml
@@ -29,8 +29,8 @@
</parent>
<artifactId>jmap-integration-testing</artifactId>
- <name>Apache James :: Server :: JMAP :: Integration testing</name>
<packaging>pom</packaging>
+ <name>Apache James :: Server :: JMAP :: Integration testing</name>
<modules>
<module>jmap-integration-testing-common</module>
@@ -51,4 +51,3 @@
</profile>
</profiles>
</project>
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml
index 9a9ecec..7674f20 100644
--- a/server/protocols/jmap/pom.xml
+++ b/server/protocols/jmap/pom.xml
@@ -40,8 +40,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -51,8 +51,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -68,8 +68,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -100,8 +100,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/jwt/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jwt/pom.xml b/server/protocols/jwt/pom.xml
index 269fc0f..f5cf54c 100644
--- a/server/protocols/jwt/pom.xml
+++ b/server/protocols/jwt/pom.xml
@@ -18,13 +18,13 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-jwt</artifactId>
<packaging>jar</packaging>
@@ -33,10 +33,6 @@
<dependencies>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
@@ -45,6 +41,10 @@
<artifactId>jjwt</artifactId>
</dependency>
<dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -88,4 +88,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/protocols-imap4/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/pom.xml b/server/protocols/protocols-imap4/pom.xml
index b22acf6..9dcfa66 100644
--- a/server/protocols/protocols-imap4/pom.xml
+++ b/server/protocols/protocols-imap4/pom.xml
@@ -35,11 +35,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-library</artifactId>
+ <artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
+ <artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -54,18 +54,6 @@
<artifactId>metrics-logger</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-imap</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-netty</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- </dependency>
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
@@ -78,16 +66,12 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </dependency>
- <dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
<dependency>
@@ -96,10 +80,26 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-imap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-netty</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/protocols-library/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/pom.xml b/server/protocols/protocols-library/pom.xml
index f6cffa7..083d05a 100644
--- a/server/protocols/protocols-library/pom.xml
+++ b/server/protocols/protocols-library/pom.xml
@@ -35,11 +35,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
@@ -47,8 +47,8 @@
<artifactId>james-server-util</artifactId>
<exclusions>
<exclusion>
- <groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -57,18 +57,6 @@
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-netty</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
@@ -77,12 +65,24 @@
<artifactId>netty</artifactId>
</dependency>
<dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-netty</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/protocols-lmtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-lmtp/pom.xml b/server/protocols/protocols-lmtp/pom.xml
index ac12269..4c141ef 100644
--- a/server/protocols/protocols-lmtp/pom.xml
+++ b/server/protocols/protocols-lmtp/pom.xml
@@ -35,41 +35,69 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-mailet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-lifecycle-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-protocols-library</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-smtp</artifactId>
<exclusions>
<exclusion>
- <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
+ <groupId>${project.groupId}</groupId>
</exclusion>
<exclusion>
- <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-library</artifactId>
+ <groupId>${project.groupId}</groupId>
</exclusion>
<exclusion>
- <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
+ <groupId>${project.groupId}</groupId>
</exclusion>
<exclusion>
- <groupId>org.apache.james.jspf</groupId>
<artifactId>apache-jspf-resolver</artifactId>
+ <groupId>org.apache.james.jspf</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-core</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-library</artifactId>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-api</artifactId>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james.protocols</groupId>
@@ -77,7 +105,7 @@
</dependency>
<dependency>
<groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-smtp</artifactId>
+ <artifactId>protocols-lmtp</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james.protocols</groupId>
@@ -85,40 +113,12 @@
</dependency>
<dependency>
<groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-lmtp</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
+ <artifactId>protocols-smtp</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/protocols-managesieve/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-managesieve/pom.xml b/server/protocols/protocols-managesieve/pom.xml
index 0e54923..f11516c 100644
--- a/server/protocols/protocols-managesieve/pom.xml
+++ b/server/protocols/protocols-managesieve/pom.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-protocols-managesieve</artifactId>
@@ -15,25 +15,17 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-library</artifactId>
+ <artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
+ <artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-managesieve</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-netty</artifactId>
- </dependency>
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
@@ -54,9 +46,17 @@
<artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-managesieve</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-netty</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/protocols-pop3/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-pop3/pom.xml b/server/protocols/protocols-pop3/pom.xml
index 357aef9..4558066 100644
--- a/server/protocols/protocols-pop3/pom.xml
+++ b/server/protocols/protocols-pop3/pom.xml
@@ -35,83 +35,61 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-library</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-netty</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-api</artifactId>
+ <artifactId>apache-james-mailbox-api</artifactId>
</dependency>
+ <!-- Test dependencies -->
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-api</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-pop3</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
+ <artifactId>apache-james-mailbox-store</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
+ <artifactId>james-server-data-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-library</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-filesystem-api</artifactId>
</dependency>
- <!-- Test dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
+ <artifactId>james-server-filesystem-api</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <scope>test</scope>
+ <artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
+ <artifactId>james-server-protocols-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
- <scope>test</scope>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>commons-net</groupId>
@@ -119,22 +97,44 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-library</artifactId>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-netty</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-pop3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/protocols-smtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml
index 842addd..3326d74 100644
--- a/server/protocols/protocols-smtp/pom.xml
+++ b/server/protocols/protocols-smtp/pom.xml
@@ -34,28 +34,44 @@
<dependencies>
<dependency>
+ <groupId>${javax.activation.groupId}</groupId>
+ <artifactId>${javax.activation.artifactId}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util</artifactId>
+ <artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-library</artifactId>
+ <artifactId>apache-mailet-base</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-api</artifactId>
+ <artifactId>james-server-core</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>james-server-data-library</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -63,140 +79,136 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-core</artifactId>
+ <artifactId>james-server-dnsservice-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>metrics-api</artifactId>
+ <artifactId>james-server-dnsservice-library</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-library</artifactId>
+ <artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-api</artifactId>
+ <artifactId>james-server-filesystem-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-api</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-smtp</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-netty</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-protocols-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james.jspf</groupId>
- <artifactId>apache-jspf-resolver</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-queue-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>metrics-api</artifactId>
</dependency>
<dependency>
- <groupId>${javax.activation.groupId}</groupId>
- <artifactId>${javax.activation.artifactId}</artifactId>
- <scope>provided</scope>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <scope>test</scope>
</dependency>
<!-- Test dependencies -->
<dependency>
- <artifactId>dnsjava</artifactId>
<groupId>dnsjava</groupId>
+ <artifactId>dnsjava</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
- <scope>test</scope>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
- <type>test-jar</type>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- <type>test-jar</type>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-smtp</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.james.jspf</groupId>
+ <artifactId>apache-jspf-resolver</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-api</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-netty</artifactId>
</dependency>
+
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-smtp</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-api</artifactId>
+ <artifactId>protocols-smtp</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-library</artifactId>
- <type>test-jar</type>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -205,20 +217,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/webadmin-integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/pom.xml
index bd6b0c8..6566433 100644
--- a/server/protocols/webadmin-integration-test/pom.xml
+++ b/server/protocols/webadmin-integration-test/pom.xml
@@ -52,35 +52,35 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-jmap</artifactId>
+ <artifactId>james-server-cassandra-guice</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-webadmin-core</artifactId>
+ <artifactId>james-server-guice-common</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-webadmin-data</artifactId>
+ <artifactId>james-server-guice-jmap</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-webadmin-mailbox</artifactId>
+ <artifactId>james-server-webadmin-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-cassandra-guice</artifactId>
- <type>test-jar</type>
+ <artifactId>james-server-webadmin-data</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-common</artifactId>
- <type>test-jar</type>
+ <artifactId>james-server-webadmin-mailbox</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/webadmin/webadmin-core/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml
index 55c3909..e3b1c74 100644
--- a/server/protocols/webadmin/webadmin-core/pom.xml
+++ b/server/protocols/webadmin/webadmin-core/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util-java8</artifactId>
+ <artifactId>james-server-jwt</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-jwt</artifactId>
+ <artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -80,20 +80,26 @@
<version>1.5.8</version>
</dependency>
<dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>nl.jqno.equalsverifier</groupId>
+ <artifactId>equalsverifier</artifactId>
+ <version>1.7.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
@@ -108,12 +114,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>nl.jqno.equalsverifier</groupId>
- <artifactId>equalsverifier</artifactId>
- <version>1.7.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/webadmin/webadmin-data/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml
index 6aef53b..51bc1d6 100644
--- a/server/protocols/webadmin/webadmin-data/pom.xml
+++ b/server/protocols/webadmin/webadmin-data/pom.xml
@@ -32,14 +32,9 @@
<name>Apache James :: Server :: Web Admin :: data</name>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util-java8</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
@@ -49,6 +44,10 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
@@ -87,13 +86,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>java-hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/protocols/webadmin/webadmin-mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml
index 3381291..12e1a48 100644
--- a/server/protocols/webadmin/webadmin-mailbox/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml
@@ -44,10 +44,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util-java8</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
@@ -57,6 +53,10 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
@@ -98,13 +98,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>java-hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/queue/queue-activemq/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-activemq/pom.xml b/server/queue/queue-activemq/pom.xml
index f28ea0d..2e839b9 100644
--- a/server/queue/queue-activemq/pom.xml
+++ b/server/queue/queue-activemq/pom.xml
@@ -35,11 +35,7 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-jms</artifactId>
+ <artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -51,38 +47,27 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-api</artifactId>
+ <artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-queue-jms</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-kahadb-store</artifactId>
- <version>${activemq.version}</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-queue-jms</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-jms-client</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
@@ -94,20 +79,35 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-jms</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-kahadb-store</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-jms-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/queue/queue-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-api/pom.xml b/server/queue/queue-api/pom.xml
index 84d76e5..f71380e 100644
--- a/server/queue/queue-api/pom.xml
+++ b/server/queue/queue-api/pom.xml
@@ -37,6 +37,12 @@
<groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-core</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
@@ -49,12 +55,6 @@
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
</dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-core</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -65,7 +65,7 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
@@ -92,4 +92,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/queue/queue-file/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-file/pom.xml b/server/queue/queue-file/pom.xml
index 5d9362c..2ab4292 100644
--- a/server/queue/queue-file/pom.xml
+++ b/server/queue/queue-file/pom.xml
@@ -32,11 +32,10 @@
<name>Apache James :: Server :: Mail Queue :: File</name>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-api</artifactId>
+ <artifactId>james-server-core</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -44,20 +43,20 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-core</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
<!-- test dependencies -->
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/queue/queue-jms/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml
index 8c3e61a..7c455af 100644
--- a/server/queue/queue-jms/pom.xml
+++ b/server/queue/queue-jms/pom.xml
@@ -47,37 +47,26 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>metrics-api</artifactId>
+ <artifactId>james-server-protocols-smtp</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>metrics-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-jms-client</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-smtp</artifactId>
- </dependency>
- <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
@@ -89,25 +78,36 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- <scope>test</scope>
+ <artifactId>artemis-jms-client</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-smtp</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-smtp</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[24/29] james-project git commit: JAMES-2124 Solve more Eclipse
warnings
Posted by bt...@apache.org.
JAMES-2124 Solve more Eclipse warnings
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4ba81026
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4ba81026
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4ba81026
Branch: refs/heads/master
Commit: 4ba81026e13f38f527d19494e7fb45457cf216a4
Parents: bca6e8d
Author: benwa <bt...@linagora.com>
Authored: Thu Aug 24 16:31:56 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 25 18:18:14 2017 +0700
----------------------------------------------------------------------
.../mailbox/store/mail/model/impl/MessageParserTest.java | 8 ++++++--
.../src/main/java/org/apache/james/rrt/lib/MappingsImpl.java | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/4ba81026/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java
index 2e82305..ff2f0f3 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java
@@ -154,7 +154,9 @@ public class MessageParserTest {
assertThat(attachments).hasSize(1)
.extracting(MessageAttachment::getName)
- .containsExactly(Optional.of("inventory.csv"));
+ .allMatch(Optional::isPresent)
+ .extracting(Optional::get)
+ .containsExactly("inventory.csv");
}
@Test
@@ -163,7 +165,9 @@ public class MessageParserTest {
assertThat(attachments).hasSize(1)
.extracting(MessageAttachment::getName)
- .containsExactly(Optional.of("good.csv"));
+ .allMatch(Optional::isPresent)
+ .extracting(Optional::get)
+ .containsExactly("good.csv");
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/4ba81026/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
index 2bcf21e..4a4cb9b 100644
--- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
+++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
@@ -129,6 +129,7 @@ public class MappingsImpl implements Mappings, Serializable {
}
@Override
+ @SuppressWarnings("unlikely-arg-type")
public boolean contains(String mapping) {
return mappings.contains(mapping);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[29/29] james-project git commit: JAMES-2124 Fix an eclipse warning
indicating a real programming mistage
Posted by bt...@apache.org.
JAMES-2124 Fix an eclipse warning indicating a real programming mistage
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/1b670aec
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/1b670aec
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/1b670aec
Branch: refs/heads/master
Commit: 1b670aecc5928d12ce6e49edbd4d3ea574400e93
Parents: c147f0a
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Thu Aug 24 15:33:01 2017 +0200
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 25 18:18:28 2017 +0700
----------------------------------------------------------------------
.../james/mailbox/store/TestMailboxSessionMapperFactory.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/1b670aec/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java
index cf0ee8a..bd86c44 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java
@@ -189,7 +189,7 @@ public class TestMailboxSessionMapperFactory extends MailboxSessionMapperFactory
public void delete(final MessageId messageId) {
messages.removeAll(
FluentIterable.from(messages)
- .filter(inMailbox(messageId))
+ .filter(withMessageId(messageId))
.toList());
}
@@ -295,10 +295,6 @@ public class TestMailboxSessionMapperFactory extends MailboxSessionMapperFactory
return mailboxMessage -> messageIds.contains(mailboxMessage.getMessageId());
}
- private Predicate<MailboxMessage> inMailbox(final MessageId messageId) {
- return mailboxMessage -> mailboxMessage.getMailboxId().equals(messageId);
- }
-
private Predicate<MailboxMessage> inMailboxes(final List<MailboxId> mailboxIds) {
return mailboxMessage -> mailboxIds.contains(mailboxMessage.getMailboxId());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[25/29] james-project git commit: JAMES-2124 Respect maven sorting
order conventions
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/pom.xml b/server/data/data-jdbc/pom.xml
index b2c9796..e80b44d 100644
--- a/server/data/data-jdbc/pom.xml
+++ b/server/data/data-jdbc/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-jmap-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jmap-cassandra/pom.xml b/server/data/data-jmap-cassandra/pom.xml
index 918d2bb..d1b1f93 100644
--- a/server/data/data-jmap-cassandra/pom.xml
+++ b/server/data/data-jmap-cassandra/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jmap/pom.xml b/server/data/data-jmap/pom.xml
index 26bd964..155fdd5 100644
--- a/server/data/data-jmap/pom.xml
+++ b/server/data/data-jmap/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml
index e1b59bf..eab6334 100644
--- a/server/data/data-jpa/pom.xml
+++ b/server/data/data-jpa/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -136,15 +136,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
<version>2.4.2</version>
- <executions>
- <execution>
- <id>enhancer</id>
- <phase>process-classes</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<includes>org/apache/james/user/jpa/model/JPAUser.class,org/apache/james/rrt/jpa/model/JPARecipientRewrite.class,org/apache/james/domainlist/jpa/model/JPADomain.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -160,6 +151,15 @@
</property>
</toolProperties>
</configuration>
+ <executions>
+ <execution>
+ <id>enhancer</id>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ <phase>process-classes</phase>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-ldap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-ldap-integration-testing/pom.xml b/server/data/data-ldap-integration-testing/pom.xml
index 91e7fed..e99bd77 100644
--- a/server/data/data-ldap-integration-testing/pom.xml
+++ b/server/data/data-ldap-integration-testing/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-ldap/pom.xml b/server/data/data-ldap/pom.xml
index 4f6a8f5..0a144df 100644
--- a/server/data/data-ldap/pom.xml
+++ b/server/data/data-ldap/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-library/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-library/pom.xml b/server/data/data-library/pom.xml
index 4d6a18c..7aa1bc1 100644
--- a/server/data/data-library/pom.xml
+++ b/server/data/data-library/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-memory/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-memory/pom.xml b/server/data/data-memory/pom.xml
index 989cae5..8e14a9e 100644
--- a/server/data/data-memory/pom.xml
+++ b/server/data/data-memory/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/dns-service/dnsservice-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-api/pom.xml b/server/dns-service/dnsservice-api/pom.xml
index 23ba212..ee85f8c 100644
--- a/server/dns-service/dnsservice-api/pom.xml
+++ b/server/dns-service/dnsservice-api/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/dns-service/dnsservice-dnsjava/pom.xml
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-dnsjava/pom.xml b/server/dns-service/dnsservice-dnsjava/pom.xml
index 7dda33a..25d01b1 100644
--- a/server/dns-service/dnsservice-dnsjava/pom.xml
+++ b/server/dns-service/dnsservice-dnsjava/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/dns-service/dnsservice-library/pom.xml
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-library/pom.xml b/server/dns-service/dnsservice-library/pom.xml
index 0f2b6c1..0c7c4e2 100644
--- a/server/dns-service/dnsservice-library/pom.xml
+++ b/server/dns-service/dnsservice-library/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/karaf/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/server/karaf/distribution/pom.xml b/server/karaf/distribution/pom.xml
index 0729dbf..8614e16 100644
--- a/server/karaf/distribution/pom.xml
+++ b/server/karaf/distribution/pom.xml
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -30,8 +30,8 @@
<groupId>org.apache.karaf.assemblies.features</groupId>
<artifactId>standard</artifactId>
<version>${karaf.version}</version>
- <type>xml</type>
<classifier>features</classifier>
+ <type>xml</type>
</dependency>
</dependencies>
@@ -49,21 +49,21 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <delimiters>
+ <delimiter>${*}</delimiter>
+ </delimiters>
+ </configuration>
<executions>
<execution>
<id>filter</id>
- <phase>generate-resources</phase>
<goals>
<goal>resources</goal>
</goals>
+ <phase>generate-resources</phase>
</execution>
</executions>
- <configuration>
- <useDefaultDelimiters>false</useDefaultDelimiters>
- <delimiters>
- <delimiter>${*}</delimiter>
- </delimiters>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -72,10 +72,10 @@
<execution>
<!-- Uncompress the standard Karaf distribution -->
<id>unpack</id>
- <phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
+ <phase>generate-resources</phase>
<configuration>
<artifactItems>
<artifactItem>
@@ -96,10 +96,10 @@
<executions>
<execution>
<id>bin</id>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/main/assembly/unix.xml</descriptor>
@@ -117,10 +117,10 @@
<executions>
<execution>
<id>add-features-to-repo</id>
- <phase>install</phase>
<goals>
<goal>add-features-to-repo</goal>
</goals>
+ <phase>install</phase>
<inherited>false</inherited>
<configuration>
<descriptors>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/karaf/features/pom.xml
----------------------------------------------------------------------
diff --git a/server/karaf/features/pom.xml b/server/karaf/features/pom.xml
index c8627f6..9d16221 100644
--- a/server/karaf/features/pom.xml
+++ b/server/karaf/features/pom.xml
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -37,10 +37,10 @@
<executions>
<execution>
<id>filter</id>
- <phase>generate-resources</phase>
<goals>
<goal>resources</goal>
</goals>
+ <phase>generate-resources</phase>
</execution>
</executions>
</plugin>
@@ -71,10 +71,10 @@
<executions>
<execution>
<id>attach-artifacts</id>
- <phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
+ <phase>package</phase>
<configuration>
<artifacts>
<artifact>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/karaf/integration/pom.xml
----------------------------------------------------------------------
diff --git a/server/karaf/integration/pom.xml b/server/karaf/integration/pom.xml
index 3bcc628..a11994c 100644
--- a/server/karaf/integration/pom.xml
+++ b/server/karaf/integration/pom.xml
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -38,12 +38,12 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <artifactId>org.apache.karaf.client</artifactId>
<groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.client</artifactId>
</exclusion>
<exclusion>
- <artifactId>org.eclipse.osgi</artifactId>
<groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
</exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/mailet/integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml
index 3d0cf1a..82b5000 100644
--- a/server/mailet/integration-testing/pom.xml
+++ b/server/mailet/integration-testing/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/mailet/mailetcontainer-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-api/pom.xml b/server/mailet/mailetcontainer-api/pom.xml
index 70e8efc..a243ea6 100644
--- a/server/mailet/mailetcontainer-api/pom.xml
+++ b/server/mailet/mailetcontainer-api/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/mailet/mailetcontainer-camel/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/pom.xml b/server/mailet/mailetcontainer-camel/pom.xml
index 9a16ed0..4e4ad64 100644
--- a/server/mailet/mailetcontainer-camel/pom.xml
+++ b/server/mailet/mailetcontainer-camel/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/mailet/mailets/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml
index 0b28f93..bf5dda9 100644
--- a/server/mailet/mailets/pom.xml
+++ b/server/mailet/mailets/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 447d851..a1d76bb 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -24,8 +24,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-project</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-project</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/fetchmail/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/pom.xml b/server/protocols/fetchmail/pom.xml
index 388de19..a2b603d 100644
--- a/server/protocols/fetchmail/pom.xml
+++ b/server/protocols/fetchmail/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
index 8ac2e49..f8831a5 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>jmap-integration-testing</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>jmap-integration-testing</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/pom.xml
index 906fc2c..c684796 100644
--- a/server/protocols/jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml
index 7674f20..087c516 100644
--- a/server/protocols/jmap/pom.xml
+++ b/server/protocols/jmap/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/jwt/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jwt/pom.xml b/server/protocols/jwt/pom.xml
index f5cf54c..54e804c 100644
--- a/server/protocols/jwt/pom.xml
+++ b/server/protocols/jwt/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/protocols-imap4/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/pom.xml b/server/protocols/protocols-imap4/pom.xml
index 9dcfa66..c3fdc1c 100644
--- a/server/protocols/protocols-imap4/pom.xml
+++ b/server/protocols/protocols-imap4/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/protocols-library/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/pom.xml b/server/protocols/protocols-library/pom.xml
index 083d05a..67f8575 100644
--- a/server/protocols/protocols-library/pom.xml
+++ b/server/protocols/protocols-library/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -47,8 +47,8 @@
<artifactId>james-server-util</artifactId>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/protocols-lmtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-lmtp/pom.xml b/server/protocols/protocols-lmtp/pom.xml
index 4c141ef..fc54d39 100644
--- a/server/protocols/protocols-lmtp/pom.xml
+++ b/server/protocols/protocols-lmtp/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -62,20 +62,20 @@
<artifactId>james-server-protocols-smtp</artifactId>
<exclusions>
<exclusion>
- <artifactId>james-server-dnsservice-api</artifactId>
<groupId>${project.groupId}</groupId>
+ <artifactId>james-server-dnsservice-api</artifactId>
</exclusion>
<exclusion>
- <artifactId>james-server-dnsservice-library</artifactId>
<groupId>${project.groupId}</groupId>
+ <artifactId>james-server-dnsservice-library</artifactId>
</exclusion>
<exclusion>
- <artifactId>james-server-queue-api</artifactId>
<groupId>${project.groupId}</groupId>
+ <artifactId>james-server-queue-api</artifactId>
</exclusion>
<exclusion>
- <artifactId>apache-jspf-resolver</artifactId>
<groupId>org.apache.james.jspf</groupId>
+ <artifactId>apache-jspf-resolver</artifactId>
</exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/protocols-managesieve/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-managesieve/pom.xml b/server/protocols/protocols-managesieve/pom.xml
index f11516c..e26d118 100644
--- a/server/protocols/protocols-managesieve/pom.xml
+++ b/server/protocols/protocols-managesieve/pom.xml
@@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/protocols-pop3/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-pop3/pom.xml b/server/protocols/protocols-pop3/pom.xml
index c331032..c0fd0a5 100644
--- a/server/protocols/protocols-pop3/pom.xml
+++ b/server/protocols/protocols-pop3/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/protocols-smtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml
index e0bb722..2dd30c7 100644
--- a/server/protocols/protocols-smtp/pom.xml
+++ b/server/protocols/protocols-smtp/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/webadmin-integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/pom.xml
index 6566433..693e3ea 100644
--- a/server/protocols/webadmin-integration-test/pom.xml
+++ b/server/protocols/webadmin-integration-test/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/webadmin/webadmin-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-cassandra/pom.xml b/server/protocols/webadmin/webadmin-cassandra/pom.xml
index f336eb7..05e89ba 100644
--- a/server/protocols/webadmin/webadmin-cassandra/pom.xml
+++ b/server/protocols/webadmin/webadmin-cassandra/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/webadmin/webadmin-core/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml
index e3b1c74..80052a1 100644
--- a/server/protocols/webadmin/webadmin-core/pom.xml
+++ b/server/protocols/webadmin/webadmin-core/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/webadmin/webadmin-data/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml
index 51bc1d6..fc67952 100644
--- a/server/protocols/webadmin/webadmin-data/pom.xml
+++ b/server/protocols/webadmin/webadmin-data/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/webadmin/webadmin-mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml
index 12e1a48..13b8b4d 100644
--- a/server/protocols/webadmin/webadmin-mailbox/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/protocols/webadmin/webadmin-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-swagger/pom.xml b/server/protocols/webadmin/webadmin-swagger/pom.xml
index a2a7bce..9d5d97b 100644
--- a/server/protocols/webadmin/webadmin-swagger/pom.xml
+++ b/server/protocols/webadmin/webadmin-swagger/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
@@ -32,7 +32,6 @@
<name>Apache James :: Server :: Web Admin :: Swagger</name>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/queue/queue-activemq/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-activemq/pom.xml b/server/queue/queue-activemq/pom.xml
index b5d680d..952d425 100644
--- a/server/queue/queue-activemq/pom.xml
+++ b/server/queue/queue-activemq/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/queue/queue-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-api/pom.xml b/server/queue/queue-api/pom.xml
index f71380e..1627ca5 100644
--- a/server/queue/queue-api/pom.xml
+++ b/server/queue/queue-api/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/queue/queue-file/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-file/pom.xml b/server/queue/queue-file/pom.xml
index 3cd82a5..eb7020c 100644
--- a/server/queue/queue-file/pom.xml
+++ b/server/queue/queue-file/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/queue/queue-jms/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml
index 8d6268e..ce3d955 100644
--- a/server/queue/queue-jms/pom.xml
+++ b/server/queue/queue-jms/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/testing/pom.xml b/server/testing/pom.xml
index ecc441c..3836069 100644
--- a/server/testing/pom.xml
+++ b/server/testing/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/src/site/xdoc/contribute.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/contribute.xml b/src/site/xdoc/contribute.xml
index bf1238b..7783cfc 100644
--- a/src/site/xdoc/contribute.xml
+++ b/src/site/xdoc/contribute.xml
@@ -275,7 +275,7 @@
Hopefully, some tools are doing this sorting for you:</li>
</ul>
<pre>
- <code>mvn com.github.ekryd.sortpom:sortpom-maven-plugin:sort -Dsort.keepBlankLines -Dsort.sortDependencies=groupId,artifactId -Dsort.nrOfIndentSpace=4 -Dsort.createBackupFile=false -Dsort.sortModules=true -Dsort.expandEmptyElements=false</code>
+ <code>mvn com.github.ekryd.sortpom:sortpom-maven-plugin:sort -Dsort.keepBlankLines -Dsort.sortDependencies=groupId,artifactId -Dsort.nrOfIndentSpace=4 -Dsort.createBackupFile=false -Dsort.sortModules=true -Dsort.expandEmptyElements=false -Dsort.predefinedSortOrder="recommended_2008_06"</code>
</pre>
<p>You should also split multiple attributes each on a new line.</p>
<p>You should ensure your POM files, as well as sections ordering follows the <a href="http://maven.apache.org/ref/3.0.3/maven-model/maven.html">Maven Model</a></p>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[23/29] james-project git commit: JAMES-2124 Post rebase sort
Posted by bt...@apache.org.
JAMES-2124 Post rebase sort
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/435c5e64
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/435c5e64
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/435c5e64
Branch: refs/heads/master
Commit: 435c5e64384bd70ae778f64a0b2a80e65454f6dc
Parents: f8f540a
Author: benwa <bt...@linagora.com>
Authored: Thu Aug 24 15:21:54 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 25 18:18:14 2017 +0700
----------------------------------------------------------------------
protocols/netty/pom.xml | 8 ++++----
server/container/guice/es-metric-reporter/pom.xml | 12 +++++-------
server/container/guice/jpa-smtp/pom.xml | 8 ++++----
server/mailet/mailetcontainer-camel/pom.xml | 8 ++++----
server/protocols/protocols-managesieve/pom.xml | 8 ++++----
5 files changed, 21 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/435c5e64/protocols/netty/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/netty/pom.xml b/protocols/netty/pom.xml
index 4c028ef..fe74d47 100644
--- a/protocols/netty/pom.xml
+++ b/protocols/netty/pom.xml
@@ -39,10 +39,6 @@
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-util-java8</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
@@ -56,6 +52,10 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/435c5e64/server/container/guice/es-metric-reporter/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/es-metric-reporter/pom.xml b/server/container/guice/es-metric-reporter/pom.xml
index 171f012..ffe890b 100644
--- a/server/container/guice/es-metric-reporter/pom.xml
+++ b/server/container/guice/es-metric-reporter/pom.xml
@@ -17,15 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -39,11 +37,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>james-server-guice-common</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-common</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -63,4 +61,4 @@
<artifactId>commons-configuration</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/435c5e64/server/container/guice/jpa-smtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/container/guice/jpa-smtp/pom.xml
index 1d6e2b5..f180685 100644
--- a/server/container/guice/jpa-smtp/pom.xml
+++ b/server/container/guice/jpa-smtp/pom.xml
@@ -85,15 +85,15 @@
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
- <groupId>com.internetitem</groupId>
- <artifactId>logback-elasticsearch-appender</artifactId>
- </dependency>
- <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.internetitem</groupId>
+ <artifactId>logback-elasticsearch-appender</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.jayway.awaitility</groupId>
<artifactId>awaitility</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/435c5e64/server/mailet/mailetcontainer-camel/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/pom.xml b/server/mailet/mailetcontainer-camel/pom.xml
index 4e4ad64..539ba09 100644
--- a/server/mailet/mailetcontainer-camel/pom.xml
+++ b/server/mailet/mailetcontainer-camel/pom.xml
@@ -79,10 +79,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util-java8</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailetcontainer-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -97,6 +93,10 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/435c5e64/server/protocols/protocols-managesieve/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-managesieve/pom.xml b/server/protocols/protocols-managesieve/pom.xml
index e26d118..201ef1e 100644
--- a/server/protocols/protocols-managesieve/pom.xml
+++ b/server/protocols/protocols-managesieve/pom.xml
@@ -22,10 +22,6 @@
<artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-util-java8</artifactId>
- </dependency>
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
@@ -46,6 +42,10 @@
<artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-managesieve</artifactId>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[02/29] james-project git commit: JAMES-2124 use project groupId for
internal dependencies
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/protocols/smtp/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/smtp/pom.xml b/protocols/smtp/pom.xml
index c9918bb..cc59f46 100644
--- a/protocols/smtp/pom.xml
+++ b/protocols/smtp/pom.xml
@@ -39,17 +39,17 @@
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>protocols-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>protocols-netty</artifactId>
</dependency>
<dependency>
@@ -130,7 +130,7 @@
<relocations>
<relocation>
<pattern>org.apache.commons.codec.binary</pattern>
- <shadedPattern>org.apache.james.protocols.smtp.util</shadedPattern>
+ <shadedPattern>${project.groupId}.smtp.util</shadedPattern>
</relocation>
</relocations>
<transformers>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/app/pom.xml
----------------------------------------------------------------------
diff --git a/server/app/pom.xml b/server/app/pom.xml
index feffb34..ba0c491 100644
--- a/server/app/pom.xml
+++ b/server/app/pom.xml
@@ -73,11 +73,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-cli</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
<exclusions>
<exclusion>
@@ -87,11 +87,11 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
<exclusions>
<exclusion>
@@ -101,7 +101,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-library</artifactId>
<exclusions>
<exclusion>
@@ -111,15 +111,15 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailetcontainer-api</artifactId>
<exclusions>
<exclusion>
@@ -129,7 +129,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
<exclusions>
<exclusion>
@@ -139,7 +139,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-spring</artifactId>
<exclusions>
<exclusion>
@@ -224,7 +224,7 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailetcontainer-camel</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -235,7 +235,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailbox-adapter</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -246,30 +246,30 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-dnsjava</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-dropwizard</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -280,7 +280,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -291,13 +291,13 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-ldap</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-smtp</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -308,12 +308,12 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-imap4</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-lmtp</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -324,12 +324,12 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-managesieve</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-pop3</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -344,7 +344,7 @@
<artifactId>protocols-managesieve</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-fetchmail</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -355,7 +355,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-file</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -366,7 +366,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-jms</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -377,7 +377,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-activemq</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -388,7 +388,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailets</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -417,7 +417,7 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -428,7 +428,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-spring</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -447,7 +447,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jcr</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -458,7 +458,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -470,7 +470,7 @@
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-file</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -481,12 +481,12 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-jpa</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-jdbc</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -497,7 +497,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-hbase</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -524,7 +524,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-jcr</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -560,7 +560,7 @@
</activation>
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -571,7 +571,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -591,7 +591,7 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-cassandra</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -602,12 +602,12 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-cassandra</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<scope>runtime</scope>
</dependency>
@@ -617,7 +617,7 @@
<id>kafka</id>
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-kafka</artifactId>
<scope>runtime</scope>
</dependency>
@@ -630,7 +630,7 @@
</activation>
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -646,7 +646,7 @@
<id>exclude-lucene</id>
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -1060,7 +1060,7 @@
<plugins>
<!-- be sure to start up james before run it -->
<plugin>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>maven-mpt-plugin</artifactId>
<version>0.2-SNAPSHOT</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/container/cli-integration/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/cli-integration/pom.xml b/server/container/cli-integration/pom.xml
index 659f718..3bf5d72 100644
--- a/server/container/cli-integration/pom.xml
+++ b/server/container/cli-integration/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-cli</artifactId>
<scope>test</scope>
</dependency>
@@ -49,13 +49,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-memory-guice</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-memory-guice</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/container/cli/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/cli/pom.xml b/server/container/cli/pom.xml
index f71576e..536712b 100644
--- a/server/container/cli/pom.xml
+++ b/server/container/cli/pom.xml
@@ -34,15 +34,15 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailbox-adapter</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/container/core/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml
index 636a30b..8fc7b19 100644
--- a/server/container/core/pom.xml
+++ b/server/container/core/pom.xml
@@ -34,31 +34,31 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<!-- RFC2822Headers constants imported from mailet-base (undetected by bytecode analyzers because constants are inlined) -->
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
</dependency>
<dependency>
@@ -90,7 +90,7 @@
<!-- Test dependencies -->
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/container/guice/cassandra-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml
index c72f177..7961e40 100644
--- a/server/container/guice/cassandra-guice/pom.xml
+++ b/server/container/guice/cassandra-guice/pom.xml
@@ -51,7 +51,7 @@
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -83,7 +83,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-icalendar</artifactId>
<version>${project.version}</version>
</dependency>
@@ -96,11 +96,11 @@
<artifactId>james-server-data-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-jmap-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-es-reporter</artifactId>
<version>${project.version}</version>
</dependency>
@@ -151,19 +151,19 @@
<artifactId>james-server-guice-webadmin</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-webadmin-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-webadmin-data</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-webadmin-mailbox</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-webadmin-swagger</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/container/guice/custom-mailets/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/custom-mailets/pom.xml b/server/container/guice/custom-mailets/pom.xml
index ba3cd71..5acc265 100644
--- a/server/container/guice/custom-mailets/pom.xml
+++ b/server/container/guice/custom-mailets/pom.xml
@@ -33,11 +33,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/container/guice/guice-common/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml
index ed2ca83..237db49 100644
--- a/server/container/guice/guice-common/pom.xml
+++ b/server/container/guice/guice-common/pom.xml
@@ -112,7 +112,7 @@
<artifactId>james-server-mailets</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
@@ -120,7 +120,7 @@
<artifactId>metrics-logger</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-dropwizard</artifactId>
</dependency>
<dependency>
@@ -174,7 +174,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<scope>test</scope>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/container/guice/jpa-smtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/container/guice/jpa-smtp/pom.xml
index 1ef98b2..e716fa2 100644
--- a/server/container/guice/jpa-smtp/pom.xml
+++ b/server/container/guice/jpa-smtp/pom.xml
@@ -82,11 +82,11 @@
<artifactId>james-server-jpa-common-guice</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-webadmin</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-webadmin-data</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/container/guice/mailet/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/mailet/pom.xml b/server/container/guice/mailet/pom.xml
index dcf885b..20ea6fd 100644
--- a/server/container/guice/mailet/pom.xml
+++ b/server/container/guice/mailet/pom.xml
@@ -70,7 +70,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/container/guice/protocols/jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/jmap/pom.xml b/server/container/guice/protocols/jmap/pom.xml
index 31d4f3d..5bcc8bf 100644
--- a/server/container/guice/protocols/jmap/pom.xml
+++ b/server/container/guice/protocols/jmap/pom.xml
@@ -43,7 +43,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/container/guice/protocols/webadmin-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-cassandra/pom.xml b/server/container/guice/protocols/webadmin-cassandra/pom.xml
index 7bb3af8..91aa5a8 100644
--- a/server/container/guice/protocols/webadmin-cassandra/pom.xml
+++ b/server/container/guice/protocols/webadmin-cassandra/pom.xml
@@ -37,7 +37,7 @@
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-cassandra</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/container/guice/protocols/webadmin-data/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-data/pom.xml b/server/container/guice/protocols/webadmin-data/pom.xml
index 3f3750d..b98c809 100644
--- a/server/container/guice/protocols/webadmin-data/pom.xml
+++ b/server/container/guice/protocols/webadmin-data/pom.xml
@@ -37,11 +37,11 @@
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-data</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/container/guice/protocols/webadmin-mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-mailbox/pom.xml b/server/container/guice/protocols/webadmin-mailbox/pom.xml
index 58b5743..b295e92 100644
--- a/server/container/guice/protocols/webadmin-mailbox/pom.xml
+++ b/server/container/guice/protocols/webadmin-mailbox/pom.xml
@@ -37,11 +37,11 @@
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-mailbox</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/container/guice/protocols/webadmin-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-swagger/pom.xml b/server/container/guice/protocols/webadmin-swagger/pom.xml
index 479e0fa..05adf0d 100644
--- a/server/container/guice/protocols/webadmin-swagger/pom.xml
+++ b/server/container/guice/protocols/webadmin-swagger/pom.xml
@@ -37,11 +37,11 @@
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-swagger</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/container/guice/protocols/webadmin/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin/pom.xml b/server/container/guice/protocols/webadmin/pom.xml
index 330b6c4..5d6e1a6 100644
--- a/server/container/guice/protocols/webadmin/pom.xml
+++ b/server/container/guice/protocols/webadmin/pom.xml
@@ -37,7 +37,7 @@
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/container/mailbox-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/mailbox-adapter/pom.xml b/server/container/mailbox-adapter/pom.xml
index 74b37d2..f30b911 100644
--- a/server/container/mailbox-adapter/pom.xml
+++ b/server/container/mailbox-adapter/pom.xml
@@ -34,46 +34,46 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-maildir</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-tool</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/container/metrics/metrics-es-reporter/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/metrics/metrics-es-reporter/pom.xml b/server/container/metrics/metrics-es-reporter/pom.xml
index 1626a1e..1635a22 100644
--- a/server/container/metrics/metrics-es-reporter/pom.xml
+++ b/server/container/metrics/metrics-es-reporter/pom.xml
@@ -30,16 +30,16 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-dropwizard</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/container/spring/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml
index 995b481..de37a0b 100644
--- a/server/container/spring/pom.xml
+++ b/server/container/spring/pom.xml
@@ -34,45 +34,45 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailetcontainer-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailbox-adapter</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-tool</artifactId>
</dependency>
<dependency>
@@ -80,7 +80,7 @@
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/container/util-java8/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/util-java8/pom.xml b/server/container/util-java8/pom.xml
index bd19e9f..92da74f 100644
--- a/server/container/util-java8/pom.xml
+++ b/server/container/util-java8/pom.xml
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/data/data-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-api/pom.xml b/server/data/data-api/pom.xml
index ef268ef..703c42b 100644
--- a/server/data/data-api/pom.xml
+++ b/server/data/data-api/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<!-- only used by JamesUser (for MailAddress) -->
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/data/data-file/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-file/pom.xml b/server/data/data-file/pom.xml
index b93dadc..7b2aafa 100644
--- a/server/data/data-file/pom.xml
+++ b/server/data/data-file/pom.xml
@@ -34,27 +34,27 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
@@ -74,7 +74,7 @@
<artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
@@ -104,19 +104,19 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/data/data-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/pom.xml b/server/data/data-hbase/pom.xml
index c094c21..52210e3 100644
--- a/server/data/data-hbase/pom.xml
+++ b/server/data/data-hbase/pom.xml
@@ -32,19 +32,19 @@
<name>Apache James :: Server :: Data :: HBase Persistence</name>
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
@@ -122,7 +122,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -133,13 +133,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-hbase</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/data/data-jcr/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/pom.xml b/server/data/data-jcr/pom.xml
index 1738188..e5c146f 100644
--- a/server/data/data-jcr/pom.xml
+++ b/server/data/data-jcr/pom.xml
@@ -34,11 +34,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
@@ -46,7 +46,7 @@
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
@@ -62,7 +62,7 @@
<artifactId>jackrabbit-jcr-commons</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
@@ -81,7 +81,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/data/data-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/pom.xml b/server/data/data-jdbc/pom.xml
index 1c5b149..da2c8ca 100644
--- a/server/data/data-jdbc/pom.xml
+++ b/server/data/data-jdbc/pom.xml
@@ -34,31 +34,31 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
@@ -114,7 +114,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -131,7 +131,7 @@
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/data/data-jmap-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jmap-cassandra/pom.xml b/server/data/data-jmap-cassandra/pom.xml
index e4e40e4..b4d0fb0 100644
--- a/server/data/data-jmap-cassandra/pom.xml
+++ b/server/data/data-jmap-cassandra/pom.xml
@@ -46,11 +46,11 @@
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-jmap</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-jmap</artifactId>
<scope>test</scope>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/data/data-jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jmap/pom.xml b/server/data/data-jmap/pom.xml
index 6790770..ad127fb 100644
--- a/server/data/data-jmap/pom.xml
+++ b/server/data/data-jmap/pom.xml
@@ -34,11 +34,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/data/data-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml
index d649896..1e60351 100644
--- a/server/data/data-jpa/pom.xml
+++ b/server/data/data-jpa/pom.xml
@@ -34,29 +34,29 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
@@ -98,13 +98,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/data/data-ldap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-ldap-integration-testing/pom.xml b/server/data/data-ldap-integration-testing/pom.xml
index 8ac3f52..91e7fed 100644
--- a/server/data/data-ldap-integration-testing/pom.xml
+++ b/server/data/data-ldap-integration-testing/pom.xml
@@ -34,17 +34,17 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-ldap</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/data/data-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-ldap/pom.xml b/server/data/data-ldap/pom.xml
index 761680f..0c83739 100644
--- a/server/data/data-ldap/pom.xml
+++ b/server/data/data-ldap/pom.xml
@@ -34,15 +34,15 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/data/data-library/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-library/pom.xml b/server/data/data-library/pom.xml
index 00c8c27..a13c071 100644
--- a/server/data/data-library/pom.xml
+++ b/server/data/data-library/pom.xml
@@ -34,23 +34,23 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
@@ -119,12 +119,12 @@
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/data/data-memory/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-memory/pom.xml b/server/data/data-memory/pom.xml
index e2e2015..28202c5 100644
--- a/server/data/data-memory/pom.xml
+++ b/server/data/data-memory/pom.xml
@@ -34,21 +34,21 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/dns-service/dnsservice-dnsjava/pom.xml
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-dnsjava/pom.xml b/server/dns-service/dnsservice-dnsjava/pom.xml
index 9a5b83e..eda568a 100644
--- a/server/dns-service/dnsservice-dnsjava/pom.xml
+++ b/server/dns-service/dnsservice-dnsjava/pom.xml
@@ -34,15 +34,15 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/dns-service/dnsservice-library/pom.xml
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-library/pom.xml b/server/dns-service/dnsservice-library/pom.xml
index 53959ab..36fe4a8 100644
--- a/server/dns-service/dnsservice-library/pom.xml
+++ b/server/dns-service/dnsservice-library/pom.xml
@@ -34,11 +34,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
@@ -59,7 +59,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/karaf/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/server/karaf/distribution/pom.xml b/server/karaf/distribution/pom.xml
index 8ec09d4..ac6c3ff 100644
--- a/server/karaf/distribution/pom.xml
+++ b/server/karaf/distribution/pom.xml
@@ -9,7 +9,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james.karaf</groupId>
<artifactId>james-karaf-distribution</artifactId>
<packaging>pom</packaging>
@@ -30,7 +29,7 @@
<classifier>features</classifier>
</dependency>
<dependency>
- <groupId>org.apache.james.karaf</groupId>
+ <groupId>org.apache.james</groupId>
<artifactId>james-karaf-features</artifactId>
<type>pom</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/karaf/features/pom.xml
----------------------------------------------------------------------
diff --git a/server/karaf/features/pom.xml b/server/karaf/features/pom.xml
index d777999..bd04f2a 100644
--- a/server/karaf/features/pom.xml
+++ b/server/karaf/features/pom.xml
@@ -9,7 +9,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james.karaf</groupId>
<artifactId>james-karaf-features</artifactId>
<packaging>pom</packaging>
<name>Apache James :: Karaf :: Features</name>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/karaf/integration/pom.xml
----------------------------------------------------------------------
diff --git a/server/karaf/integration/pom.xml b/server/karaf/integration/pom.xml
index 12f31bd..0348012 100644
--- a/server/karaf/integration/pom.xml
+++ b/server/karaf/integration/pom.xml
@@ -9,7 +9,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james.karaf</groupId>
<artifactId>james-karaf-integration</artifactId>
<packaging>pom</packaging>
<name>Apache James :: Karaf :: Integration tests</name>
@@ -77,7 +76,7 @@
<!-- Apache Felix Karaf integration -->
<dependency>
- <groupId>org.apache.james.karaf</groupId>
+ <groupId>org.apache.james</groupId>
<artifactId>james-karaf-distribution</artifactId>
<scope>test</scope>
<type>tar.gz</type>
@@ -103,7 +102,7 @@
</dependency>
<dependency>
- <groupId>org.apache.james.karaf</groupId>
+ <groupId>org.apache.james</groupId>
<artifactId>james-karaf-features</artifactId>
<type>pom</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/mailet/integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml
index f7611d8..3b0fbf3 100644
--- a/server/mailet/integration-testing/pom.xml
+++ b/server/mailet/integration-testing/pom.xml
@@ -34,57 +34,57 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-crypto</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-icalendar</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailetcontainer-camel</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailets</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-memory-guice</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/mailet/mailetcontainer-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-api/pom.xml b/server/mailet/mailetcontainer-api/pom.xml
index 89755a0..70e8efc 100644
--- a/server/mailet/mailetcontainer-api/pom.xml
+++ b/server/mailet/mailetcontainer-api/pom.xml
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/mailet/mailetcontainer-camel/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/pom.xml b/server/mailet/mailetcontainer-camel/pom.xml
index 8b97319..32b91c2 100644
--- a/server/mailet/mailetcontainer-camel/pom.xml
+++ b/server/mailet/mailetcontainer-camel/pom.xml
@@ -34,52 +34,52 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailetcontainer-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-library</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<!--
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
</dependency>
-->
@@ -123,23 +123,23 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-standard</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailetcontainer-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/server/mailet/mailets/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml
index 2497aab..3cdc25b 100644
--- a/server/mailet/mailets/pom.xml
+++ b/server/mailet/mailets/pom.xml
@@ -34,44 +34,44 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-library</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
@@ -85,7 +85,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
<scope>compile</scope>
</dependency>
@@ -95,12 +95,12 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-standard</artifactId>
<scope>compile</scope>
</dependency>
@@ -113,11 +113,11 @@
<artifactId>apache-jspf-resolver</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-james-utils</artifactId>
</dependency>
<dependency>
@@ -142,12 +142,12 @@
</dependency>
<!--
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-imap-processor</artifactId>
</dependency>
-->
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
@@ -166,41 +166,41 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
<type>test-jar</type>
@@ -225,7 +225,7 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>maven-mailetdocs-plugin</artifactId>
<version>0.1</version>
<configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[03/29] james-project git commit: JAMES-2124 use project groupId for
internal dependencies
Posted by bt...@apache.org.
JAMES-2124 use project groupId for internal dependencies
This is a best practice, and makes these dependencies easily ordered at the top.
Command was generated via SED, then hand corrected
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3dd8a503
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3dd8a503
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3dd8a503
Branch: refs/heads/master
Commit: 3dd8a503dfe7f6f7cd8bdbda983ab1b0b984d488
Parents: 10d76ab
Author: benwa <bt...@linagora.com>
Authored: Fri Aug 18 16:53:20 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 25 18:16:43 2017 +0700
----------------------------------------------------------------------
backends-common/cassandra/pom.xml | 4 +-
backends-common/elasticsearch/pom.xml | 4 +-
backends-common/pom.xml | 4 +-
mailbox/caching/pom.xml | 4 +-
mailbox/elasticsearch/pom.xml | 14 +-
mailbox/jcr/pom.xml | 8 +-
mailbox/jpa/pom.xml | 14 +-
mailbox/lucene/pom.xml | 14 +-
mailbox/maildir/pom.xml | 12 +-
mailbox/memory/pom.xml | 10 +-
mailbox/pom.xml | 62 ++---
mailbox/scanning-search/pom.xml | 4 +-
mailbox/spring/pom.xml | 20 +-
mailbox/store/pom.xml | 18 +-
mailbox/tika/pom.xml | 4 +-
mailbox/tool/pom.xml | 12 +-
mailet/ai/pom.xml | 4 +-
mailet/base/pom.xml | 6 +-
mailet/crypto/pom.xml | 6 +-
mailet/icalendar/pom.xml | 4 +-
mailet/mailetdocs-maven-plugin/pom.xml | 2 +-
mailet/pom.xml | 10 +-
mailet/standard/pom.xml | 8 +-
metrics/metrics-dropwizard/pom.xml | 6 +-
metrics/metrics-logger/pom.xml | 2 +-
metrics/pom.xml | 8 +-
mpt/core/pom.xml | 4 +-
mpt/impl/imap-mailbox/cassandra/pom.xml | 8 +-
mpt/impl/imap-mailbox/core/pom.xml | 12 +-
mpt/impl/imap-mailbox/elasticsearch/pom.xml | 14 +-
mpt/impl/imap-mailbox/external-james/pom.xml | 2 +-
mpt/impl/imap-mailbox/hbase/pom.xml | 4 +-
mpt/impl/imap-mailbox/inmemory/pom.xml | 4 +-
mpt/impl/imap-mailbox/jcr/pom.xml | 4 +-
mpt/impl/imap-mailbox/jpa/pom.xml | 10 +-
mpt/impl/imap-mailbox/lucenesearch/pom.xml | 16 +-
mpt/impl/imap-mailbox/maildir/pom.xml | 4 +-
mpt/impl/managesieve/cassandra/pom.xml | 8 +-
mpt/impl/managesieve/core/pom.xml | 4 +-
mpt/impl/managesieve/file/pom.xml | 6 +-
mpt/impl/managesieve/pom.xml | 6 +-
mpt/impl/smtp/cassandra/pom.xml | 20 +-
mpt/impl/smtp/core/pom.xml | 10 +-
mpt/pom.xml | 66 +++---
protocols/imap/pom.xml | 2 +-
protocols/lmtp/pom.xml | 10 +-
protocols/netty/pom.xml | 2 +-
protocols/pop3/pom.xml | 6 +-
protocols/smtp/pom.xml | 8 +-
server/app/pom.xml | 96 ++++----
server/container/cli-integration/pom.xml | 6 +-
server/container/cli/pom.xml | 6 +-
server/container/core/pom.xml | 14 +-
server/container/guice/cassandra-guice/pom.xml | 16 +-
server/container/guice/custom-mailets/pom.xml | 4 +-
server/container/guice/guice-common/pom.xml | 6 +-
server/container/guice/jpa-smtp/pom.xml | 4 +-
server/container/guice/mailet/pom.xml | 2 +-
server/container/guice/protocols/jmap/pom.xml | 2 +-
.../guice/protocols/webadmin-cassandra/pom.xml | 2 +-
.../guice/protocols/webadmin-data/pom.xml | 4 +-
.../guice/protocols/webadmin-mailbox/pom.xml | 4 +-
.../guice/protocols/webadmin-swagger/pom.xml | 4 +-
.../container/guice/protocols/webadmin/pom.xml | 2 +-
server/container/mailbox-adapter/pom.xml | 20 +-
.../metrics/metrics-es-reporter/pom.xml | 6 +-
server/container/spring/pom.xml | 22 +-
server/container/util-java8/pom.xml | 2 +-
server/data/data-api/pom.xml | 2 +-
server/data/data-file/pom.xml | 20 +-
server/data/data-hbase/pom.xml | 14 +-
server/data/data-jcr/pom.xml | 10 +-
server/data/data-jdbc/pom.xml | 18 +-
server/data/data-jmap-cassandra/pom.xml | 4 +-
server/data/data-jmap/pom.xml | 4 +-
server/data/data-jpa/pom.xml | 16 +-
.../data/data-ldap-integration-testing/pom.xml | 6 +-
server/data/data-ldap/pom.xml | 6 +-
server/data/data-library/pom.xml | 14 +-
server/data/data-memory/pom.xml | 8 +-
server/dns-service/dnsservice-dnsjava/pom.xml | 6 +-
server/dns-service/dnsservice-library/pom.xml | 6 +-
server/karaf/distribution/pom.xml | 3 +-
server/karaf/features/pom.xml | 1 -
server/karaf/integration/pom.xml | 5 +-
server/mailet/integration-testing/pom.xml | 22 +-
server/mailet/mailetcontainer-api/pom.xml | 2 +-
server/mailet/mailetcontainer-camel/pom.xml | 32 +--
server/mailet/mailets/pom.xml | 50 ++--
server/pom.xml | 228 +++++++++----------
server/protocols/fetchmail/pom.xml | 14 +-
.../cassandra-jmap-integration-testing/pom.xml | 20 +-
.../jmap-integration-testing-common/pom.xml | 16 +-
.../memory-jmap-integration-testing/pom.xml | 12 +-
server/protocols/jmap/pom.xml | 46 ++--
server/protocols/protocols-imap4/pom.xml | 10 +-
server/protocols/protocols-library/pom.xml | 8 +-
server/protocols/protocols-lmtp/pom.xml | 20 +-
server/protocols/protocols-managesieve/pom.xml | 4 +-
server/protocols/protocols-pop3/pom.xml | 20 +-
server/protocols/protocols-smtp/pom.xml | 38 ++--
.../protocols/webadmin-integration-test/pom.xml | 18 +-
.../webadmin/webadmin-cassandra/pom.xml | 6 +-
server/protocols/webadmin/webadmin-core/pom.xml | 10 +-
server/protocols/webadmin/webadmin-data/pom.xml | 10 +-
.../protocols/webadmin/webadmin-mailbox/pom.xml | 14 +-
.../protocols/webadmin/webadmin-swagger/pom.xml | 2 +-
server/queue/queue-activemq/pom.xml | 12 +-
server/queue/queue-api/pom.xml | 6 +-
server/queue/queue-file/pom.xml | 8 +-
server/queue/queue-jms/pom.xml | 12 +-
111 files changed, 744 insertions(+), 755 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/backends-common/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/pom.xml b/backends-common/cassandra/pom.xml
index c27326c..317a7cb 100644
--- a/backends-common/cassandra/pom.xml
+++ b/backends-common/cassandra/pom.xml
@@ -32,11 +32,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/backends-common/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/elasticsearch/pom.xml b/backends-common/elasticsearch/pom.xml
index 4853e76..a69c46d 100644
--- a/backends-common/elasticsearch/pom.xml
+++ b/backends-common/elasticsearch/pom.xml
@@ -29,7 +29,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
@@ -73,7 +73,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<scope>test</scope>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/backends-common/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/pom.xml b/backends-common/pom.xml
index 35a3285..01e1b24 100644
--- a/backends-common/pom.xml
+++ b/backends-common/pom.xml
@@ -47,12 +47,12 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<version>3.1.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailbox/caching/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/caching/pom.xml b/mailbox/caching/pom.xml
index 8e93c10..69937ee 100644
--- a/mailbox/caching/pom.xml
+++ b/mailbox/caching/pom.xml
@@ -33,11 +33,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailbox/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/pom.xml b/mailbox/elasticsearch/pom.xml
index c8834c5..e0a26f0 100644
--- a/mailbox/elasticsearch/pom.xml
+++ b/mailbox/elasticsearch/pom.xml
@@ -33,11 +33,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -53,7 +53,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
@@ -63,18 +63,18 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -167,7 +167,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailbox/jcr/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/jcr/pom.xml b/mailbox/jcr/pom.xml
index ed19b51..19dfa96 100644
--- a/mailbox/jcr/pom.xml
+++ b/mailbox/jcr/pom.xml
@@ -33,11 +33,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
@@ -87,13 +87,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailbox/jpa/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/jpa/pom.xml b/mailbox/jpa/pom.xml
index 59c8c7a..6950dda 100644
--- a/mailbox/jpa/pom.xml
+++ b/mailbox/jpa/pom.xml
@@ -33,19 +33,19 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -64,19 +64,19 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailbox/lucene/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/lucene/pom.xml b/mailbox/lucene/pom.xml
index f230561..a1dbd83 100644
--- a/mailbox/lucene/pom.xml
+++ b/mailbox/lucene/pom.xml
@@ -33,36 +33,36 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailbox/maildir/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/maildir/pom.xml b/mailbox/maildir/pom.xml
index 823e760..c41b125 100644
--- a/mailbox/maildir/pom.xml
+++ b/mailbox/maildir/pom.xml
@@ -33,19 +33,19 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
@@ -70,13 +70,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailbox/memory/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/memory/pom.xml b/mailbox/memory/pom.xml
index a4339ba..b0d2e16 100644
--- a/mailbox/memory/pom.xml
+++ b/mailbox/memory/pom.xml
@@ -33,11 +33,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
@@ -50,19 +50,19 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index 3513260..2c3814c 100644
--- a/mailbox/pom.xml
+++ b/mailbox/pom.xml
@@ -125,105 +125,105 @@
START Modules
-->
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</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>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jcr</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-maildir</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-hbase</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-tool</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
@@ -236,18 +236,18 @@
START Mail
-->
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-core</artifactId>
<version>${apache-mime4j.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
<version>${apache-mime4j.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-james-utils</artifactId>
<version>${apache-mime4j.version}</version>
</dependency>
@@ -279,7 +279,7 @@
Start James Mailet
-->
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
<version>${project.version}</version>
<exclusions>
@@ -294,30 +294,30 @@
-->
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<type>test-jar</type>
<scope>test</scope>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -494,12 +494,12 @@
START OpenJPA
-->
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
@@ -673,7 +673,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
<type>pom</type>
<exclusions>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailbox/scanning-search/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/scanning-search/pom.xml b/mailbox/scanning-search/pom.xml
index 71da354..51463a8 100644
--- a/mailbox/scanning-search/pom.xml
+++ b/mailbox/scanning-search/pom.xml
@@ -38,12 +38,12 @@
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailbox/spring/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/spring/pom.xml b/mailbox/spring/pom.xml
index 1d808de..de815fc 100644
--- a/mailbox/spring/pom.xml
+++ b/mailbox/spring/pom.xml
@@ -33,40 +33,40 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-maildir</artifactId>
</dependency>
<!-- TODO: enable after fix maibox-hbase -->
<!--<dependency>-->
- <!--<groupId>org.apache.james</groupId>-->
+ <!--<groupId>${project.groupId}</groupId>-->
<!--<artifactId>apache-james-mailbox-hbase</artifactId>-->
<!--</dependency>-->
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jcr</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-tool</artifactId>
</dependency>
<dependency>
@@ -130,7 +130,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailbox/store/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/store/pom.xml b/mailbox/store/pom.xml
index 196285e..92f8548 100644
--- a/mailbox/store/pom.xml
+++ b/mailbox/store/pom.xml
@@ -33,27 +33,19 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-util-java8</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-james-utils</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
@@ -126,7 +118,7 @@
<version>0.7.0-p9</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailbox/tika/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml
index 8802ede..f8241da 100644
--- a/mailbox/tika/pom.xml
+++ b/mailbox/tika/pom.xml
@@ -34,11 +34,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailbox/tool/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/tool/pom.xml b/mailbox/tool/pom.xml
index 4abef3c..369ff17 100644
--- a/mailbox/tool/pom.xml
+++ b/mailbox/tool/pom.xml
@@ -33,19 +33,19 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
</dependency>
<dependency>
@@ -65,13 +65,13 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailet/ai/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/ai/pom.xml b/mailet/ai/pom.xml
index 0a64d1e..db66dc5 100644
--- a/mailet/ai/pom.xml
+++ b/mailet/ai/pom.xml
@@ -37,11 +37,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailet/base/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/base/pom.xml b/mailet/base/pom.xml
index 3ab0ac5..1fb13a5 100644
--- a/mailet/base/pom.xml
+++ b/mailet/base/pom.xml
@@ -41,11 +41,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-core</artifactId>
</dependency>
<dependency>
@@ -115,7 +115,7 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>maven-mailetdocs-plugin</artifactId>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailet/crypto/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/crypto/pom.xml b/mailet/crypto/pom.xml
index 6033820..3afa2cf 100644
--- a/mailet/crypto/pom.xml
+++ b/mailet/crypto/pom.xml
@@ -56,11 +56,11 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
<version>${project.version}</version>
</dependency>
@@ -80,7 +80,7 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>maven-mailetdocs-plugin</artifactId>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailet/icalendar/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/icalendar/pom.xml b/mailet/icalendar/pom.xml
index d703cca..5eba44b 100644
--- a/mailet/icalendar/pom.xml
+++ b/mailet/icalendar/pom.xml
@@ -31,11 +31,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailet/mailetdocs-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/mailetdocs-maven-plugin/pom.xml b/mailet/mailetdocs-maven-plugin/pom.xml
index b68862f..6e71ed7 100644
--- a/mailet/mailetdocs-maven-plugin/pom.xml
+++ b/mailet/mailetdocs-maven-plugin/pom.xml
@@ -61,7 +61,7 @@
<artifactId>maven-reporting-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailet/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/pom.xml b/mailet/pom.xml
index 6bc33e4..5073e66 100644
--- a/mailet/pom.xml
+++ b/mailet/pom.xml
@@ -75,23 +75,23 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-core</artifactId>
<version>${mime4j.version}</version>
</dependency>
@@ -241,7 +241,7 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>maven-mailetdocs-plugin</artifactId>
<version>${plugin.mailetdocs.version}</version>
</plugin>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mailet/standard/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml
index cff5475..41446fc 100644
--- a/mailet/standard/pom.xml
+++ b/mailet/standard/pom.xml
@@ -40,17 +40,17 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
<version>${mime4j.version}</version>
</dependency>
@@ -103,7 +103,7 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>maven-mailetdocs-plugin</artifactId>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/metrics/metrics-dropwizard/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/metrics-dropwizard/pom.xml b/metrics/metrics-dropwizard/pom.xml
index be678aa..7c99f0b 100644
--- a/metrics/metrics-dropwizard/pom.xml
+++ b/metrics/metrics-dropwizard/pom.xml
@@ -31,15 +31,15 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/metrics/metrics-logger/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/metrics-logger/pom.xml b/metrics/metrics-logger/pom.xml
index 5e04a60..a872988 100644
--- a/metrics/metrics-logger/pom.xml
+++ b/metrics/metrics-logger/pom.xml
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/pom.xml b/metrics/pom.xml
index e820cdd..04978e1 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -52,22 +52,22 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-dropwizard</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mpt/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/core/pom.xml b/mpt/core/pom.xml
index f42c9bf..4aec954 100644
--- a/mpt/core/pom.xml
+++ b/mpt/core/pom.xml
@@ -44,11 +44,11 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/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 00f2901..8cfb5b5 100644
--- a/mpt/impl/imap-mailbox/cassandra/pom.xml
+++ b/mpt/impl/imap-mailbox/cassandra/pom.xml
@@ -32,21 +32,21 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/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 72092b7..2faf72e 100644
--- a/mpt/impl/imap-mailbox/core/pom.xml
+++ b/mpt/impl/imap-mailbox/core/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-core</artifactId>
</dependency>
<dependency>
@@ -45,24 +45,24 @@
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailbox-adapter</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/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 5e38dfd..a8e9eb1 100644
--- a/mpt/impl/imap-mailbox/elasticsearch/pom.xml
+++ b/mpt/impl/imap-mailbox/elasticsearch/pom.xml
@@ -32,29 +32,29 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
@@ -62,7 +62,7 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mpt/impl/imap-mailbox/external-james/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/external-james/pom.xml b/mpt/impl/imap-mailbox/external-james/pom.xml
index 02d5c3f..e63a678 100644
--- a/mpt/impl/imap-mailbox/external-james/pom.xml
+++ b/mpt/impl/imap-mailbox/external-james/pom.xml
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/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 a0a4552..598729d 100644
--- a/mpt/impl/imap-mailbox/hbase/pom.xml
+++ b/mpt/impl/imap-mailbox/hbase/pom.xml
@@ -32,11 +32,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-hbase</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/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 618c4bf..e79b847 100644
--- a/mpt/impl/imap-mailbox/inmemory/pom.xml
+++ b/mpt/impl/imap-mailbox/inmemory/pom.xml
@@ -32,11 +32,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/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 71ca4f4..6c1e12a 100644
--- a/mpt/impl/imap-mailbox/jcr/pom.xml
+++ b/mpt/impl/imap-mailbox/jcr/pom.xml
@@ -32,11 +32,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jcr</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/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 118d479..3be39ae 100644
--- a/mpt/impl/imap-mailbox/jpa/pom.xml
+++ b/mpt/impl/imap-mailbox/jpa/pom.xml
@@ -32,27 +32,27 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
<scope>test</scope>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/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 b93fb70..d5205bd 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/pom.xml
+++ b/mpt/impl/imap-mailbox/lucenesearch/pom.xml
@@ -32,35 +32,35 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
@@ -68,7 +68,7 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/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 abc30ea..58bdc7f 100644
--- a/mpt/impl/imap-mailbox/maildir/pom.xml
+++ b/mpt/impl/imap-mailbox/maildir/pom.xml
@@ -32,11 +32,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-maildir</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mpt/impl/managesieve/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/pom.xml b/mpt/impl/managesieve/cassandra/pom.xml
index 30023eb..02ddd90 100644
--- a/mpt/impl/managesieve/cassandra/pom.xml
+++ b/mpt/impl/managesieve/cassandra/pom.xml
@@ -32,20 +32,20 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-managesieve-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-cassandra</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mpt/impl/managesieve/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/core/pom.xml b/mpt/impl/managesieve/core/pom.xml
index aed0b47..f55808c 100644
--- a/mpt/impl/managesieve/core/pom.xml
+++ b/mpt/impl/managesieve/core/pom.xml
@@ -31,11 +31,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mpt/impl/managesieve/file/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/pom.xml b/mpt/impl/managesieve/file/pom.xml
index 54c915b..f016946 100644
--- a/mpt/impl/managesieve/file/pom.xml
+++ b/mpt/impl/managesieve/file/pom.xml
@@ -32,15 +32,15 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-managesieve-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-file</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mpt/impl/managesieve/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/pom.xml b/mpt/impl/managesieve/pom.xml
index 0c98878..f5b4afc 100644
--- a/mpt/impl/managesieve/pom.xml
+++ b/mpt/impl/managesieve/pom.xml
@@ -40,19 +40,19 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-managesieve-cassandra</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-managesieve-file</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-managesieve-core</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mpt/impl/smtp/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/pom.xml b/mpt/impl/smtp/cassandra/pom.xml
index a143977..e6c2e21 100644
--- a/mpt/impl/smtp/cassandra/pom.xml
+++ b/mpt/impl/smtp/cassandra/pom.xml
@@ -37,55 +37,55 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-smtp-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mpt/impl/smtp/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/pom.xml b/mpt/impl/smtp/core/pom.xml
index aeeba16..21bd7fa 100644
--- a/mpt/impl/smtp/core/pom.xml
+++ b/mpt/impl/smtp/core/pom.xml
@@ -32,24 +32,24 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/mpt/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/pom.xml b/mpt/pom.xml
index 14d17f7..49eab10 100644
--- a/mpt/pom.xml
+++ b/mpt/pom.xml
@@ -114,182 +114,182 @@
</dependency>
<!-- Other Apache James sub projects -->
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-cassandra</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-hbase</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jcr</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-maildir</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-file</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-mailbox-adapter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/protocols/imap/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml
index 1a2de8c..f145813 100644
--- a/protocols/imap/pom.xml
+++ b/protocols/imap/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/protocols/lmtp/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/lmtp/pom.xml b/protocols/lmtp/pom.xml
index c0f8404..47ddbcb 100644
--- a/protocols/lmtp/pom.xml
+++ b/protocols/lmtp/pom.xml
@@ -35,11 +35,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>protocols-smtp</artifactId>
</dependency>
<dependency>
@@ -62,18 +62,18 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>protocols-netty</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>protocols-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>protocols-smtp</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/protocols/netty/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/netty/pom.xml b/protocols/netty/pom.xml
index 3d68079..a7ad855 100644
--- a/protocols/netty/pom.xml
+++ b/protocols/netty/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3dd8a503/protocols/pop3/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/pop3/pom.xml b/protocols/pop3/pom.xml
index 777fbc9..d2564d8 100644
--- a/protocols/pop3/pom.xml
+++ b/protocols/pop3/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
@@ -48,13 +48,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>protocols-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>protocols-netty</artifactId>
<scope>test</scope>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[19/29] james-project git commit: JAMES-2124 Take account of
expandEmptyElements sort parameter
Posted by bt...@apache.org.
JAMES-2124 Take account of expandEmptyElements sort parameter
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2bc4de89
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2bc4de89
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2bc4de89
Branch: refs/heads/master
Commit: 2bc4de896e33e9b19a97f5a911e6d6dc50ea88aa
Parents: 78e99f3
Author: benwa <bt...@linagora.com>
Authored: Wed Aug 23 10:32:32 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 25 18:18:10 2017 +0700
----------------------------------------------------------------------
mailbox/store/pom.xml | 4 ++++
mpt/antlib/pom.xml | 8 +++----
pom.xml | 48 +++++++++++++++++++--------------------
protocols/smtp/pom.xml | 2 +-
server/app/pom.xml | 14 ++++++------
src/site/xdoc/contribute.xml | 2 +-
6 files changed, 41 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/2bc4de89/mailbox/store/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/store/pom.xml b/mailbox/store/pom.xml
index 6261ef0..c6778b9 100644
--- a/mailbox/store/pom.xml
+++ b/mailbox/store/pom.xml
@@ -59,6 +59,10 @@
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2bc4de89/mpt/antlib/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/antlib/pom.xml b/mpt/antlib/pom.xml
index 0eec84d..3475a39 100644
--- a/mpt/antlib/pom.xml
+++ b/mpt/antlib/pom.xml
@@ -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 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>
+ <property location="${project.build.outputDirectory}" name="jar.name" />
+ <property location="${basedir}" name="base.dir" />
+ <property name="test.skipped" value="${maven.test.skip}" />
+ <property name="test.classpath" refid="maven.test.classpath" />
</ant>
</tasks>
</configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2bc4de89/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 48e2f22..961f04c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<artifactId>apache</artifactId>
<groupId>org.apache</groupId>
<version>18</version>
- <relativePath></relativePath>
+ <relativePath />
</parent>
<groupId>org.apache.james</groupId>
@@ -82,7 +82,7 @@
<roles>
<role>Developer</role>
</roles>
- <timezone></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
@@ -97,7 +97,7 @@
<roles>
<role>Developer</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>sbrewin</id>
@@ -107,7 +107,7 @@
<role>Developer</role>
<role>PMC Member</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>hilmer</id>
@@ -117,7 +117,7 @@
<role>Developer</role>
<role>PMC Member</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>noel</id>
@@ -127,7 +127,7 @@
<role>Developer</role>
<role>PMC Member</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>danny</id>
@@ -139,7 +139,7 @@
<role>Developer</role>
<role>PMC Member</role>
</roles>
- <timezone></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
@@ -179,7 +179,7 @@
<role>Developer</role>
<role>PMC Member</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>rdonkin</id>
@@ -189,7 +189,7 @@
<role>Developer</role>
<role>PMC Member</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>niklas</id>
@@ -216,7 +216,7 @@
<roles>
<role>Developer</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>olegk</id>
@@ -226,7 +226,7 @@
<role>Developer</role>
<role>PMC Member</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>manolo</id>
@@ -236,7 +236,7 @@
<role>Developer</role>
<role>PMC Member</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>eric</id>
@@ -246,7 +246,7 @@
<role>Developer</role>
<role>PMC Chair</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>felixk</id>
@@ -265,7 +265,7 @@
<role>PMC Member</role>
<role>Developer</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>matthieu</id>
@@ -274,7 +274,7 @@
<roles>
<role>Developer</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>btellier</id>
@@ -286,7 +286,7 @@
<role>PMC Member</role>
<role>Developer</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>aduprat</id>
@@ -298,7 +298,7 @@
<role>PMC Member</role>
<role>Developer</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
<developer>
<id>rouazana</id>
@@ -309,7 +309,7 @@
<roles>
<role>Developer</role>
</roles>
- <timezone></timezone>
+ <timezone />
</developer>
</developers>
@@ -578,7 +578,7 @@
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 />
<activemq.version>5.15.0</activemq.version>
<apache-mime4j.version>0.8.1</apache-mime4j.version>
@@ -2607,7 +2607,7 @@
<execute>
<runOnIncremental>false</runOnIncremental>
</execute>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -2623,7 +2623,7 @@
<execute>
<runOnIncremental>false</runOnIncremental>
</execute>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -2639,7 +2639,7 @@
<execute>
<runOnIncremental>false</runOnIncremental>
</execute>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -2653,7 +2653,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -2666,7 +2666,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2bc4de89/protocols/smtp/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/smtp/pom.xml b/protocols/smtp/pom.xml
index 36b5884..b27986e 100644
--- a/protocols/smtp/pom.xml
+++ b/protocols/smtp/pom.xml
@@ -134,7 +134,7 @@
</relocation>
</relocations>
<transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"></transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
</transformers>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2bc4de89/server/app/pom.xml
----------------------------------------------------------------------
diff --git a/server/app/pom.xml b/server/app/pom.xml
index 1a5feba..5e0d744 100644
--- a/server/app/pom.xml
+++ b/server/app/pom.xml
@@ -945,20 +945,20 @@
<!-- this is only needed because windows freak out on long cmd lines, so we strip of the absolute path
from the lib dir to make windows happy again
-->
- <replace file="${project.build.directory}/appassembler/bin/run.bat" token="%BASEDIR%\lib" value="..\lib"></replace>
- <replace file="${project.build.directory}/appassembler/bin/run.sh" token="setenv" value="setenv.sh"></replace>
+ <replace file="${project.build.directory}/appassembler/bin/run.bat" token="%BASEDIR%\lib" value="..\lib" />
+ <replace file="${project.build.directory}/appassembler/bin/run.sh" token="setenv" value="setenv.sh" />
<!-- this is needed because appassembler is not really smart on some settings -->
- <replace file="${project.build.directory}/appassembler/jsw/james/conf/wrapper.conf" token="lib/wrapper.jar" value="%REPO_DIR%/wrapper.jar"></replace>
- <replace file="${project.build.directory}/appassembler/jsw/james/bin/james" token="logs" value="var"></replace>
+ <replace file="${project.build.directory}/appassembler/jsw/james/conf/wrapper.conf" token="lib/wrapper.jar" value="%REPO_DIR%/wrapper.jar" />
+ <replace file="${project.build.directory}/appassembler/jsw/james/bin/james" token="logs" value="var" />
<!-- copy the linux wrapper-linux-x86-32 to wrapper, so use it as default if no matching wrapper was found -->
- <copy file="${project.build.directory}/appassembler/jsw/james/bin/wrapper-linux-x86-32" tofile="${project.build.directory}/appassembler/jsw/james/bin/wrapper"></copy>
+ <copy file="${project.build.directory}/appassembler/jsw/james/bin/wrapper-linux-x86-32" tofile="${project.build.directory}/appassembler/jsw/james/bin/wrapper" />
<!-- this is only needed because windows freak out on long cmd lines, so we strip of the absolute path
from the lib dir to make windows happy again
-->
- <replace file="${project.build.directory}/appassembler/bin/james-cli.bat" token="%BASEDIR%\lib" value="..\lib"></replace>
- <replace file="${project.build.directory}/appassembler/bin/james-cli.sh" token="setenv" value="setenv.sh"></replace>
+ <replace file="${project.build.directory}/appassembler/bin/james-cli.bat" token="%BASEDIR%\lib" value="..\lib" />
+ <replace file="${project.build.directory}/appassembler/bin/james-cli.sh" token="setenv" value="setenv.sh" />
</tasks>
</configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2bc4de89/src/site/xdoc/contribute.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/contribute.xml b/src/site/xdoc/contribute.xml
index 99f0259..bf1238b 100644
--- a/src/site/xdoc/contribute.xml
+++ b/src/site/xdoc/contribute.xml
@@ -275,7 +275,7 @@
Hopefully, some tools are doing this sorting for you:</li>
</ul>
<pre>
- <code>mvn com.github.ekryd.sortpom:sortpom-maven-plugin:sort -Dsort.keepBlankLines -Dsort.sortDependencies=groupId,artifactId -Dsort.nrOfIndentSpace=4 -Dsort.createBackupFile=false -Dsort.sortModules=true -Dsort.sortModules=true</code>
+ <code>mvn com.github.ekryd.sortpom:sortpom-maven-plugin:sort -Dsort.keepBlankLines -Dsort.sortDependencies=groupId,artifactId -Dsort.nrOfIndentSpace=4 -Dsort.createBackupFile=false -Dsort.sortModules=true -Dsort.expandEmptyElements=false</code>
</pre>
<p>You should also split multiple attributes each on a new line.</p>
<p>You should ensure your POM files, as well as sections ordering follows the <a href="http://maven.apache.org/ref/3.0.3/maven-model/maven.html">Maven Model</a></p>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[09/29] james-project git commit: JAMES-2124 automatically sort all
dependencies
Posted by bt...@apache.org.
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
[27/29] james-project git commit: JAMES-2124 Respect maven sorting
order conventions
Posted by bt...@apache.org.
JAMES-2124 Respect maven sorting order conventions
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2a8b24d1
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2a8b24d1
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2a8b24d1
Branch: refs/heads/master
Commit: 2a8b24d1650ba1882369f56c41bbb985d5e85c60
Parents: 2bc4de8
Author: benwa <bt...@linagora.com>
Authored: Wed Aug 23 15:43:25 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 25 18:18:14 2017 +0700
----------------------------------------------------------------------
backends-common/cassandra/pom.xml | 4 +-
backends-common/elasticsearch/pom.xml | 2 +-
backends-common/jpa/pom.xml | 2 +-
backends-common/pom.xml | 2 +-
mailbox/api/pom.xml | 2 +-
mailbox/caching/pom.xml | 2 +-
mailbox/cassandra/pom.xml | 2 +-
mailbox/elasticsearch/pom.xml | 2 +-
mailbox/hbase/pom.xml | 16 +-
mailbox/jcr/pom.xml | 2 +-
mailbox/jpa/pom.xml | 16 +-
mailbox/kafka/pom.xml | 2 +-
mailbox/lucene/pom.xml | 2 +-
mailbox/maildir/pom.xml | 2 +-
mailbox/memory/pom.xml | 2 +-
mailbox/pom.xml | 6 +-
mailbox/scanning-search/pom.xml | 2 +-
mailbox/spring/pom.xml | 12 +-
mailbox/store/pom.xml | 2 +-
mailbox/tika/pom.xml | 2 +-
mailbox/tool/pom.xml | 2 +-
mailbox/zoo-seq-provider/pom.xml | 2 +-
mailet/ai/pom.xml | 2 +-
mailet/api/pom.xml | 2 +-
mailet/base/pom.xml | 2 +-
mailet/crypto/pom.xml | 2 +-
mailet/icalendar/pom.xml | 2 +-
mailet/mailetdocs-maven-plugin/pom.xml | 2 +-
mailet/pom.xml | 6 +-
mailet/standard/pom.xml | 2 +-
metrics/metrics-api/pom.xml | 2 +-
metrics/metrics-dropwizard/pom.xml | 2 +-
metrics/metrics-logger/pom.xml | 2 +-
metrics/pom.xml | 2 +-
mpt/all/pom.xml | 10 +-
mpt/antlib/pom.xml | 50 +++---
mpt/app/pom.xml | 20 +--
mpt/core/pom.xml | 32 ++--
mpt/impl/imap-mailbox/cassandra/pom.xml | 2 +-
mpt/impl/imap-mailbox/core/pom.xml | 2 +-
mpt/impl/imap-mailbox/cyrus/pom.xml | 2 +-
mpt/impl/imap-mailbox/elasticsearch/pom.xml | 2 +-
mpt/impl/imap-mailbox/external-james/pom.xml | 3 +-
mpt/impl/imap-mailbox/hbase/pom.xml | 2 +-
mpt/impl/imap-mailbox/inmemory/pom.xml | 2 +-
mpt/impl/imap-mailbox/jcr/pom.xml | 2 +-
mpt/impl/imap-mailbox/jpa/pom.xml | 2 +-
mpt/impl/imap-mailbox/lucenesearch/pom.xml | 2 +-
mpt/impl/imap-mailbox/maildir/pom.xml | 2 +-
mpt/impl/imap-mailbox/pom.xml | 2 +-
mpt/impl/managesieve/cassandra/pom.xml | 2 +-
mpt/impl/managesieve/core/pom.xml | 2 +-
mpt/impl/managesieve/file/pom.xml | 2 +-
mpt/impl/managesieve/pom.xml | 2 +-
mpt/impl/smtp/cassandra/pom.xml | 2 +-
mpt/impl/smtp/core/pom.xml | 2 +-
mpt/impl/smtp/pom.xml | 2 +-
mpt/mavenplugin/pom.xml | 4 +-
mpt/pom.xml | 16 +-
pom.xml | 180 +++++++++----------
protocols/api/pom.xml | 2 +-
protocols/imap/pom.xml | 4 +-
protocols/lmtp/pom.xml | 2 +-
protocols/managesieve/pom.xml | 2 +-
protocols/netty/pom.xml | 4 +-
protocols/pom.xml | 2 +-
protocols/pop3/pom.xml | 2 +-
protocols/smtp/pom.xml | 4 +-
server/app/pom.xml | 140 +++++++--------
server/container/cli-integration/pom.xml | 2 +-
server/container/cli/pom.xml | 10 +-
server/container/core/pom.xml | 2 +-
server/container/filesystem-api/pom.xml | 2 +-
server/container/guice/cassandra-guice/pom.xml | 4 +-
.../guice/cassandra-ldap-guice/pom.xml | 4 +-
server/container/guice/configuration/pom.xml | 2 +-
server/container/guice/custom-mailets/pom.xml | 2 +-
server/container/guice/guice-common/pom.xml | 2 +-
server/container/guice/jmx/pom.xml | 2 +-
server/container/guice/jpa-common-guice/pom.xml | 2 +-
server/container/guice/jpa-guice/pom.xml | 4 +-
server/container/guice/jpa-smtp/pom.xml | 6 +-
server/container/guice/mailbox/pom.xml | 2 +-
server/container/guice/mailet/pom.xml | 2 +-
server/container/guice/memory-guice/pom.xml | 4 +-
server/container/guice/onami/pom.xml | 4 +-
server/container/guice/pom.xml | 2 +-
server/container/guice/protocols/imap/pom.xml | 2 +-
server/container/guice/protocols/jmap/pom.xml | 2 +-
server/container/guice/protocols/lmtp/pom.xml | 2 +-
.../guice/protocols/managedsieve/pom.xml | 2 +-
server/container/guice/protocols/pop/pom.xml | 2 +-
server/container/guice/protocols/smtp/pom.xml | 2 +-
.../guice/protocols/webadmin-cassandra/pom.xml | 2 +-
.../guice/protocols/webadmin-data/pom.xml | 2 +-
.../guice/protocols/webadmin-mailbox/pom.xml | 2 +-
.../guice/protocols/webadmin-swagger/pom.xml | 2 +-
.../container/guice/protocols/webadmin/pom.xml | 2 +-
server/container/jetty/pom.xml | 2 +-
server/container/lifecycle-api/pom.xml | 2 +-
server/container/mailbox-adapter/pom.xml | 2 +-
.../metrics/metrics-es-reporter/pom.xml | 2 +-
server/container/spring/pom.xml | 12 +-
server/container/util-java8/pom.xml | 2 +-
server/container/util/pom.xml | 2 +-
server/data/data-api/pom.xml | 2 +-
server/data/data-cassandra/pom.xml | 2 +-
server/data/data-file/pom.xml | 2 +-
server/data/data-hbase/pom.xml | 14 +-
server/data/data-jcr/pom.xml | 2 +-
server/data/data-jdbc/pom.xml | 2 +-
server/data/data-jmap-cassandra/pom.xml | 2 +-
server/data/data-jmap/pom.xml | 2 +-
server/data/data-jpa/pom.xml | 20 +--
.../data/data-ldap-integration-testing/pom.xml | 2 +-
server/data/data-ldap/pom.xml | 2 +-
server/data/data-library/pom.xml | 2 +-
server/data/data-memory/pom.xml | 2 +-
server/dns-service/dnsservice-api/pom.xml | 2 +-
server/dns-service/dnsservice-dnsjava/pom.xml | 2 +-
server/dns-service/dnsservice-library/pom.xml | 2 +-
server/karaf/distribution/pom.xml | 24 +--
server/karaf/features/pom.xml | 6 +-
server/karaf/integration/pom.xml | 6 +-
server/mailet/integration-testing/pom.xml | 2 +-
server/mailet/mailetcontainer-api/pom.xml | 2 +-
server/mailet/mailetcontainer-camel/pom.xml | 2 +-
server/mailet/mailets/pom.xml | 2 +-
server/pom.xml | 2 +-
server/protocols/fetchmail/pom.xml | 2 +-
.../jmap-integration-testing-common/pom.xml | 2 +-
.../protocols/jmap-integration-testing/pom.xml | 2 +-
server/protocols/jmap/pom.xml | 2 +-
server/protocols/jwt/pom.xml | 2 +-
server/protocols/protocols-imap4/pom.xml | 2 +-
server/protocols/protocols-library/pom.xml | 4 +-
server/protocols/protocols-lmtp/pom.xml | 10 +-
server/protocols/protocols-managesieve/pom.xml | 2 +-
server/protocols/protocols-pop3/pom.xml | 2 +-
server/protocols/protocols-smtp/pom.xml | 2 +-
.../protocols/webadmin-integration-test/pom.xml | 2 +-
.../webadmin/webadmin-cassandra/pom.xml | 2 +-
server/protocols/webadmin/webadmin-core/pom.xml | 2 +-
server/protocols/webadmin/webadmin-data/pom.xml | 2 +-
.../protocols/webadmin/webadmin-mailbox/pom.xml | 2 +-
.../protocols/webadmin/webadmin-swagger/pom.xml | 3 +-
server/queue/queue-activemq/pom.xml | 2 +-
server/queue/queue-api/pom.xml | 2 +-
server/queue/queue-file/pom.xml | 2 +-
server/queue/queue-jms/pom.xml | 2 +-
server/testing/pom.xml | 2 +-
src/site/xdoc/contribute.xml | 2 +-
152 files changed, 448 insertions(+), 450 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/backends-common/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/pom.xml b/backends-common/cassandra/pom.xml
index a427189..6da5354 100644
--- a/backends-common/cassandra/pom.xml
+++ b/backends-common/cassandra/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-backends-common</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-backends-common</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
@@ -48,8 +48,8 @@
exclude this dependency explicitly: -->
<exclusions>
<exclusion>
- <artifactId>*</artifactId>
<groupId>io.netty</groupId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/backends-common/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/elasticsearch/pom.xml b/backends-common/elasticsearch/pom.xml
index 8b05cdf..136b1d2 100644
--- a/backends-common/elasticsearch/pom.xml
+++ b/backends-common/elasticsearch/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-backends-common</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-backends-common</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/backends-common/jpa/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/jpa/pom.xml b/backends-common/jpa/pom.xml
index a6d7a15..1d99f0a 100644
--- a/backends-common/jpa/pom.xml
+++ b/backends-common/jpa/pom.xml
@@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-backends-common</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-backends-common</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/backends-common/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/pom.xml b/backends-common/pom.xml
index c7adbcf..439f2f9 100644
--- a/backends-common/pom.xml
+++ b/backends-common/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-project</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-project</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailbox/api/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/api/pom.xml b/mailbox/api/pom.xml
index b70e7f5..58624b5 100644
--- a/mailbox/api/pom.xml
+++ b/mailbox/api/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailbox/caching/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/caching/pom.xml b/mailbox/caching/pom.xml
index c85f4c0..63c8e15 100644
--- a/mailbox/caching/pom.xml
+++ b/mailbox/caching/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailbox/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml
index e57bae0..85cd43a 100644
--- a/mailbox/cassandra/pom.xml
+++ b/mailbox/cassandra/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailbox/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/pom.xml b/mailbox/elasticsearch/pom.xml
index de00175..75df1b9 100644
--- a/mailbox/elasticsearch/pom.xml
+++ b/mailbox/elasticsearch/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailbox/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/hbase/pom.xml b/mailbox/hbase/pom.xml
index 44039fc..0a2d28b 100644
--- a/mailbox/hbase/pom.xml
+++ b/mailbox/hbase/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -66,8 +66,8 @@
<artifactId>hadoop-core</artifactId>
<exclusions>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -81,20 +81,20 @@
<artifactId>hbase</artifactId>
<exclusions>
<exclusion>
- <artifactId>jruby-complete</artifactId>
<groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
</exclusion>
<exclusion>
- <artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
- <artifactId>log4j</artifactId>
<groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -105,12 +105,12 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <artifactId>jruby-complete</artifactId>
<groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
</exclusion>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailbox/jcr/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/jcr/pom.xml b/mailbox/jcr/pom.xml
index d0d20a3..336e4ee 100644
--- a/mailbox/jcr/pom.xml
+++ b/mailbox/jcr/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailbox/jpa/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/jpa/pom.xml b/mailbox/jpa/pom.xml
index 9f4d673..2901785 100644
--- a/mailbox/jpa/pom.xml
+++ b/mailbox/jpa/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -112,21 +112,21 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
<version>2.4.2</version>
+ <configuration>
+ <includes>org/apache/james/mailbox/jpa/*/model/**/*.class</includes>
+ <excludes>org/apache/james/mailbox/jpa/mail/model/openjpa/EncryptDecryptHelper.class</excludes>
+ <addDefaultConstructor>true</addDefaultConstructor>
+ <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+ </configuration>
<executions>
<execution>
<id>enhancer</id>
- <phase>process-classes</phase>
<goals>
<goal>enhance</goal>
</goals>
+ <phase>process-classes</phase>
</execution>
</executions>
- <configuration>
- <includes>org/apache/james/mailbox/jpa/*/model/**/*.class</includes>
- <excludes>org/apache/james/mailbox/jpa/mail/model/openjpa/EncryptDecryptHelper.class</excludes>
- <addDefaultConstructor>true</addDefaultConstructor>
- <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
- </configuration>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailbox/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/kafka/pom.xml b/mailbox/kafka/pom.xml
index a1707de..3f2d627 100644
--- a/mailbox/kafka/pom.xml
+++ b/mailbox/kafka/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailbox/lucene/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/lucene/pom.xml b/mailbox/lucene/pom.xml
index 29f70b4..0da2934 100644
--- a/mailbox/lucene/pom.xml
+++ b/mailbox/lucene/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailbox/maildir/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/maildir/pom.xml b/mailbox/maildir/pom.xml
index 8f5a8cf..173dbc2 100644
--- a/mailbox/maildir/pom.xml
+++ b/mailbox/maildir/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailbox/memory/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/memory/pom.xml b/mailbox/memory/pom.xml
index e73320c..3994681 100644
--- a/mailbox/memory/pom.xml
+++ b/mailbox/memory/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index 93994d2..773fef9 100644
--- a/mailbox/pom.xml
+++ b/mailbox/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-project</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-project</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
@@ -109,12 +109,12 @@
<type>pom</type>
<exclusions>
<exclusion>
- <artifactId>tika-core</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
</exclusion>
<exclusion>
- <artifactId>tika-parsers</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers</artifactId>
</exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailbox/scanning-search/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/scanning-search/pom.xml b/mailbox/scanning-search/pom.xml
index 48c195e..5094710 100644
--- a/mailbox/scanning-search/pom.xml
+++ b/mailbox/scanning-search/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailbox/spring/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/spring/pom.xml b/mailbox/spring/pom.xml
index 1192e7d..429c0d4 100644
--- a/mailbox/spring/pom.xml
+++ b/mailbox/spring/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -80,8 +80,8 @@
<artifactId>commons-dbcp</artifactId>
<exclusions>
<exclusion>
- <artifactId>xercesImpl</artifactId>
<groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -102,8 +102,8 @@
<artifactId>hadoop-core</artifactId>
<exclusions>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -119,16 +119,16 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <artifactId>jruby-complete</artifactId>
<groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
</exclusion>
<exclusion>
- <artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailbox/store/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/store/pom.xml b/mailbox/store/pom.xml
index c6778b9..1a86149 100644
--- a/mailbox/store/pom.xml
+++ b/mailbox/store/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailbox/tika/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml
index 3cc4470..dffea3b 100644
--- a/mailbox/tika/pom.xml
+++ b/mailbox/tika/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailbox/tool/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/tool/pom.xml b/mailbox/tool/pom.xml
index 77b0e92..dc669c3 100644
--- a/mailbox/tool/pom.xml
+++ b/mailbox/tool/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailbox/zoo-seq-provider/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/zoo-seq-provider/pom.xml b/mailbox/zoo-seq-provider/pom.xml
index ab2fe34..8acfbbb 100644
--- a/mailbox/zoo-seq-provider/pom.xml
+++ b/mailbox/zoo-seq-provider/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailet/ai/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/ai/pom.xml b/mailet/ai/pom.xml
index 17c6499..db66dc5 100644
--- a/mailet/ai/pom.xml
+++ b/mailet/ai/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-mailet</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailet/api/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/api/pom.xml b/mailet/api/pom.xml
index 55e3c46..9780510 100644
--- a/mailet/api/pom.xml
+++ b/mailet/api/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-mailet</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailet/base/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/base/pom.xml b/mailet/base/pom.xml
index 2e596b5..57bf7e7 100644
--- a/mailet/base/pom.xml
+++ b/mailet/base/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-mailet</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailet/crypto/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/crypto/pom.xml b/mailet/crypto/pom.xml
index fdcbfd3..de09bb2 100644
--- a/mailet/crypto/pom.xml
+++ b/mailet/crypto/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-mailet</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailet/icalendar/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/icalendar/pom.xml b/mailet/icalendar/pom.xml
index c169617..0f1f491 100644
--- a/mailet/icalendar/pom.xml
+++ b/mailet/icalendar/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-mailet</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailet/mailetdocs-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/mailetdocs-maven-plugin/pom.xml b/mailet/mailetdocs-maven-plugin/pom.xml
index c055f19..0b6bdcc 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>
- <artifactId>apache-mailet</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailet/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/pom.xml b/mailet/pom.xml
index f9ffb34..4e1d2b6 100644
--- a/mailet/pom.xml
+++ b/mailet/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-project</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-project</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
@@ -87,12 +87,13 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <inherited>true</inherited>
<executions>
<execution>
- <phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>verify</phase>
<configuration>
<excludes>
<exclude>NOTICE.*</exclude>
@@ -114,7 +115,6 @@
</configuration>
</execution>
</executions>
- <inherited>true</inherited>
</plugin>
<!-- Add NOTICE and LICENSE to generated JAR -->
<plugin>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mailet/standard/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml
index 7ad13a5..58a6ba8 100644
--- a/mailet/standard/pom.xml
+++ b/mailet/standard/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-mailet</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/metrics/metrics-api/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/metrics-api/pom.xml b/metrics/metrics-api/pom.xml
index 7ba3157..11a5ded 100644
--- a/metrics/metrics-api/pom.xml
+++ b/metrics/metrics-api/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>metrics</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>metrics</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/metrics/metrics-dropwizard/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/metrics-dropwizard/pom.xml b/metrics/metrics-dropwizard/pom.xml
index 9a211f3..4a156a7 100644
--- a/metrics/metrics-dropwizard/pom.xml
+++ b/metrics/metrics-dropwizard/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>metrics</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>metrics</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/metrics/metrics-logger/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/metrics-logger/pom.xml b/metrics/metrics-logger/pom.xml
index e5fb6f9..09519ab 100644
--- a/metrics/metrics-logger/pom.xml
+++ b/metrics/metrics-logger/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>metrics</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>metrics</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/pom.xml b/metrics/pom.xml
index ac03444..dc44b64 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-project</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-project</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mpt/all/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/all/pom.xml b/mpt/all/pom.xml
index d5f8679..416c61e 100644
--- a/mpt/all/pom.xml
+++ b/mpt/all/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -63,19 +63,19 @@ MPT is a functional test framework specialised for the ASCII line-base protocols
<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. -->
<goals>
<goal>attached</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
- <configuration>
- <descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
- </configuration>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mpt/antlib/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/antlib/pom.xml b/mpt/antlib/pom.xml
index 3475a39..c62f1cf 100644
--- a/mpt/antlib/pom.xml
+++ b/mpt/antlib/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -75,12 +75,20 @@ to the library requiring no extra coding.</description>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <!-- AntUnit require Ant 1.7+ -->
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
- <phase>test</phase>
<goals>
<goal>run</goal>
</goals>
+ <phase>test</phase>
<configuration>
<tasks>
<ant antfile="src/test/resources/build.xml" inheritAll="false" inheritRefs="false">
@@ -93,25 +101,10 @@ to the library requiring no extra coding.</description>
</configuration>
</execution>
</executions>
- <dependencies>
- <!-- AntUnit require Ant 1.7+ -->
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.7.1</version>
- </dependency>
- </dependencies>
</plugin>
<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>
@@ -127,27 +120,34 @@ 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>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.james.mpt.ant</Export-Package>
+ <Embed-Dependency>*;scope=runtime</Embed-Dependency>
+ </instructions>
+ </configuration>
<executions>
<execution>
<id>bundle-manifest</id>
- <phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
+ <phase>process-classes</phase>
</execution>
</executions>
- <configuration>
- <instructions>
- <Export-Package>org.apache.james.mpt.ant</Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
- </instructions>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -155,11 +155,11 @@ to the library requiring no extra coding.</description>
<executions>
<execution>
<id>create-javadocs</id>
- <phase>package</phase>
<goals>
<goal>javadoc</goal>
<goal>jar</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mpt/app/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/app/pom.xml b/mpt/app/pom.xml
index 534f93e..15e896d 100644
--- a/mpt/app/pom.xml
+++ b/mpt/app/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -72,14 +72,6 @@ interfaces to the MPT library.</description>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<artifactSet>
<includes>
@@ -90,6 +82,14 @@ interfaces to the MPT library.</description>
</includes>
</artifactSet>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
</plugin>
<plugin>
@@ -117,11 +117,11 @@ interfaces to the MPT library.</description>
<executions>
<execution>
<id>create-javadocs</id>
- <phase>package</phase>
<goals>
<goal>javadoc</goal>
<goal>jar</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mpt/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/core/pom.xml b/mpt/core/pom.xml
index 982e03f..aefc854 100644
--- a/mpt/core/pom.xml
+++ b/mpt/core/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -97,13 +97,6 @@
<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>
@@ -119,26 +112,33 @@
</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>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.james.mpt</Export-Package>
+ <Embed-Dependency>*;scope=runtime</Embed-Dependency>
+ </instructions>
+ </configuration>
<executions>
<execution>
<id>bundle-manifest</id>
- <phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
+ <phase>process-classes</phase>
</execution>
</executions>
- <configuration>
- <instructions>
- <Export-Package>org.apache.james.mpt</Export-Package>
- <Embed-Dependency>*;scope=runtime</Embed-Dependency>
- </instructions>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -146,11 +146,11 @@
<executions>
<execution>
<id>create-javadocs</id>
- <phase>package</phase>
<goals>
<goal>javadoc</goal>
<goal>jar</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 b1b6cbb..6eccb8c 100644
--- a/mpt/impl/imap-mailbox/cassandra/pom.xml
+++ b/mpt/impl/imap-mailbox/cassandra/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-imapmailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt-imapmailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 0de4204..e16a903 100644
--- a/mpt/impl/imap-mailbox/core/pom.xml
+++ b/mpt/impl/imap-mailbox/core/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-imapmailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt-imapmailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 cc253d3..9cca0b1 100644
--- a/mpt/impl/imap-mailbox/cyrus/pom.xml
+++ b/mpt/impl/imap-mailbox/cyrus/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-imapmailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt-imapmailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 6f02d43..762f5a7 100644
--- a/mpt/impl/imap-mailbox/elasticsearch/pom.xml
+++ b/mpt/impl/imap-mailbox/elasticsearch/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-imapmailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt-imapmailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mpt/impl/imap-mailbox/external-james/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/external-james/pom.xml b/mpt/impl/imap-mailbox/external-james/pom.xml
index e63a678..283daa9 100644
--- a/mpt/impl/imap-mailbox/external-james/pom.xml
+++ b/mpt/impl/imap-mailbox/external-james/pom.xml
@@ -22,15 +22,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-imapmailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt-imapmailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>apache-james-mpt-external-james</artifactId>
<name>Apache James MPT Imap Mailbox - External James</name>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 dcd4605..fb991bf 100644
--- a/mpt/impl/imap-mailbox/hbase/pom.xml
+++ b/mpt/impl/imap-mailbox/hbase/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-imapmailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt-imapmailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 812ea5e..dfed496 100644
--- a/mpt/impl/imap-mailbox/inmemory/pom.xml
+++ b/mpt/impl/imap-mailbox/inmemory/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-imapmailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt-imapmailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 08e590a..bbae89d 100644
--- a/mpt/impl/imap-mailbox/jcr/pom.xml
+++ b/mpt/impl/imap-mailbox/jcr/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-imapmailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt-imapmailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 662f32d..ec7e8b4 100644
--- a/mpt/impl/imap-mailbox/jpa/pom.xml
+++ b/mpt/impl/imap-mailbox/jpa/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-imapmailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt-imapmailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 824f9db..aa45855 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/pom.xml
+++ b/mpt/impl/imap-mailbox/lucenesearch/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-imapmailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt-imapmailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 54b2405..5a634fd 100644
--- a/mpt/impl/imap-mailbox/maildir/pom.xml
+++ b/mpt/impl/imap-mailbox/maildir/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-imapmailbox</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt-imapmailbox</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mpt/impl/imap-mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/pom.xml b/mpt/impl/imap-mailbox/pom.xml
index 506c098..4ba5585 100644
--- a/mpt/impl/imap-mailbox/pom.xml
+++ b/mpt/impl/imap-mailbox/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mpt/impl/managesieve/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/pom.xml b/mpt/impl/managesieve/cassandra/pom.xml
index 13b0e83..7be717d 100644
--- a/mpt/impl/managesieve/cassandra/pom.xml
+++ b/mpt/impl/managesieve/cassandra/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-managesieve</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt-managesieve</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mpt/impl/managesieve/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/core/pom.xml b/mpt/impl/managesieve/core/pom.xml
index fe7cb21..b808c33 100644
--- a/mpt/impl/managesieve/core/pom.xml
+++ b/mpt/impl/managesieve/core/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-managesieve</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt-managesieve</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mpt/impl/managesieve/file/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/pom.xml b/mpt/impl/managesieve/file/pom.xml
index 1794e4b..a0d633d 100644
--- a/mpt/impl/managesieve/file/pom.xml
+++ b/mpt/impl/managesieve/file/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-managesieve</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt-managesieve</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mpt/impl/managesieve/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/pom.xml b/mpt/impl/managesieve/pom.xml
index 8d04ac0b..70a071d 100644
--- a/mpt/impl/managesieve/pom.xml
+++ b/mpt/impl/managesieve/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mpt/impl/smtp/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/pom.xml b/mpt/impl/smtp/cassandra/pom.xml
index 7035762..0627cec 100644
--- a/mpt/impl/smtp/cassandra/pom.xml
+++ b/mpt/impl/smtp/cassandra/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-smtp</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt-smtp</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mpt/impl/smtp/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/pom.xml b/mpt/impl/smtp/core/pom.xml
index a3b2259..5c7e5db 100644
--- a/mpt/impl/smtp/core/pom.xml
+++ b/mpt/impl/smtp/core/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-smtp</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt-smtp</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mpt/impl/smtp/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/pom.xml b/mpt/impl/smtp/pom.xml
index 3f255a3..01e8270 100644
--- a/mpt/impl/smtp/pom.xml
+++ b/mpt/impl/smtp/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mpt/mavenplugin/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/mavenplugin/pom.xml b/mpt/mavenplugin/pom.xml
index ea9eb9c..9c10a22 100644
--- a/mpt/mavenplugin/pom.xml
+++ b/mpt/mavenplugin/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mpt</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -117,11 +117,11 @@ to the library requiring no extra coding.</description>
<executions>
<execution>
<id>create-javadocs</id>
- <phase>package</phase>
<goals>
<goal>javadoc</goal>
<goal>jar</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/mpt/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/pom.xml b/mpt/pom.xml
index 67a10d9..7392481 100644
--- a/mpt/pom.xml
+++ b/mpt/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-project</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-project</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
@@ -74,13 +74,6 @@
<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>
@@ -89,6 +82,13 @@
</manifest>
</archive>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[11/29] james-project git commit: JAMES-2124 automatically sort all
dependencies
Posted by bt...@apache.org.
JAMES-2124 automatically sort all dependencies
mvn com.github.ekryd.sortpom:sortpom-maven-plugin:sort -Dsort.keepBlankLines -Dsort.sortDependencies=groupId,artifactId -Dsort.nrOfIndentSpace=4 -Dsort.createBackupFile=false -Dsort.sortModules=true -Dsort.sortModules=true
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/dbd6223b
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/dbd6223b
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/dbd6223b
Branch: refs/heads/master
Commit: dbd6223b30cf7d3df1f2f513dadc5db95f0f0cf3
Parents: 3dd8a50
Author: benwa <bt...@linagora.com>
Authored: Fri Aug 18 17:03:32 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 25 18:17:01 2017 +0700
----------------------------------------------------------------------
backends-common/cassandra/pom.xml | 16 +-
backends-common/elasticsearch/pom.xml | 18 +-
backends-common/jpa/pom.xml | 18 +-
backends-common/pom.xml | 16 +-
mailbox/api/pom.xml | 22 +-
mailbox/caching/pom.xml | 12 +-
mailbox/cassandra/pom.xml | 102 +-
mailbox/elasticsearch/pom.xml | 24 +-
mailbox/hbase/pom.xml | 89 +-
mailbox/jcr/pom.xml | 59 +-
mailbox/jpa/pom.xml | 62 +-
mailbox/kafka/pom.xml | 13 +-
mailbox/lucene/pom.xml | 2 +-
mailbox/maildir/pom.xml | 48 +-
mailbox/memory/pom.xml | 36 +-
mailbox/pom.xml | 525 +++---
mailbox/scanning-search/pom.xml | 3 +-
mailbox/spring/pom.xml | 128 +-
mailbox/store/pom.xml | 64 +-
mailbox/tika/pom.xml | 13 +-
mailbox/tool/pom.xml | 36 +-
mailbox/zoo-seq-provider/pom.xml | 43 +-
mailet/ai/pom.xml | 2 +-
mailet/api/pom.xml | 12 +-
mailet/base/pom.xml | 40 +-
mailet/crypto/pom.xml | 34 +-
mailet/icalendar/pom.xml | 12 +-
mailet/mailetdocs-maven-plugin/pom.xml | 52 +-
mailet/pom.xml | 190 ++-
mailet/standard/pom.xml | 8 +-
metrics/metrics-api/pom.xml | 2 +-
metrics/metrics-dropwizard/pom.xml | 10 +-
metrics/metrics-logger/pom.xml | 2 +-
metrics/pom.xml | 3 +-
mpt/all/pom.xml | 33 +-
mpt/antlib/pom.xml | 42 +-
mpt/core/pom.xml | 44 +-
mpt/impl/imap-mailbox/cassandra/pom.xml | 3 +-
mpt/impl/imap-mailbox/core/pom.xml | 41 +-
mpt/impl/imap-mailbox/cyrus/pom.xml | 9 +-
mpt/impl/imap-mailbox/elasticsearch/pom.xml | 8 +-
mpt/impl/imap-mailbox/hbase/pom.xml | 19 +-
mpt/impl/imap-mailbox/inmemory/pom.xml | 7 +-
mpt/impl/imap-mailbox/jcr/pom.xml | 15 +-
mpt/impl/imap-mailbox/jpa/pom.xml | 9 +-
mpt/impl/imap-mailbox/lucenesearch/pom.xml | 20 +-
mpt/impl/imap-mailbox/maildir/pom.xml | 7 +-
mpt/impl/imap-mailbox/pom.xml | 89 +-
mpt/impl/managesieve/cassandra/pom.xml | 10 +-
mpt/impl/managesieve/core/pom.xml | 11 +-
mpt/impl/managesieve/file/pom.xml | 4 +-
mpt/impl/managesieve/pom.xml | 16 +-
mpt/impl/smtp/cassandra/pom.xml | 63 +-
mpt/impl/smtp/core/pom.xml | 6 +-
mpt/impl/smtp/pom.xml | 14 +-
mpt/mavenplugin/pom.xml | 12 +-
mpt/pom.xml | 251 ++-
pom.xml | 138 +-
protocols/api/pom.xml | 18 +-
protocols/imap/pom.xml | 96 +-
protocols/lmtp/pom.xml | 36 +-
protocols/managesieve/pom.xml | 21 +-
protocols/pom.xml | 237 ---
protocols/pop3/pom.xml | 22 +-
protocols/smtp/pom.xml | 26 +-
server/app/pom.xml | 494 +++---
server/container/cli-integration/pom.xml | 8 +-
server/container/cli/pom.xml | 16 +-
server/container/core/pom.xml | 52 +-
server/container/filesystem-api/pom.xml | 4 +-
server/container/guice/cassandra-guice/pom.xml | 75 +-
.../guice/cassandra-ldap-guice/pom.xml | 39 +-
server/container/guice/configuration/pom.xml | 2 +-
server/container/guice/custom-mailets/pom.xml | 4 +-
server/container/guice/guice-common/pom.xml | 56 +-
server/container/guice/jmx/pom.xml | 36 +-
server/container/guice/jpa-common-guice/pom.xml | 34 +-
server/container/guice/jpa-guice/pom.xml | 50 +-
server/container/guice/jpa-smtp/pom.xml | 42 +-
server/container/guice/mailbox/pom.xml | 2 +-
server/container/guice/mailet/pom.xml | 14 +-
server/container/guice/memory-guice/pom.xml | 132 +-
server/container/guice/pom.xml | 60 +-
server/container/guice/protocols/imap/pom.xml | 2 +-
server/container/guice/protocols/jmap/pom.xml | 2 +-
server/container/guice/protocols/lmtp/pom.xml | 2 +-
.../guice/protocols/managedsieve/pom.xml | 10 +-
server/container/guice/protocols/pop/pom.xml | 2 +-
server/container/guice/protocols/smtp/pom.xml | 2 +-
.../guice/protocols/webadmin-cassandra/pom.xml | 2 +-
.../guice/protocols/webadmin-data/pom.xml | 2 +-
.../guice/protocols/webadmin-mailbox/pom.xml | 2 +-
.../guice/protocols/webadmin-swagger/pom.xml | 2 +-
.../container/guice/protocols/webadmin/pom.xml | 2 +-
server/container/mailbox-adapter/pom.xml | 32 +-
.../metrics/metrics-es-reporter/pom.xml | 16 +-
server/container/spring/pom.xml | 142 +-
server/container/util-java8/pom.xml | 13 +-
server/container/util/pom.xml | 12 +-
server/data/data-cassandra/pom.xml | 68 +-
server/data/data-file/pom.xml | 68 +-
server/data/data-hbase/pom.xml | 125 +-
server/data/data-jcr/pom.xml | 58 +-
server/data/data-jdbc/pom.xml | 72 +-
server/data/data-jmap-cassandra/pom.xml | 29 +-
server/data/data-jmap/pom.xml | 8 +-
server/data/data-jpa/pom.xml | 84 +-
server/data/data-ldap/pom.xml | 24 +-
server/data/data-library/pom.xml | 46 +-
server/data/data-memory/pom.xml | 4 +-
server/dns-service/dnsservice-api/pom.xml | 10 +-
server/dns-service/dnsservice-dnsjava/pom.xml | 24 +-
server/dns-service/dnsservice-library/pom.xml | 22 +-
server/karaf/distribution/pom.xml | 41 +-
server/karaf/features/pom.xml | 8 +-
server/karaf/integration/pom.xml | 99 +-
server/mailet/integration-testing/pom.xml | 18 +-
server/mailet/mailetcontainer-camel/pom.xml | 98 +-
server/mailet/mailets/pom.xml | 168 +-
server/pom.xml | 1509 +++++++++---------
server/protocols/fetchmail/pom.xml | 26 +-
.../cassandra-jmap-integration-testing/pom.xml | 27 +-
.../jmap-integration-testing-common/pom.xml | 18 +-
.../memory-jmap-integration-testing/pom.xml | 37 +-
.../protocols/jmap-integration-testing/pom.xml | 3 +-
server/protocols/jmap/pom.xml | 8 +-
server/protocols/jwt/pom.xml | 12 +-
server/protocols/protocols-imap4/pom.xml | 40 +-
server/protocols/protocols-library/pom.xml | 34 +-
server/protocols/protocols-lmtp/pom.xml | 84 +-
server/protocols/protocols-managesieve/pom.xml | 24 +-
server/protocols/protocols-pop3/pom.xml | 106 +-
server/protocols/protocols-smtp/pom.xml | 172 +-
.../protocols/webadmin-integration-test/pom.xml | 16 +-
server/protocols/webadmin/webadmin-core/pom.xml | 24 +-
server/protocols/webadmin/webadmin-data/pom.xml | 17 +-
.../protocols/webadmin/webadmin-mailbox/pom.xml | 16 +-
server/queue/queue-activemq/pom.xml | 64 +-
server/queue/queue-api/pom.xml | 16 +-
server/queue/queue-file/pom.xml | 15 +-
server/queue/queue-jms/pom.xml | 48 +-
141 files changed, 3688 insertions(+), 4110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/backends-common/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/pom.xml b/backends-common/cassandra/pom.xml
index 317a7cb..a427189 100644
--- a/backends-common/cassandra/pom.xml
+++ b/backends-common/cassandra/pom.xml
@@ -48,8 +48,8 @@
exclude this dependency explicitly: -->
<exclusions>
<exclusion>
- <groupId>io.netty</groupId>
<artifactId>*</artifactId>
+ <groupId>io.netty</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -72,6 +72,12 @@
<version>0.3.0</version>
</dependency>
<dependency>
+ <groupId>nl.jqno.equalsverifier</groupId>
+ <artifactId>equalsverifier</artifactId>
+ <version>1.7.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
@@ -88,12 +94,6 @@
<version>1.9.0</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>nl.jqno.equalsverifier</groupId>
- <artifactId>equalsverifier</artifactId>
- <version>1.7.6</version>
- <scope>test</scope>
- </dependency>
</dependencies>
-
+
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/backends-common/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/elasticsearch/pom.xml b/backends-common/elasticsearch/pom.xml
index a69c46d..8b05cdf 100644
--- a/backends-common/elasticsearch/pom.xml
+++ b/backends-common/elasticsearch/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>james-backends-common</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>apache-james-backends-es</artifactId>
@@ -33,6 +33,13 @@
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.github.fge</groupId>
<artifactId>throwing-lambdas</artifactId>
<version>0.5.0</version>
@@ -60,8 +67,8 @@
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>2.2.1</version>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -73,13 +80,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-util-java8</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/backends-common/jpa/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/jpa/pom.xml b/backends-common/jpa/pom.xml
index 86e829a..a6d7a15 100644
--- a/backends-common/jpa/pom.xml
+++ b/backends-common/jpa/pom.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-backends-common</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>apache-james-backends-jpa</artifactId>
@@ -15,9 +15,10 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>2.4.2</version>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.3.170</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -25,10 +26,9 @@
<version>1.1</version>
</dependency>
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>test</scope>
- <version>1.3.170</version>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>2.4.2</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/backends-common/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/pom.xml b/backends-common/pom.xml
index 01e1b24..df1ffb0 100644
--- a/backends-common/pom.xml
+++ b/backends-common/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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
@@ -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>
@@ -33,17 +33,17 @@
<description>Apache James Backends: common utils to access backends</description>
<inceptionYear>2015</inceptionYear>
- <properties>
- <junit.version>4.11</junit.version>
- <slf4j.version>1.7.25</slf4j.version>
- </properties>
-
<modules>
<module>cassandra</module>
- <module>jpa</module>
<module>elasticsearch</module>
+ <module>jpa</module>
</modules>
+ <properties>
+ <junit.version>4.11</junit.version>
+ <slf4j.version>1.7.25</slf4j.version>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailbox/api/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/api/pom.xml b/mailbox/api/pom.xml
index 4e7414f..b70e7f5 100644
--- a/mailbox/api/pom.xml
+++ b/mailbox/api/pom.xml
@@ -45,22 +45,13 @@
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -87,5 +78,14 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailbox/caching/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/caching/pom.xml b/mailbox/caching/pom.xml
index 69937ee..c85f4c0 100644
--- a/mailbox/caching/pom.xml
+++ b/mailbox/caching/pom.xml
@@ -28,8 +28,8 @@
</parent>
<artifactId>apache-james-mailbox-caching</artifactId>
- <name>Apache James :: Mailbox :: Caching</name>
<packaging>bundle</packaging>
+ <name>Apache James :: Mailbox :: Caching</name>
<dependencies>
<dependency>
@@ -45,6 +45,11 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
@@ -53,10 +58,5 @@
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailbox/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml
index cc19090..e57bae0 100644
--- a/mailbox/cassandra/pom.xml
+++ b/mailbox/cassandra/pom.xml
@@ -28,70 +28,39 @@
</parent>
<artifactId>apache-james-mailbox-cassandra</artifactId>
- <description>Apache James Mailbox implementation over Cassandra</description>
<name>Apache James :: Mailbox :: Cassandra</name>
+ <description>Apache James Mailbox implementation over Cassandra</description>
<dependencies>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.skyscreamer</groupId>
- <artifactId>jsonassert</artifactId>
- <version>1.2.3</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
+ <artifactId>apache-james-backends-cassandra</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
+ <artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
+ <artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -103,6 +72,34 @@
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
+ <groupId>com.github.fge</groupId>
+ <artifactId>throwing-lambdas</artifactId>
+ <version>0.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.jayway.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <version>1.6.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>net.javacrumbs.json-unit</groupId>
<artifactId>json-unit</artifactId>
<version>1.5.5</version>
@@ -120,12 +117,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.cassandraunit</groupId>
- <artifactId>cassandra-unit</artifactId>
- <version>${cassandra-unit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
@@ -136,19 +127,28 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.cassandraunit</groupId>
+ <artifactId>cassandra-unit</artifactId>
+ <version>${cassandra-unit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.fge</groupId>
- <artifactId>throwing-lambdas</artifactId>
- <version>0.5.0</version>
+ <groupId>org.skyscreamer</groupId>
+ <artifactId>jsonassert</artifactId>
+ <version>1.2.3</version>
</dependency>
<dependency>
- <groupId>com.jayway.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <version>1.6.5</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <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/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/pom.xml b/mailbox/elasticsearch/pom.xml
index e0a26f0..de00175 100644
--- a/mailbox/elasticsearch/pom.xml
+++ b/mailbox/elasticsearch/pom.xml
@@ -28,8 +28,8 @@
</parent>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
- <description>Apache James Mailbox IMAP search implementation using ElasticSearch</description>
<name>Apache James :: Mailbox :: ElasticSearch</name>
+ <description>Apache James Mailbox IMAP search implementation using ElasticSearch</description>
<dependencies>
<dependency>
@@ -54,6 +54,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-memory</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
@@ -80,6 +85,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
@@ -144,8 +154,8 @@
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>2.2.1</version>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
@@ -161,16 +171,6 @@
<artifactId>testcontainers</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailbox/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/hbase/pom.xml b/mailbox/hbase/pom.xml
index b5a83f0..44039fc 100644
--- a/mailbox/hbase/pom.xml
+++ b/mailbox/hbase/pom.xml
@@ -28,71 +28,73 @@
</parent>
<artifactId>apache-james-mailbox-hbase</artifactId>
- <description>Apache James Mailbox implementation over HBase</description>
<name>Apache James :: Mailbox :: HBase</name>
+ <description>Apache James Mailbox implementation over HBase</description>
<dependencies>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>11.0.2</version><!--$NO-MVN-MAN-VER$-->
- </dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-api</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</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>
- <scope>test</scope>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>11.0.2</version>
+ <!--$NO-MVN-MAN-VER$-->
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
<scope>test</scope>
- <type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<exclusions>
<exclusion>
- <groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
+ <groupId>org.jruby</groupId>
</exclusion>
<exclusion>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
</exclusion>
<exclusion>
- <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
</exclusion>
<exclusion>
- <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -103,34 +105,33 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
+ <groupId>org.jruby</groupId>
</exclusion>
<exclusion>
- <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</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.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailbox/jcr/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/jcr/pom.xml b/mailbox/jcr/pom.xml
index 19dfa96..d0d20a3 100644
--- a/mailbox/jcr/pom.xml
+++ b/mailbox/jcr/pom.xml
@@ -28,8 +28,8 @@
</parent>
<artifactId>apache-james-mailbox-jcr</artifactId>
- <name>Apache James :: Mailbox :: JCR</name>
<packaging>bundle</packaging>
+ <name>Apache James :: Mailbox :: JCR</name>
<dependencies>
<dependency>
@@ -38,20 +38,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>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-store</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -62,6 +65,11 @@
<artifactId>jcr</artifactId>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
<scope>test</scope>
@@ -71,41 +79,32 @@
<artifactId>jackrabbit-jcr-commons</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <!-- xercesImpl needed for some java versions -->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <type>test-jar</type>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailbox/jpa/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/jpa/pom.xml b/mailbox/jpa/pom.xml
index 6950dda..9f4d673 100644
--- a/mailbox/jpa/pom.xml
+++ b/mailbox/jpa/pom.xml
@@ -28,20 +28,12 @@
</parent>
<artifactId>apache-james-mailbox-jpa</artifactId>
- <name>Apache James :: Mailbox :: JPA</name>
<packaging>bundle</packaging>
+ <name>Apache James :: Mailbox :: JPA</name>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
</dependency>
<dependency>
@@ -51,23 +43,18 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jasypt</groupId>
- <artifactId>jasypt</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <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-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
+ <artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -81,18 +68,31 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
+ <groupId>org.jasypt</groupId>
+ <artifactId>jasypt</artifactId>
</dependency>
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
@@ -112,12 +112,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
<version>2.4.2</version>
- <configuration>
- <includes>org/apache/james/mailbox/jpa/*/model/**/*.class</includes>
- <excludes>org/apache/james/mailbox/jpa/mail/model/openjpa/EncryptDecryptHelper.class</excludes>
- <addDefaultConstructor>true</addDefaultConstructor>
- <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
- </configuration>
<executions>
<execution>
<id>enhancer</id>
@@ -127,6 +121,12 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <includes>org/apache/james/mailbox/jpa/*/model/**/*.class</includes>
+ <excludes>org/apache/james/mailbox/jpa/mail/model/openjpa/EncryptDecryptHelper.class</excludes>
+ <addDefaultConstructor>true</addDefaultConstructor>
+ <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+ </configuration>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailbox/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/kafka/pom.xml b/mailbox/kafka/pom.xml
index 6dca9c7..a1707de 100644
--- a/mailbox/kafka/pom.xml
+++ b/mailbox/kafka/pom.xml
@@ -1,5 +1,4 @@
<?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
@@ -18,19 +17,17 @@
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <name>Apache James :: Mailbox :: Kafka</name>
<artifactId>apache-james-mailbox-kafka</artifactId>
+ <name>Apache James :: Mailbox :: Kafka</name>
<dependencies>
<dependency>
@@ -40,8 +37,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -50,8 +47,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -85,4 +82,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailbox/lucene/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/lucene/pom.xml b/mailbox/lucene/pom.xml
index a1dbd83..29f70b4 100644
--- a/mailbox/lucene/pom.xml
+++ b/mailbox/lucene/pom.xml
@@ -28,8 +28,8 @@
</parent>
<artifactId>apache-james-mailbox-lucene</artifactId>
- <name>Apache James :: Mailbox :: Lucene Index</name>
<packaging>bundle</packaging>
+ <name>Apache James :: Mailbox :: Lucene Index</name>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailbox/maildir/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/maildir/pom.xml b/mailbox/maildir/pom.xml
index c41b125..8f5a8cf 100644
--- a/mailbox/maildir/pom.xml
+++ b/mailbox/maildir/pom.xml
@@ -28,8 +28,8 @@
</parent>
<artifactId>apache-james-mailbox-maildir</artifactId>
- <name>Apache James :: Mailbox :: Maildir</name>
<packaging>bundle</packaging>
+ <name>Apache James :: Mailbox :: Maildir</name>
<dependencies>
<dependency>
@@ -38,7 +38,19 @@
</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>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -53,33 +65,12 @@
<artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -96,5 +87,14 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailbox/memory/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/memory/pom.xml b/mailbox/memory/pom.xml
index b0d2e16..e73320c 100644
--- a/mailbox/memory/pom.xml
+++ b/mailbox/memory/pom.xml
@@ -28,8 +28,8 @@
</parent>
<artifactId>apache-james-mailbox-memory</artifactId>
- <name>Apache James :: Mailbox :: In Memory</name>
<packaging>bundle</packaging>
+ <name>Apache James :: Mailbox :: In Memory</name>
<dependencies>
<dependency>
@@ -38,22 +38,13 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>apache-james-mailbox-api</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
+ <artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -80,11 +71,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
@@ -94,5 +80,19 @@
<artifactId>jsoup</artifactId>
<version>1.9.2</version>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index 2c3814c..2470a49 100644
--- a/mailbox/pom.xml
+++ b/mailbox/pom.xml
@@ -29,18 +29,6 @@
<artifactId>apache-james-mailbox</artifactId>
<packaging>pom</packaging>
- <repositories>
- <!-- apache.snapshot is needed for james-project SNAPSHOT, see JAMES-1470 -->
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
<name>Apache James :: Mailbox</name>
<description>Apache James Mailbox</description>
<url>http://james.apache.org/mailbox</url>
@@ -54,16 +42,16 @@
<module>hbase</module>
<module>jcr</module>
<module>jpa</module>
+ <module>kafka</module>
<module>lucene</module>
<module>maildir</module>
<module>memory</module>
<module>scanning-search</module>
- <module>store</module>
<module>spring</module>
+ <module>store</module>
<module>tika</module>
<module>tool</module>
<module>zoo-seq-provider</module>
- <module>kafka</module>
</modules>
<issueManagement>
@@ -112,275 +100,231 @@
<dependencyManagement>
<dependencies>
<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>${guava.version}</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-backends-cassandra</artifactId>
+ <version>${project.version}</version>
</dependency>
- <!--
- START Modules
- -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
+ <artifactId>apache-james-backends-cassandra</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
+ <artifactId>apache-james-backends-es</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
+ <artifactId>apache-james-backends-es</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-lucene</artifactId>
+ <artifactId>apache-james-backends-jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-lucene</artifactId>
+ <artifactId>apache-james-backends-jpa</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
+ <artifactId>apache-james-mailbox-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jpa</artifactId>
+ <artifactId>apache-james-mailbox-api</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jcr</artifactId>
+ <artifactId>apache-james-mailbox-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
+ <artifactId>apache-james-mailbox-elasticsearch</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-maildir</artifactId>
+ <artifactId>apache-james-mailbox-elasticsearch</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-hbase</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-cassandra</artifactId>
+ <artifactId>apache-james-mailbox-jcr</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-elasticsearch</artifactId>
+ <artifactId>apache-james-mailbox-jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tika</artifactId>
+ <artifactId>apache-james-mailbox-lucene</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tika</artifactId>
+ <artifactId>apache-james-mailbox-lucene</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tool</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util</artifactId>
+ <artifactId>apache-james-mailbox-maildir</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util-java8</artifactId>
+ <artifactId>apache-james-mailbox-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util-java8</artifactId>
+ <artifactId>apache-james-mailbox-store</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
- <!--
- END Modules
- -->
-
- <!--
- START Mail
- -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mime4j-core</artifactId>
- <version>${apache-mime4j.version}</version>
+ <artifactId>apache-james-mailbox-store</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- <version>${apache-mime4j.version}</version>
+ <artifactId>apache-james-mailbox-tika</artifactId>
+ <version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mime4j-james-utils</artifactId>
- <version>${apache-mime4j.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <version>1.5.4</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>${activation.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>${javax.inject.version}</version>
+ <artifactId>apache-james-mailbox-tika</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>${geronimo-activation-spec.version}</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-tool</artifactId>
+ <version>${project.version}</version>
</dependency>
- <!--
- END Mail
- -->
-
- <!--
- Start James Mailet
- -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
</exclusion>
</exclusions>
</dependency>
-
- <!--
-
- -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
- <version>${project.version}</version>
+ <artifactId>apache-mime4j-core</artifactId>
+ <version>${apache-mime4j.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
+ <artifactId>apache-mime4j-dom</artifactId>
+ <version>${apache-mime4j.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-es</artifactId>
- <version>${project.version}</version>
+ <artifactId>apache-mime4j-james-utils</artifactId>
+ <version>${apache-mime4j.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-es</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <artifactId>james-server-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-elasticsearch</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <artifactId>james-server-util-java8</artifactId>
<version>${project.version}</version>
</dependency>
-
- <!--
- START Logging
- -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
- <!--
- START Logging
- -->
-
- <!--
- Start Commons
- -->
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson-databinding.version}</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-guava</artifactId>
+ <version>${jackson-databinding.version}</version>
</dependency>
<dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>${commons-pool.version}</version>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jdk8</artifactId>
+ <version>${jackson-databinding.version}</version>
</dependency>
<dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>${commons-dbcp.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>xercesImpl</artifactId>
- <groupId>xerces</groupId>
- </exclusion>
- </exclusions>
+ <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>${guava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>1.5.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ <version>${commons-beanutils-core.version}</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>
- <scope>test</scope>
<version>${commons-configuration.version}</version>
+ <scope>test</scope>
<exclusions>
<exclusion>
<artifactId>dom4j</artifactId>
@@ -409,169 +353,149 @@
</exclusions>
</dependency>
<dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- <version>${commons-beanutils-core.version}</version>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>${commons-dbcp.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xercesImpl</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson-databinding.version}</version>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-guava</artifactId>
- <version>${jackson-databinding.version}</version>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jdk8</artifactId>
- <version>${jackson-databinding.version}</version>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${commons-pool.version}</version>
</dependency>
-
- <!--
- END Commons
- -->
-
- <!--
- START Testing
- -->
- <!--
- Use to build protocol tester.
- Convert this to testing once MPT has been released.
- -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${activation.version}</version>
</dependency>
<dependency>
- <groupId>org.xenei</groupId>
- <artifactId>junit-contracts</artifactId>
- <version>0.1.5</version>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>${javax.inject.version}</version>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito-core.version}</version>
- <scope>test</scope>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>${jcr.version}</version>
</dependency>
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>${h2.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>nl.jqno.equalsverifier</groupId>
+ <artifactId>equalsverifier</artifactId>
+ <version>1.7.6</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>nl.jqno.equalsverifier</groupId>
- <artifactId>equalsverifier</artifactId>
- <version>1.7.6</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>${geronimo-activation-spec.version}</version>
</dependency>
-
<dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>3.8.0</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>${geronimo-annotation-spec.version}</version>
</dependency>
- <!--
- END Testing
- -->
-
-
- <!--
- START OpenJPA
- -->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-jpa</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-jpa</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <version>${hadoop.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jasypt</groupId>
- <artifactId>jasypt</artifactId>
- <version>${jasypt.version}</version>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>${hbase.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jackson-core-asl</artifactId>
+ <groupId>org.codehaus.jackson</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>org.codehaus.jackson</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
-
- <!--
- END OpenJPA
- -->
-
- <!--
- START JCR
- -->
<dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>${jcr.version}</version>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>${hbase.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
+ <artifactId>jackrabbit-core</artifactId>
<version>${jackrabbit.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
<version>${jackrabbit.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xercesImpl.version}</version>
- <scope>test</scope>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>3.8.0</version>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${xml-apis.version}</version>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-guava</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jasypt</groupId>
+ <artifactId>jasypt</artifactId>
+ <version>${jasypt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito-core.version}</version>
<scope>test</scope>
</dependency>
-
- <!--
- END JCR
- -->
-
- <!--
- START GERONIMO ANNOTATION
- -->
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>${geronimo-annotation-spec.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
-
- <!--
- END GERONIMO ANNOTATION
- -->
-
- <!--
- START SPRING
- -->
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -585,65 +509,51 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
+ <artifactId>spring-core</artifactId>
<version>${spring.version}</version>
</dependency>
- <!--
- END SPRING
- -->
-
- <!--
- START HBASE/HADOOP
- -->
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>${hbase.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>${spring.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>${hbase.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ <version>1.3.1</version>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>${hadoop.version}</version>
+ <groupId>org.xenei</groupId>
+ <artifactId>junit-contracts</artifactId>
+ <version>0.1.5</version>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <version>${hadoop.version}</version>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xercesImpl.version}</version>
<scope>test</scope>
</dependency>
- <!--
- END HBASE/HADOOP
- -->
<dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-guava</artifactId>
- <version>3.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
- <version>1.4.2</version>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml-apis.version}</version>
+ <scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
</dependencyManagement>
+ <repositories>
+ <!-- apache.snapshot is needed for james-project SNAPSHOT, see JAMES-1470 -->
+ <repository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ </repository>
+ </repositories>
+
<build>
<plugins>
<plugin>
@@ -678,12 +588,12 @@
<type>pom</type>
<exclusions>
<exclusion>
- <groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
+ <groupId>org.apache.tika</groupId>
</exclusion>
<exclusion>
- <groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
+ <groupId>org.apache.tika</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -691,4 +601,3 @@
</profile>
</profiles>
</project>
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/mailbox/scanning-search/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/scanning-search/pom.xml b/mailbox/scanning-search/pom.xml
index 51463a8..48c195e 100644
--- a/mailbox/scanning-search/pom.xml
+++ b/mailbox/scanning-search/pom.xml
@@ -28,9 +28,8 @@
</parent>
<artifactId>apache-james-mailbox-scanning-search</artifactId>
- <description>Apache James Mailbox IMAP search implementation using scanning</description>
<name>Apache James :: Mailbox :: Scanning</name>
-
+ <description>Apache James Mailbox IMAP search implementation using scanning</description>
<dependencies>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[16/29] james-project git commit: JAMES-2124 Remove scope from
dependencyManagement
Posted by bt...@apache.org.
JAMES-2124 Remove scope from dependencyManagement
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/43e69baf
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/43e69baf
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/43e69baf
Branch: refs/heads/master
Commit: 43e69baff1859b0061f6a3ed8f54c994a061f6d3
Parents: 5a75604
Author: benwa <bt...@linagora.com>
Authored: Mon Aug 21 17:48:44 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 25 18:17:27 2017 +0700
----------------------------------------------------------------------
pom.xml | 27 ---------------------------
1 file changed, 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/43e69baf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index abea84d..5184552 100644
--- a/pom.xml
+++ b/pom.xml
@@ -755,7 +755,6 @@
<artifactId>apache-james-mailbox-hbase</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -902,7 +901,6 @@
<artifactId>apache-mailet-base</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
- <scope>test</scope>
<exclusions>
<exclusion>
<artifactId>mail</artifactId>
@@ -926,7 +924,6 @@
<artifactId>apache-mailet-standard</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
- <scope>test</scope>
<exclusions>
<exclusion>
<artifactId>mail</artifactId>
@@ -959,7 +956,6 @@
<artifactId>james-server-cassandra-guice</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -981,7 +977,6 @@
<artifactId>james-server-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -1029,7 +1024,6 @@
<artifactId>james-server-data-jmap</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -1093,7 +1087,6 @@
<artifactId>james-server-dnsservice-library</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -1110,7 +1103,6 @@
<artifactId>james-server-filesystem-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -1185,7 +1177,6 @@
<artifactId>james-server-mailetcontainer-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -1228,7 +1219,6 @@
<artifactId>james-server-protocols-library</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -1261,7 +1251,6 @@
<artifactId>james-server-protocols-smtp</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -1278,7 +1267,6 @@
<artifactId>james-server-queue-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -1295,7 +1283,6 @@
<artifactId>james-server-queue-jms</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
@@ -1695,7 +1682,6 @@
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
<version>1.1.0</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>joda-time</groupId>
@@ -1753,7 +1739,6 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant-antunit</artifactId>
<version>1.1</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -1764,7 +1749,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
<version>${camel.version}</version>
- <scope>runtime</scope>
<exclusions>
<exclusion>
<artifactId>spring-web</artifactId>
@@ -1879,7 +1863,6 @@
<artifactId>james-karaf-distribution</artifactId>
<version>${project.version}</version>
<type>tar.gz</type>
- <scope>test</scope>
<exclusions>
<exclusion>
<artifactId>org.apache.karaf.client</artifactId>
@@ -1984,7 +1967,6 @@
<groupId>org.apache.karaf.tooling.exam</groupId>
<artifactId>org.apache.karaf.tooling.exam.container</artifactId>
<version>${karaf.tooling.exam.container.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -2015,7 +1997,6 @@
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean-spring.version}</version>
- <scope>runtime</scope>
<exclusions>
<exclusion>
<artifactId>spring-web</artifactId>
@@ -2112,13 +2093,11 @@
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
<version>${exam.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
<version>${exam.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
@@ -2134,7 +2113,6 @@
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<version>${url.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -2165,7 +2143,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -2191,13 +2168,11 @@
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<version>${spring.version}</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>${spring.version}</version>
- <scope>runtime</scope>
<exclusions>
<exclusion>
<artifactId>toplink</artifactId>
@@ -2268,13 +2243,11 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xercesImpl.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>${xml-apis.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[05/29] james-project git commit: JAMES-2124 automatically sort all
dependencies
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index f6160bc..2b52a7a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -37,25 +37,9 @@
<url>http://james.apache.org/server/</url>
<inceptionYear>2002</inceptionYear>
- <repositories>
- <!-- apache.snapshot is needed for james-project SNAPSHOT, see JAMES-1470 -->
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
<modules>
<module>app</module>
- <module>karaf/distribution</module>
- <module>karaf/features</module>
- <module>karaf/integration</module>
-
<module>container/cli</module>
<module>container/cli-integration</module>
<module>container/core</module>
@@ -69,50 +53,54 @@
<module>container/util</module>
<module>container/util-java8</module>
- <module>mailet/mailetcontainer-api</module>
- <module>mailet/mailetcontainer-camel</module>
- <module>mailet/mailets</module>
- <module>mailet/integration-testing</module>
-
- <module>dns-service/dnsservice-api</module>
- <module>dns-service/dnsservice-dnsjava</module>
- <module>dns-service/dnsservice-library</module>
-
<module>data/data-api</module>
- <module>data/data-library</module>
<module>data/data-cassandra</module>
- <module>data/data-jpa</module>
+ <module>data/data-file</module>
+ <module>data/data-hbase</module>
<module>data/data-jcr</module>
<module>data/data-jdbc</module>
<module>data/data-jmap</module>
<module>data/data-jmap-cassandra</module>
- <module>data/data-file</module>
+ <module>data/data-jpa</module>
<module>data/data-ldap</module>
<module>data/data-ldap-integration-testing</module>
- <module>data/data-hbase</module>
+ <module>data/data-library</module>
<module>data/data-memory</module>
+ <module>dns-service/dnsservice-api</module>
+ <module>dns-service/dnsservice-dnsjava</module>
+ <module>dns-service/dnsservice-library</module>
+
+ <module>karaf/distribution</module>
+ <module>karaf/features</module>
+ <module>karaf/integration</module>
+ <module>mailet/integration-testing</module>
+
+ <module>mailet/mailetcontainer-api</module>
+ <module>mailet/mailetcontainer-camel</module>
+ <module>mailet/mailets</module>
+
<module>protocols/fetchmail</module>
- <module>protocols/protocols-imap4</module>
<module>protocols/jmap</module>
<module>protocols/jmap-integration-testing</module>
<module>protocols/jwt</module>
+ <module>protocols/protocols-imap4</module>
<module>protocols/protocols-library</module>
<module>protocols/protocols-lmtp</module>
<module>protocols/protocols-managesieve</module>
<module>protocols/protocols-pop3</module>
<module>protocols/protocols-smtp</module>
+ <module>protocols/webadmin-integration-test</module>
<module>protocols/webadmin/webadmin-cassandra</module>
<module>protocols/webadmin/webadmin-core</module>
<module>protocols/webadmin/webadmin-data</module>
<module>protocols/webadmin/webadmin-mailbox</module>
<module>protocols/webadmin/webadmin-swagger</module>
- <module>protocols/webadmin-integration-test</module>
+ <module>queue/queue-activemq</module>
<module>queue/queue-api</module>
<module>queue/queue-file</module>
<module>queue/queue-jms</module>
- <module>queue/queue-activemq</module>
<module>testing</module>
</modules>
@@ -191,199 +179,195 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-api</artifactId>
- <version>${pax-logging-api.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-cli</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-spring</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-cassandra-guice</artifactId>
+ <artifactId>apache-james-backends-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-cassandra-guice</artifactId>
+ <artifactId>apache-james-backends-cassandra</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-cassandra-ldap-guice</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-onami</artifactId>
+ <artifactId>apache-james-backends-es</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-common</artifactId>
+ <artifactId>apache-james-backends-es</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-jmap</artifactId>
+ <artifactId>apache-james-backends-jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-jmap</artifactId>
+ <artifactId>apache-james-backends-jpa</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-mailbox</artifactId>
+ <artifactId>apache-james-mailbox-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-jetty</artifactId>
+ <artifactId>apache-james-mailbox-api</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-api</artifactId>
+ <artifactId>apache-james-mailbox-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-api</artifactId>
+ <artifactId>apache-james-mailbox-cassandra</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-file</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-jms</artifactId>
+ <artifactId>apache-james-mailbox-elasticsearch</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-jms</artifactId>
+ <artifactId>apache-james-mailbox-elasticsearch</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-activemq</artifactId>
+ <artifactId>apache-james-mailbox-hbase</artifactId>
<version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
+ <artifactId>apache-james-mailbox-jcr</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <artifactId>apache-james-mailbox-jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
+ <artifactId>apache-james-mailbox-jpa</artifactId>
<version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
- <scope>test</scope>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-library</artifactId>
+ <artifactId>apache-james-mailbox-kafka</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-library</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <artifactId>apache-james-mailbox-lucene</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-dnsjava</artifactId>
+ <artifactId>apache-james-mailbox-maildir</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-library</artifactId>
+ <artifactId>apache-james-mailbox-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-library</artifactId>
+ <artifactId>apache-james-mailbox-memory</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-testing</artifactId>
+ <artifactId>apache-james-mailbox-spring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
+ <artifactId>apache-james-mailbox-store</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-collections</artifactId>
+ <groupId>commons-collections</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
+ <artifactId>apache-james-mailbox-store</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-collections</artifactId>
+ <groupId>commons-collections</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-es</artifactId>
+ <artifactId>apache-james-mailbox-tika</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>pdfbox</artifactId>
+ <groupId>org.apache.pdfbox</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>poi-ooxml</artifactId>
+ <groupId>org.apache.poi</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>poi-scratchpad</artifactId>
+ <groupId>org.apache.poi</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>netcdf</artifactId>
+ <groupId>edu.ucar</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-es</artifactId>
- <type>test-jar</type>
+ <artifactId>apache-james-mailbox-tika</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-jpa</artifactId>
+ <artifactId>apache-james-mailbox-tool</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-jpa</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
+ <artifactId>apache-jsieve-core</artifactId>
+ <version>${jsieve.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -391,8 +375,8 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -402,12 +386,12 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
</exclusion>
<exclusion>
- <groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
+ <groupId>javax.activation</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -419,16 +403,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${geronimo-jms-spec.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-jms-client</artifactId>
- <version>${activmq-artemis.version}</version>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<version>${project.version}</version>
@@ -436,8 +410,8 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -447,8 +421,8 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -460,128 +434,107 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>metrics-api</artifactId>
- <version>${project.version}</version>
+ <artifactId>apache-mime4j-dom</artifactId>
+ <version>${apache-mime4j.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>metrics-dropwizard</artifactId>
- <version>${project.version}</version>
+ <artifactId>apache-mime4j-james-utils</artifactId>
+ <version>${apache-mime4j.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>metrics-logger</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-api</artifactId>
+ <artifactId>james-server-cassandra-guice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-api</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-cassandra-guice</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-netty</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-cassandra-ldap-guice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-pop3</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-cli</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-smtp</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-core</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-managesieve</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-managesieve</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailetcontainer-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailetcontainer-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailetcontainer-camel</artifactId>
+ <artifactId>james-server-data-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailbox-adapter</artifactId>
+ <artifactId>james-server-data-file</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util</artifactId>
+ <artifactId>james-server-data-hbase</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <artifactId>james-server-data-jcr</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>james-server-data-jdbc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
+ <artifactId>james-server-data-jmap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
+ <artifactId>james-server-data-jmap</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-cassandra</artifactId>
+ <artifactId>james-server-data-jmap-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -591,286 +544,281 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-hbase</artifactId>
+ <artifactId>james-server-data-ldap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-file</artifactId>
+ <artifactId>james-server-data-ldap-integration-testing</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-jdbc</artifactId>
+ <artifactId>james-server-data-library</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-jmap</artifactId>
+ <artifactId>james-server-data-library</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-jmap</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
+ <artifactId>james-server-data-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-jmap-cassandra</artifactId>
+ <artifactId>james-server-dnsservice-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-jcr</artifactId>
+ <artifactId>james-server-dnsservice-api</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-memory</artifactId>
+ <artifactId>james-server-dnsservice-dnsjava</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-core</artifactId>
+ <artifactId>james-server-dnsservice-library</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-core</artifactId>
+ <artifactId>james-server-dnsservice-library</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
+ <artifactId>james-server-fetchmail</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
+ <artifactId>james-server-filesystem-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-filesystem-api</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-memory-guice</artifactId>
+ <artifactId>james-server-guice-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-memory-guice</artifactId>
+ <artifactId>james-server-guice-common</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-jmap</artifactId>
+ <artifactId>james-server-guice-jmap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-jmap-integration-testing</artifactId>
+ <artifactId>james-server-guice-jmap</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-jmap-integration-testing</artifactId>
- <type>test-jar</type>
+ <artifactId>james-server-guice-mailbox</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-webadmin-cassandra</artifactId>
+ <artifactId>james-server-jetty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-webadmin-core</artifactId>
+ <artifactId>james-server-jmap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-webadmin-data</artifactId>
+ <artifactId>james-server-jmap-integration-testing</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-webadmin-mailbox</artifactId>
+ <artifactId>james-server-jmap-integration-testing</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-webadmin-swagger</artifactId>
+ <artifactId>james-server-jwt</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-smtp</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-lifecycle-api</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
</dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
+ <artifactId>james-server-mailbox-adapter</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
+ <artifactId>james-server-mailetcontainer-api</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-cassandra</artifactId>
+ <artifactId>james-server-mailetcontainer-api</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-cassandra</artifactId>
+ <artifactId>james-server-mailetcontainer-camel</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-kafka</artifactId>
+ <artifactId>james-server-mailets</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
+ <artifactId>james-server-memory-guice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
+ <artifactId>james-server-memory-guice</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-elasticsearch</artifactId>
+ <artifactId>james-server-onami</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-elasticsearch</artifactId>
+ <artifactId>james-server-protocols-imap4</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tika</artifactId>
+ <artifactId>james-server-protocols-library</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.pdfbox</groupId>
- <artifactId>pdfbox</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-scratchpad</artifactId>
- </exclusion>
- <exclusion>
- <groupId>edu.ucar</groupId>
- <artifactId>netcdf</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tika</artifactId>
+ <artifactId>james-server-protocols-library</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-spring</artifactId>
+ <artifactId>james-server-protocols-lmtp</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-lucene</artifactId>
+ <artifactId>james-server-protocols-managesieve</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-imap</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-protocols-pop3</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-hbase</artifactId>
- <classifier>tests</classifier>
+ <artifactId>james-server-protocols-smtp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-protocols-smtp</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-ldap</artifactId>
+ <artifactId>james-server-queue-activemq</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-ldap-integration-testing</artifactId>
+ <artifactId>james-server-queue-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-jwt</artifactId>
+ <artifactId>james-server-queue-api</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-lmtp</artifactId>
+ <artifactId>james-server-queue-file</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-managesieve</artifactId>
+ <artifactId>james-server-queue-jms</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-smtp</artifactId>
+ <artifactId>james-server-queue-jms</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-imap4</artifactId>
+ <artifactId>james-server-spring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-pop3</artifactId>
+ <artifactId>james-server-testing</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-fetchmail</artifactId>
+ <artifactId>james-server-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailets</artifactId>
+ <artifactId>james-server-util</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -883,148 +831,106 @@
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-maildir</artifactId>
+ <artifactId>james-server-webadmin-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jpa</artifactId>
+ <artifactId>james-server-webadmin-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jpa</artifactId>
+ <artifactId>james-server-webadmin-data</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tool</artifactId>
+ <artifactId>james-server-webadmin-mailbox</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jcr</artifactId>
+ <artifactId>james-server-webadmin-swagger</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
+ <artifactId>metrics-api</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
+ <artifactId>metrics-dropwizard</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-smtp</artifactId>
+ <artifactId>metrics-logger</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
</dependency>
-
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>${h2.version}</version>
- <scope>test</scope>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson-data.version}</version>
</dependency>
-
<dependency>
- <groupId>org.apache.james.jspf</groupId>
- <artifactId>apache-jspf-resolver</artifactId>
- <version>${apache-jspf-resolver.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>dnsjava</artifactId>
- <groupId>dnsjava</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-cli</artifactId>
- <groupId>commons-cli</groupId>
- </exclusion>
- <!-- only used for the asynchronous executors -->
- <exclusion>
- <artifactId>dnsjnio</artifactId>
- <groupId>uk.nominet</groupId>
- </exclusion>
- </exclusions>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-guava</artifactId>
+ <version>${jackson-data.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-jsieve-core</artifactId>
- <version>${jsieve.version}</version>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jdk8</artifactId>
+ <version>${jackson-data.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- <version>${apache-mime4j.version}</version>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ <version>2.6.1</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mime4j-james-utils</artifactId>
- <version>${apache-mime4j.version}</version>
+ <groupId>com.github.fge</groupId>
+ <artifactId>throwing-lambdas</artifactId>
+ <version>0.5.0</version>
</dependency>
+
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.7</version>
</dependency>
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <version>1.5.4</version>
- <exclusions>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>com.github.steveash.guavate</groupId>
+ <artifactId>guavate</artifactId>
+ <version>${guavate.version}</version>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>${javax.inject.version}</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
</dependency>
+
+ <!-- Guice dependencies -->
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>${javax-activation.version}</version>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>4.0</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>${geronimo-activation-spec.version}</version>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-multibindings</artifactId>
+ <version>4.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>com.jason-goodwin</groupId>
@@ -1032,55 +938,51 @@
<version>0.4.0</version>
</dependency>
<dependency>
- <groupId>commons-daemon</groupId>
- <artifactId>commons-daemon</artifactId>
- <version>${commons-daemon.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>4.0</version>
+ <groupId>com.jayway.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <version>1.6.5</version>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>2.0.0.0</version>
+ <groupId>com.jayway.jsonpath</groupId>
+ <artifactId>json-path</artifactId>
+ <version>2.1.0</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>com.jayway.restassured</groupId>
+ <artifactId>rest-assured</artifactId>
+ <version>2.6.0</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>com.nurkiewicz.asyncretry</groupId>
+ <artifactId>asyncretry</artifactId>
+ <version>0.0.7</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>com.rabbitmq</groupId>
+ <artifactId>amqp-client</artifactId>
+ <version>4.0.0</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
+ <groupId>com.sparkjava</groupId>
+ <artifactId>spark-core</artifactId>
+ <version>2.6.0</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>1.5.4</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>activation</artifactId>
+ <groupId>javax.activation</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ <version>${commons-beanutils-core.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -1088,40 +990,14 @@
<version>${commons-cli.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- </dependency>
-
- <!-- used by spring deployment -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet-api.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec.version}</version>
</dependency>
<dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>${commons-pool.version}</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
@@ -1137,12 +1013,16 @@
<groupId>commons-beanutils</groupId>
</exclusion>
<exclusion>
- <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
-
+ <dependency>
+ <groupId>commons-daemon</groupId>
+ <artifactId>commons-daemon</artifactId>
+ <version>${commons-daemon.version}</version>
+ </dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
@@ -1155,198 +1035,231 @@
</exclusions>
</dependency>
<dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>${commons-net.version}</version>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson-data.version}</version>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-guava</artifactId>
- <version>${jackson-data.version}</version>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jdk8</artifactId>
- <version>${jackson-data.version}</version>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>${commons-net.version}</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
- <version>2.6.1</version>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${commons-pool.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xercesImpl</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xerces</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
- <version>4.0.0</version>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>${concurrent.version}</version>
</dependency>
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
<version>${dnsjava.version}</version>
</dependency>
-
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-guice</artifactId>
+ <version>${cucumber.version}</version>
</dependency>
<dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>3.8.0</version>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-java</artifactId>
+ <version>${cucumber.version}</version>
</dependency>
<dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-guava</artifactId>
- <version>${assertj-guava.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>${jmock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.xenei</groupId>
- <artifactId>junit-contracts</artifactId>
- <version>0.1.5</version>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-junit</artifactId>
+ <version>${cucumber.version}</version>
</dependency>
<dependency>
- <groupId>pl.pragmatists</groupId>
- <artifactId>JUnitParams</artifactId>
- <version>1.0.4</version>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-picocontainer</artifactId>
+ <version>${cucumber.version}</version>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito-core.version}</version>
- <scope>test</scope>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ <version>${metrics.version}</version>
</dependency>
<dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>${concurrent.version}</version>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-jvm</artifactId>
+ <version>${metrics.version}</version>
</dependency>
<dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- <version>${commons-beanutils-core.version}</version>
- <scope>runtime</scope>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt</artifactId>
+ <version>0.6.0</version>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>${netty.version}</version>
</dependency>
-
- <!-- Used by Mime4J -->
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${javax-activation.version}</version>
</dependency>
-
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>${javax.inject.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>${jcr.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
</dependency>
-
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet-api.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>${joda.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- <version>${spring.version}</version>
- <scope>runtime</scope>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <version>${activemq.version}</version>
<exclusions>
<exclusion>
- <groupId>com.oracle.toplink</groupId>
- <artifactId>toplink</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.oracle</groupId>
- <artifactId>toplink-essentials</artifactId>
+ <artifactId>spring-osgi-core</artifactId>
+ <groupId>org.springframework.osgi</groupId>
</exclusion>
+ <!-- exlude this, its only used in the authentication plugin which we don't use -->
<exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
+ <artifactId>icu4j</artifactId>
+ <groupId>com.ibm.icu</groupId>
</exclusion>
+ <!-- exclude this, we don't use osgi yet -->
<exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
+ <artifactId>org.osgi.core</artifactId>
+ <groupId>org.osgi</groupId>
</exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-jms-client</artifactId>
+ <version>${activmq-artemis.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ <version>${camel.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
<exclusion>
- <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
+ <groupId>org.springframework</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jms</artifactId>
- <version>${spring.version}</version>
- <scope>runtime</scope>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.0</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
-
<dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>${jcr.version}</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>${felix.version}</version>
</dependency>
-
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-rmi</artifactId>
- <version>${jackrabbit.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>${geronimo-activation-spec.version}</version>
</dependency>
-
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
- <version>${jackrabbit.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <version>${geronimo-annotation-spec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo-jms-spec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <version>${hadoop.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>${hbase.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
@@ -1354,339 +1267,420 @@
<version>${jackrabbit.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
+ <groupId>org.apache.pdfbox</groupId>
</exclusion>
<exclusion>
- <groupId>edu.ucar</groupId>
<artifactId>netcdf</artifactId>
+ <groupId>edu.ucar</groupId>
</exclusion>
</exclusions>
</dependency>
-
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <version>${camel.version}</version>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ <version>${jackrabbit.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <version>${camel.version}</version>
- <scope>runtime</scope>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-rmi</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-karaf-distribution</artifactId>
+ <version>${project.version}</version>
+ <type>tar.gz</type>
+ <scope>test</scope>
<exclusions>
<exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
+ <artifactId>org.apache.karaf.client</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <groupId>org.eclipse.osgi</groupId>
</exclusion>
</exclusions>
</dependency>
-
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- <version>${activemq.version}</version>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-karaf-features</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james.jspf</groupId>
+ <artifactId>apache-jspf-resolver</artifactId>
+ <version>${apache-jspf-resolver.version}</version>
<exclusions>
<exclusion>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-core</artifactId>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
</exclusion>
- <!-- exlude this, its only used in the authentication plugin which we don't use -->
<exclusion>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
+ <artifactId>dnsjava</artifactId>
+ <groupId>dnsjava</groupId>
</exclusion>
- <!-- exclude this, we don't use osgi yet -->
<exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>commons-cli</artifactId>
+ <groupId>commons-cli</groupId>
</exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <version>${xbean-spring.version}</version>
- <scope>runtime</scope>
- <exclusions>
+ <!-- only used for the asynchronous executors -->
<exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
+ <artifactId>dnsjnio</artifactId>
+ <groupId>uk.nominet</groupId>
</exclusion>
</exclusions>
</dependency>
-
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- <version>${netty.version}</version>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>${metrics.version}</version>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-api</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-jvm</artifactId>
- <version>${metrics.version}</version>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-imap</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
- <!-- This needed to let the bundle plugin to generate the right import statement -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <version>${geronimo-annotation-spec.version}</version>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-lmtp</artifactId>
+ <version>${project.version}</version>
</dependency>
-
<dependency>
- <groupId>com.github.steveash.guavate</groupId>
- <artifactId>guavate</artifactId>
- <version>${guavate.version}</version>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-managesieve</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-managesieve</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
-
- <!-- OSGI dependencies -->
<dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-extender</artifactId>
- <version>${spring-osgi-extender.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.beans</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-netty</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${org.osgi.core.version}</version>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-pop3</artifactId>
+ <version>${project.version}</version>
</dependency>
-
<dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam</artifactId>
- <version>${exam.version}</version>
+ <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>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.karaf.tooling.exam</groupId>
<artifactId>org.apache.karaf.tooling.exam.container</artifactId>
<version>${karaf.tooling.exam.container.version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit4</artifactId>
- <version>${exam.version}</version>
- <scope>test</scope>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <version>${xbean-spring.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>spring-web</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
-
<dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-link-mvn</artifactId>
- <version>${exam.version}</version>
- <scope>test</scope>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>3.8.0</version>
</dependency>
-
<dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-aether</artifactId>
- <version>${url.version}</version>
- <scope>test</scope>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-guava</artifactId>
+ <version>${assertj-guava.version}</version>
</dependency>
-
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${felix.version}</version>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ <version>1.52</version>
</dependency>
-
<dependency>
- <groupId>org.ops4j.pax.swissbox</groupId>
- <artifactId>pax-swissbox-tinybundles</artifactId>
- <version>${pax-swissbox-tinybundles.version}</version>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>1.52</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>${jetty.version}</version>
</dependency>
-
- <!-- Guice dependencies -->
<dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>4.0</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-multibindings</artifactId>
-
<TRUNCATED>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[21/29] james-project git commit: JAMES-2124 Solve various Eclipse
warnings
Posted by bt...@apache.org.
JAMES-2124 Solve various Eclipse warnings
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f8f540a6
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f8f540a6
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f8f540a6
Branch: refs/heads/master
Commit: f8f540a68a18505748d9c6e7d6d1994fdbe94f07
Parents: 8aed4b0
Author: benwa <bt...@linagora.com>
Authored: Thu Aug 24 08:00:53 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 25 18:18:14 2017 +0700
----------------------------------------------------------------------
.../cassandra/mail/CassandraMessageDAO.java | 11 ----
.../cassandra/mail/CassandraBlobsDAOTest.java | 2 +-
.../json/MessageToElasticSearchJsonTest.java | 16 +++---
.../store/extractor/DefaultTextExtractor.java | 4 +-
.../PartContentBuilderComplexMultipartTest.java | 11 ++--
...tContentBuilderMultipartAlternativeTest.java | 9 ++--
.../store/mail/model/ListMessageAssert.java | 3 +-
.../mailbox/store/mail/model/MessageAssert.java | 13 ++---
.../mailbox/tika/TikaTextExtractorTest.java | 2 +-
.../james/transport/mailets/LogMessage.java | 3 +-
.../transport/mailets/StripAttachmentTest.java | 5 +-
.../api/AbstractProtocolTransportTest.java | 2 +-
.../imap/decode/main/IdRangeParseTest.java | 3 +-
.../FetchCommandParserPartialFetchTest.java | 8 +--
.../SearchCommandParserAndParenthesesTest.java | 3 --
.../parser/SearchCommandParserCharsetTest.java | 3 --
.../parser/SearchCommandParserNotTest.java | 3 --
.../parser/SearchCommandParserOrTest.java | 3 --
.../SearchCommandParserQuotedCharsetTest.java | 3 --
...chCommandParserSearchKeySequenceSetTest.java | 5 +-
.../SearchCommandParserSearchKeyTest.java | 6 +--
.../SearchCommandParserTopLevelAndTest.java | 3 --
.../decode/parser/StoreCommandParserTest.java | 3 --
.../FetchResponseEncoderEnvelopeTest.java | 40 +++++++-------
.../FetchResponseEncoderNoExtensionsTest.java | 3 --
.../imap/encode/FetchResponseEncoderTest.java | 11 ++--
.../imap/encode/LSubResponseEncoderTest.java | 3 --
.../imap/encode/ListResponseEncoderTest.java | 10 ++--
.../imap/encode/ListingEncodingUtilsTest.java | 3 +-
.../MailboxStatusResponseEncoderTest.java | 10 ++--
.../encode/NamespaceResponseEncoderTest.java | 3 --
.../imap/encode/SearchResponseEncoderTest.java | 10 ++--
...ImapRequestHandlerAdandonConnectionTest.java | 5 +-
.../imap/processor/DeleteACLProcessorTest.java | 3 --
.../imap/processor/GetACLProcessorTest.java | 3 --
.../james/imap/processor/LSubProcessorTest.java | 3 --
.../james/imap/processor/ListProcessorTest.java | 3 --
.../imap/processor/ListRightsProcessorTest.java | 3 --
.../imap/processor/NamespaceProcessorTest.java | 3 --
.../imap/processor/SearchProcessorTest.java | 3 --
.../imap/processor/SetACLProcessorTest.java | 3 --
.../fetch/PartialFetchBodyElementTest.java | 6 +--
protocols/pom.xml | 56 ++++++++++++++++++++
.../pop3/POP3StartTlsResponseTest.java | 4 +-
.../smtp/SMTPStartTlsResponseTest.java | 4 +-
.../smtp/core/fastfail/DNSRBLHandlerTest.java | 6 +--
.../smtp/core/fastfail/MaxRcptHandlerTest.java | 7 +--
.../core/fastfail/MaxUnknownCmdHandlerTest.java | 2 +-
.../fastfail/ResolvableEhloHeloHandlerTest.java | 8 ++-
.../smtp/core/fastfail/SpamTrapHandlerTest.java | 4 +-
.../fastfail/ValidSenderDomainHandlerTest.java | 2 +-
.../integration/cucumber/UploadStepdefs.java | 4 +-
52 files changed, 153 insertions(+), 196 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java
index 5129f3b..5b62ef0 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAO.java
@@ -70,7 +70,6 @@ import org.apache.james.mailbox.model.ComposedMessageIdWithMetaData;
import org.apache.james.mailbox.model.MessageAttachment;
import org.apache.james.mailbox.store.mail.MessageMapper.FetchType;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
-import org.apache.james.mailbox.store.mail.model.Property;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.mail.model.impl.SimpleProperty;
import org.apache.james.util.CompletableFutureUtil;
@@ -194,16 +193,6 @@ public class CassandraMessageDAO {
.collect(Guavate.toImmutableList());
}
- private List<UDTValue> buildPropertiesUdt(List<Property> properties) {
- return properties.stream()
- .map(property -> typesProvider.getDefinedUserType(PROPERTIES)
- .newValue()
- .setString(Properties.NAMESPACE, property.getNamespace())
- .setString(Properties.NAME, property.getLocalName())
- .setString(Properties.VALUE, property.getValue()))
- .collect(Guavate.toImmutableList());
- }
-
private UDTValue toUDT(MessageAttachment messageAttachment) {
return typesProvider.getDefinedUserType(ATTACHMENTS)
.newValue()
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAOTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAOTest.java
index f398b9b..d2f9ceb 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraBlobsDAOTest.java
@@ -24,7 +24,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
import java.util.Optional;
-import org.apache.commons.io.Charsets;
import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraConfiguration;
import org.apache.james.mailbox.cassandra.ids.BlobId;
@@ -33,6 +32,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import com.google.common.base.Charsets;
import com.google.common.base.Strings;
public class CassandraBlobsDAOTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java
index 96ae5d8..c104324 100644
--- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java
+++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java
@@ -148,7 +148,7 @@ public class MessageToElasticSearchJsonTest {
htmlMail.setUid(UID);
assertThatJson(messageToElasticSearchJson.convertToJson(htmlMail, ImmutableList.of(new MockMailboxSession("username").getUser())))
.when(IGNORING_ARRAY_ORDER)
- .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/htmlMail.json")));
+ .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/htmlMail.json"), CHARSET));
}
@Test
@@ -168,7 +168,7 @@ public class MessageToElasticSearchJsonTest {
pgpSignedMail.setUid(UID);
assertThatJson(messageToElasticSearchJson.convertToJson(pgpSignedMail, ImmutableList.of(new MockMailboxSession("username").getUser())))
.when(IGNORING_ARRAY_ORDER)
- .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/pgpSignedMail.json")));
+ .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/pgpSignedMail.json"), CHARSET));
}
@Test
@@ -189,7 +189,7 @@ public class MessageToElasticSearchJsonTest {
assertThatJson(messageToElasticSearchJson.convertToJson(mail,
ImmutableList.of(new MockMailboxSession("user1").getUser(), new MockMailboxSession("user2").getUser())))
.when(IGNORING_ARRAY_ORDER).when(IGNORING_VALUES)
- .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/mail.json")));
+ .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/mail.json"), CHARSET));
}
@Test
@@ -209,7 +209,7 @@ public class MessageToElasticSearchJsonTest {
recursiveMail.setUid(UID);
assertThatJson(messageToElasticSearchJson.convertToJson(recursiveMail, ImmutableList.of(new MockMailboxSession("username").getUser())))
.when(IGNORING_ARRAY_ORDER).when(IGNORING_VALUES)
- .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/recursiveMail.json")));
+ .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/recursiveMail.json"), CHARSET));
}
@Test
@@ -230,7 +230,7 @@ public class MessageToElasticSearchJsonTest {
assertThatJson(messageToElasticSearchJson.convertToJson(mailWithNoInternalDate, ImmutableList.of(new MockMailboxSession("username").getUser())))
.when(IGNORING_ARRAY_ORDER)
.when(IGNORING_VALUES)
- .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/recursiveMail.json")));
+ .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/recursiveMail.json"), CHARSET));
}
@Test
@@ -258,7 +258,7 @@ public class MessageToElasticSearchJsonTest {
assertThatJson(convertToJson)
.when(IGNORING_ARRAY_ORDER)
.when(IGNORING_VALUES)
- .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/recursiveMail.json")));
+ .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/recursiveMail.json"), CHARSET));
}
@Test
@@ -286,7 +286,7 @@ public class MessageToElasticSearchJsonTest {
assertThatJson(convertToJson)
.when(IGNORING_ARRAY_ORDER)
.when(IGNORING_VALUES)
- .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/recursiveMailWithoutAttachments.json")));
+ .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/recursiveMailWithoutAttachments.json"), CHARSET));
}
@Test(expected = NullPointerException.class)
@@ -385,6 +385,6 @@ public class MessageToElasticSearchJsonTest {
assertThatJson(convertToJsonWithoutAttachment)
.when(IGNORING_ARRAY_ORDER)
.when(IGNORING_VALUES)
- .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/emailWithNonIndexableAttachmentWithoutAttachment.json")));
+ .isEqualTo(IOUtils.toString(ClassLoader.getSystemResource("eml/emailWithNonIndexableAttachmentWithoutAttachment.json"), CHARSET));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java
index c61fb89..93b9551 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java
@@ -26,6 +26,8 @@ import org.apache.commons.io.IOUtils;
import org.apache.james.mailbox.extractor.ParsedContent;
import org.apache.james.mailbox.extractor.TextExtractor;
+import com.google.common.base.Charsets;
+
/**
* A default text extractor that is directly based on the input file provided.
*
@@ -36,7 +38,7 @@ public class DefaultTextExtractor implements TextExtractor {
@Override
public ParsedContent extractContent(InputStream inputStream, String contentType) throws Exception {
if(contentType != null && contentType.startsWith("text/") ) {
- return new ParsedContent(IOUtils.toString(inputStream), new HashMap<>());
+ return new ParsedContent(IOUtils.toString(inputStream, Charsets.UTF_8), new HashMap<>());
} else {
return new ParsedContent(null, new HashMap<>());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderComplexMultipartTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderComplexMultipartTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderComplexMultipartTest.java
index 0fd2dab..ed23ca3 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderComplexMultipartTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderComplexMultipartTest.java
@@ -19,8 +19,8 @@
package org.apache.james.mailbox.store;
-import static org.junit.Assert.*;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -29,12 +29,13 @@ import java.util.List;
import org.apache.commons.io.IOUtils;
import org.apache.james.mailbox.model.MessageResult.Header;
-import org.apache.james.mailbox.store.ResultHeader;
import org.apache.james.mailbox.store.streaming.PartContentBuilder;
import org.apache.james.mailbox.store.streaming.PartContentBuilder.PartNotFoundException;
import org.junit.Before;
import org.junit.Test;
+import com.google.common.base.Charsets;
+
public class PartContentBuilderComplexMultipartTest {
private static final String PREAMBLE = "This is the preamble";
@@ -192,12 +193,12 @@ public class PartContentBuilderComplexMultipartTest {
private String fullContent(int[] position) throws Exception {
to(position);
- return IOUtils.toString(builder.getFullContent().getInputStream());
+ return IOUtils.toString(builder.getFullContent().getInputStream(), Charsets.UTF_8);
}
private String bodyContent(int[] position) throws Exception {
to(position);
- return IOUtils.toString(builder.getMimeBodyContent().getInputStream());
+ return IOUtils.toString(builder.getMimeBodyContent().getInputStream(), Charsets.UTF_8);
}
private void checkContentType(String contentType, int[] position)
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderMultipartAlternativeTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderMultipartAlternativeTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderMultipartAlternativeTest.java
index a426866..55d88e2 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderMultipartAlternativeTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/PartContentBuilderMultipartAlternativeTest.java
@@ -19,7 +19,7 @@
package org.apache.james.mailbox.store;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -28,11 +28,12 @@ import java.util.List;
import org.apache.commons.io.IOUtils;
import org.apache.james.mailbox.model.MessageResult.Header;
-import org.apache.james.mailbox.store.ResultHeader;
import org.apache.james.mailbox.store.streaming.PartContentBuilder;
import org.junit.Before;
import org.junit.Test;
+import com.google.common.base.Charsets;
+
public class PartContentBuilderMultipartAlternativeTest {
private static final String CONTENT_TYPE_PLAIN = "text/plain;charset=us-ascii";
@@ -105,7 +106,7 @@ public class PartContentBuilderMultipartAlternativeTest {
.encode(mail).array());
builder.parse(in);
builder.to(position);
- return IOUtils.toString(builder.getFullContent().getInputStream());
+ return IOUtils.toString(builder.getFullContent().getInputStream(), Charsets.UTF_8);
}
private String bodyContent(String mail, int position) throws Exception {
@@ -113,7 +114,7 @@ public class PartContentBuilderMultipartAlternativeTest {
.encode(mail).array());
builder.parse(in);
builder.to(position);
- return IOUtils.toString(builder.getMimeBodyContent().getInputStream());
+ return IOUtils.toString(builder.getMimeBodyContent().getInputStream(), Charsets.UTF_8);
}
private void checkContentType(String contentType, String mail, int position)
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssert.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssert.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssert.java
index ccb34f2..b54b423 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssert.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssert.java
@@ -30,6 +30,7 @@ import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MessageId;
+import com.google.common.base.Charsets;
import com.google.common.base.Objects;
import com.google.common.base.Throwables;
import com.google.common.collect.FluentIterable;
@@ -42,7 +43,7 @@ public class ListMessageAssert {
return FluentIterable.from(messages).transform(message -> {
try {
return new InnerMessage(message.getMessageId(), message.getUid(), message.getMailboxId(), message.getInternalDate(), message.getBodyOctets(),
- message.getFullContentOctets(), message.getMediaType(), message.getSubType(), IOUtils.toString(message.getFullContent()));
+ message.getFullContentOctets(), message.getMediaType(), message.getSubType(), IOUtils.toString(message.getFullContent(), Charsets.UTF_8));
} catch (IOException e) {
Throwables.propagate(e);
return null;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssert.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssert.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssert.java
index 7267924..67c1ba0 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssert.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageAssert.java
@@ -28,6 +28,7 @@ import org.apache.james.mailbox.store.mail.MessageMapper;
import org.apache.james.mailbox.store.mail.MessageMapper.FetchType;
import org.assertj.core.api.AbstractAssert;
+import com.google.common.base.Charsets;
import com.google.common.base.Objects;
public class MessageAssert extends AbstractAssert<MessageAssert, MailboxMessage> {
@@ -87,18 +88,18 @@ public class MessageAssert extends AbstractAssert<MessageAssert, MailboxMessage>
if (!Objects.equal(actual.getFullContentOctets(), expected.getFullContentOctets())) {
failWithMessage("Expected MailboxMessage size to be <%s> but was <%s>", expected.getFullContentOctets(), actual.getFullContentOctets());
}
- if (!Objects.equal(IOUtils.toString(actual.getFullContent()), IOUtils.toString(expected.getFullContent()))) {
- failWithMessage("Expected Full content to be <%s> but was <%s>", IOUtils.toString(expected.getFullContent()), IOUtils.toString(actual.getFullContent()));
+ if (!Objects.equal(IOUtils.toString(actual.getFullContent(), Charsets.UTF_8), IOUtils.toString(expected.getFullContent(), Charsets.UTF_8))) {
+ failWithMessage("Expected Full content to be <%s> but was <%s>", IOUtils.toString(expected.getFullContent(), Charsets.UTF_8), IOUtils.toString(actual.getFullContent(), Charsets.UTF_8));
}
}
if (usedFetchType == MessageMapper.FetchType.Full || usedFetchType == MessageMapper.FetchType.Headers) {
- if (!Objects.equal(IOUtils.toString(actual.getHeaderContent()), IOUtils.toString(expected.getHeaderContent()))) {
- failWithMessage("Expected Header content to be <%s> but was <%s>", IOUtils.toString(expected.getHeaderContent()), IOUtils.toString(actual.getHeaderContent()));
+ if (!Objects.equal(IOUtils.toString(actual.getHeaderContent(), Charsets.UTF_8), IOUtils.toString(expected.getHeaderContent(), Charsets.UTF_8))) {
+ failWithMessage("Expected Header content to be <%s> but was <%s>", IOUtils.toString(expected.getHeaderContent(), Charsets.UTF_8), IOUtils.toString(actual.getHeaderContent(), Charsets.UTF_8));
}
}
if (usedFetchType == MessageMapper.FetchType.Full || usedFetchType == MessageMapper.FetchType.Body) {
- if (!Objects.equal(IOUtils.toString(actual.getBodyContent()), IOUtils.toString(expected.getBodyContent()))) {
- failWithMessage("Expected Body content to be <%s> but was <%s>", IOUtils.toString(expected.getBodyContent()), IOUtils.toString(actual.getBodyContent()));
+ if (!Objects.equal(IOUtils.toString(actual.getBodyContent(), Charsets.UTF_8), IOUtils.toString(expected.getBodyContent(), Charsets.UTF_8))) {
+ failWithMessage("Expected Body content to be <%s> but was <%s>", IOUtils.toString(expected.getBodyContent(), Charsets.UTF_8), IOUtils.toString(actual.getBodyContent(), Charsets.UTF_8));
}
}
return this;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaTextExtractorTest.java
----------------------------------------------------------------------
diff --git a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaTextExtractorTest.java b/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaTextExtractorTest.java
index 7d70444..a75a5ad 100644
--- a/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaTextExtractorTest.java
+++ b/mailbox/tika/src/test/java/org/apache/james/mailbox/tika/TikaTextExtractorTest.java
@@ -63,7 +63,7 @@ public class TikaTextExtractorTest {
@Test
public void textualContentShouldReturnNullWhenInputStreamIsEmpty() throws Exception {
- assertThat(textExtractor.extractContent(IOUtils.toInputStream(""), "text/plain").getTextualContent())
+ assertThat(textExtractor.extractContent(IOUtils.toInputStream("", Charsets.UTF_8), "text/plain").getTextualContent())
.isNull();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java
index 9d6eb84..bbf6a05 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java
@@ -35,6 +35,7 @@ import org.apache.mailet.base.GenericMailet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.base.Charsets;
import com.google.common.io.ByteStreams;
/**
@@ -119,7 +120,7 @@ public class LogMessage extends GenericMailet {
private void logBody(MimeMessage message) throws MessagingException, IOException {
if (body) {
InputStream inputStream = ByteStreams.limit(message.getRawInputStream(), lengthToLog(message));
- logger.info(IOUtils.toString(inputStream));
+ logger.info(IOUtils.toString(inputStream, Charsets.UTF_8));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
----------------------------------------------------------------------
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
index e402b3b..7d6fd69 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
@@ -53,6 +53,7 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.rules.TemporaryFolder;
+import com.google.common.base.Charsets;
import com.google.common.base.Optional;
import com.google.common.collect.FluentIterable;
@@ -311,7 +312,7 @@ public class StripAttachmentTest {
assertThat(saved).hasSize(1);
assertThat(saved).containsKey(expectedKey);
MimeBodyPart savedBodyPart = new MimeBodyPart(new ByteArrayInputStream(saved.get(expectedKey)));
- String content = IOUtils.toString(savedBodyPart.getInputStream());
+ String content = IOUtils.toString(savedBodyPart.getInputStream(), Charsets.UTF_8);
assertThat(content).isEqualTo(EXPECTED_ATTACHMENT_CONTENT);
}
@@ -347,7 +348,7 @@ public class StripAttachmentTest {
assertThat(saved).hasSize(1);
assertThat(saved).containsKey(expectedKey);
MimeBodyPart savedBodyPart = new MimeBodyPart(new ByteArrayInputStream(saved.get(expectedKey)));
- String content = IOUtils.toString(savedBodyPart.getInputStream());
+ String content = IOUtils.toString(savedBodyPart.getInputStream(), Charsets.UTF_8);
assertThat(content).isEqualTo(EXPECTED_ATTACHMENT_CONTENT);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java b/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java
index e89f379..b2bd786 100644
--- a/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java
+++ b/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java
@@ -19,7 +19,7 @@
package org.apache.james.protocols.api;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java
index e672453..0512cdd 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/IdRangeParseTest.java
@@ -23,13 +23,12 @@ import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import junit.framework.Assert;
-
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.message.IdRange;
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.ImapRequestStreamLineReader;
import org.apache.james.protocols.imap.DecodingException;
+import org.junit.Assert;
import org.junit.Test;
public class IdRangeParseTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
index dd868f4..3993c54 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
@@ -30,16 +30,12 @@ import org.apache.james.imap.api.message.IdRange;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.ImapRequestStreamLineReader;
-import org.apache.james.imap.decode.parser.FetchCommandParser;
import org.apache.james.protocols.imap.DecodingException;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
-@RunWith(JMock.class)
public class FetchCommandParserPartialFetchTest {
Mockery context = new JUnit4Mockery();
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
index a5cdbe2..9d08096 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
@@ -39,13 +39,10 @@ import org.apache.james.imap.decode.ImapRequestStreamLineReader;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.protocols.imap.DecodingException;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class SearchCommandParserAndParenthesesTest {
private Mockery context = new JUnit4Mockery();
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
index e55e9d6..1d03795 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
@@ -37,13 +37,10 @@ import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.ImapRequestStreamLineReader;
import org.jmock.Expectations;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class SearchCommandParserCharsetTest {
private static final Charset UTF8 = Charset.forName("UTF-8");
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
index 891dc71..44fa027 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
@@ -36,13 +36,10 @@ import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.ImapRequestStreamLineReader;
import org.apache.james.mailbox.MessageUid;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class SearchCommandParserNotTest {
SearchCommandParser parser;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
index b7eeb03..f87c5ad 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
@@ -35,13 +35,10 @@ import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.ImapRequestStreamLineReader;
import org.apache.james.mailbox.MessageUid;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class SearchCommandParserOrTest {
SearchCommandParser parser;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
index 97e84b2..503f313 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
@@ -39,13 +39,10 @@ import org.apache.james.imap.decode.ImapRequestStreamLineReader;
import org.apache.james.protocols.imap.DecodingException;
import org.jmock.Expectations;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class SearchCommandParserQuotedCharsetTest {
private static final Charset UTF8 = Charset.forName("UTF-8");
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
index 44a4d1f..095b718 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
@@ -19,7 +19,7 @@
package org.apache.james.imap.decode.parser;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -34,13 +34,10 @@ import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.ImapRequestStreamLineReader;
import org.apache.james.mailbox.MessageUid;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class SearchCommandParserSearchKeySequenceSetTest {
SearchCommandParser parser;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
index 8536640..f7513f2 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
@@ -19,7 +19,8 @@
package org.apache.james.imap.decode.parser;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -35,13 +36,10 @@ import org.apache.james.imap.decode.ImapRequestStreamLineReader;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.protocols.imap.DecodingException;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class SearchCommandParserSearchKeyTest {
private static final DayMonthYear DATE = new DayMonthYear(1, 1, 2000);
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
index f789f2a..febe499 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
@@ -39,13 +39,10 @@ import org.apache.james.imap.decode.ImapRequestStreamLineReader;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.protocols.imap.DecodingException;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class SearchCommandParserTopLevelAndTest {
Input[] one = { sequence() };
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
index 75444d0..e308250 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
@@ -31,13 +31,10 @@ import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.ImapRequestStreamLineReader;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class StoreCommandParserTest {
StoreCommandParser parser;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java
index 5ee2bd6..becc340 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java
@@ -19,7 +19,7 @@
package org.apache.james.imap.encode;
-import junit.framework.Assert;
+import static org.junit.Assert.assertEquals;
import org.apache.james.imap.encode.base.ByteImapResponseWriter;
import org.apache.james.imap.encode.base.ImapResponseComposerImpl;
@@ -27,13 +27,11 @@ import org.apache.james.imap.message.response.FetchResponse;
import org.apache.james.imap.message.response.FetchResponse.Envelope.Address;
import org.jmock.Expectations;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
+
public class FetchResponseEncoderEnvelopeTest {
private static final String ADDRESS_ONE_HOST = "HOST";
@@ -154,7 +152,7 @@ public class FetchResponseEncoderEnvelopeTest {
envelopExpects();
encoder.doEncode(message, composer, new FakeImapSession());
- Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL))\r\n", writer.getString());
+ assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL))\r\n", writer.getString());
}
@Test
@@ -164,7 +162,7 @@ public class FetchResponseEncoderEnvelopeTest {
encoder.doEncode(message, composer, new FakeImapSession());
- Assert.assertEquals("* 100 FETCH (ENVELOPE (\"a date\" NIL NIL NIL NIL NIL NIL NIL NIL NIL))\r\n",writer.getString());
+ assertEquals("* 100 FETCH (ENVELOPE (\"a date\" NIL NIL NIL NIL NIL NIL NIL NIL NIL))\r\n",writer.getString());
}
@@ -174,7 +172,7 @@ public class FetchResponseEncoderEnvelopeTest {
envelopExpects();
encoder.doEncode(message, composer, new FakeImapSession());
- Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL \"some subject\" NIL NIL NIL NIL NIL NIL NIL NIL))\r\n", writer.getString());
+ assertEquals("* 100 FETCH (ENVELOPE (NIL \"some subject\" NIL NIL NIL NIL NIL NIL NIL NIL))\r\n", writer.getString());
}
@@ -184,7 +182,7 @@ public class FetchResponseEncoderEnvelopeTest {
envelopExpects();
encoder.doEncode(message, composer, new FakeImapSession());
- Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL NIL \"some reply to\" NIL))\r\n", writer.getString());
+ assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL NIL \"some reply to\" NIL))\r\n", writer.getString());
}
@Test
@@ -193,7 +191,7 @@ public class FetchResponseEncoderEnvelopeTest {
envelopExpects();
encoder.doEncode(message, composer, new FakeImapSession());
- Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL NIL NIL \"some message id\"))\r\n", writer.getString());
+ assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL NIL NIL \"some message id\"))\r\n", writer.getString());
}
@@ -202,7 +200,7 @@ public class FetchResponseEncoderEnvelopeTest {
from = mockOneAddress();
envelopExpects();
encoder.doEncode(message, composer, new FakeImapSession());
- Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL NIL NIL NIL NIL))\r\n", writer.getString());
+ assertEquals("* 100 FETCH (ENVELOPE (NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL NIL NIL NIL NIL))\r\n", writer.getString());
}
@@ -212,7 +210,7 @@ public class FetchResponseEncoderEnvelopeTest {
envelopExpects();
encoder.doEncode(message, composer, new FakeImapSession());
- Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL NIL NIL NIL NIL))\r\n", writer.getString());
+ assertEquals("* 100 FETCH (ENVELOPE (NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL NIL NIL NIL NIL))\r\n", writer.getString());
}
@@ -222,7 +220,7 @@ public class FetchResponseEncoderEnvelopeTest {
envelopExpects();
encoder.doEncode(message, composer, new FakeImapSession());
- Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL NIL NIL NIL))\r\n", writer.getString());
+ assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL NIL NIL NIL))\r\n", writer.getString());
}
@@ -232,7 +230,7 @@ public class FetchResponseEncoderEnvelopeTest {
envelopExpects();
encoder.doEncode(message, composer, new FakeImapSession());
- Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL NIL NIL NIL))\r\n", writer.getString());
+ assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL NIL NIL NIL))\r\n", writer.getString());
}
@@ -243,7 +241,7 @@ public class FetchResponseEncoderEnvelopeTest {
envelopExpects();
encoder.doEncode(message, composer, new FakeImapSession());
- Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL NIL NIL))\r\n", writer.getString());
+ assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL NIL NIL))\r\n", writer.getString());
}
@@ -253,7 +251,7 @@ public class FetchResponseEncoderEnvelopeTest {
envelopExpects();
encoder.doEncode(message, composer, new FakeImapSession());
- Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL NIL NIL))\r\n", writer.getString());
+ assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL NIL NIL))\r\n", writer.getString());
}
@@ -263,7 +261,7 @@ public class FetchResponseEncoderEnvelopeTest {
envelopExpects();
encoder.doEncode(message, composer, new FakeImapSession());
- Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL NIL))\r\n",writer.getString());
+ assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL NIL))\r\n",writer.getString());
}
@@ -273,7 +271,7 @@ public class FetchResponseEncoderEnvelopeTest {
envelopExpects();
encoder.doEncode(message, composer, new FakeImapSession());
- Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL NIL))\r\n",writer.getString());
+ assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL NIL))\r\n",writer.getString());
}
@@ -283,7 +281,7 @@ public class FetchResponseEncoderEnvelopeTest {
envelopExpects();
encoder.doEncode(message, composer, new FakeImapSession());
- Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL))\r\n",writer.getString());
+ assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL NIL))\r\n",writer.getString());
}
@@ -293,7 +291,7 @@ public class FetchResponseEncoderEnvelopeTest {
envelopExpects();
encoder.doEncode(message, composer, new FakeImapSession());
- Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL))\r\n",writer.getString());
+ assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL NIL))\r\n",writer.getString());
}
@@ -303,7 +301,7 @@ public class FetchResponseEncoderEnvelopeTest {
envelopExpects();
encoder.doEncode(message, composer, new FakeImapSession());
- Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL))\r\n",writer.getString());
+ assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")) NIL NIL))\r\n",writer.getString());
}
@@ -313,7 +311,7 @@ public class FetchResponseEncoderEnvelopeTest {
envelopExpects();
encoder.doEncode(message, composer, new FakeImapSession());
- Assert.assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL))\r\n",writer.getString());
+ assertEquals("* 100 FETCH (ENVELOPE (NIL NIL NIL NIL NIL NIL NIL ((\"NAME\" \"DOMAIN LIST\" \"MAILBOX\" \"HOST\")(\"2NAME\" \"2DOMAIN LIST\" \"2MAILBOX\" \"2HOST\")) NIL NIL))\r\n",writer.getString());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java
index 76b0ef9..928f4e6 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java
@@ -37,13 +37,10 @@ import org.apache.james.imap.message.response.FetchResponse;
import org.apache.james.mailbox.MessageUid;
import org.jmock.Expectations;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class FetchResponseEncoderNoExtensionsTest {
private ByteImapResponseWriter writer = new ByteImapResponseWriter();
private ImapResponseComposer composer = new ImapResponseComposerImpl(writer);
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java
index 185d9fb..9f1470c 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java
@@ -19,25 +19,22 @@
package org.apache.james.imap.encode;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import javax.mail.Flags;
-import static org.junit.Assert.*;
import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.encode.FetchResponseEncoder;
-import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.encode.ImapResponseComposer;
import org.apache.james.imap.encode.base.ByteImapResponseWriter;
import org.apache.james.imap.encode.base.ImapResponseComposerImpl;
import org.apache.james.imap.message.response.FetchResponse;
import org.apache.james.mailbox.MessageUid;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class FetchResponseEncoderTest {
private ByteImapResponseWriter writer = new ByteImapResponseWriter();
private ImapResponseComposer composer = new ImapResponseComposerImpl(writer);
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java
index 5549275..23836f1 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java
@@ -29,13 +29,10 @@ import org.apache.james.imap.encode.base.ImapResponseComposerImpl;
import org.apache.james.imap.message.response.LSubResponse;
import org.apache.james.imap.message.response.ListResponse;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class LSubResponseEncoderTest {
LSubResponseEncoder encoder;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java
index b5cb181..8c26450 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java
@@ -19,23 +19,19 @@
package org.apache.james.imap.encode;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.encode.ImapResponseComposer;
-import org.apache.james.imap.encode.SearchResponseEncoder;
import org.apache.james.imap.encode.base.ByteImapResponseWriter;
import org.apache.james.imap.encode.base.ImapResponseComposerImpl;
import org.apache.james.imap.message.response.SearchResponse;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class ListResponseEncoderTest {
private static final long[] IDS = { 1, 4, 9, 16 };
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/encode/ListingEncodingUtilsTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/ListingEncodingUtilsTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/ListingEncodingUtilsTest.java
index f4ea9f4..bb5b187 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/encode/ListingEncodingUtilsTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/ListingEncodingUtilsTest.java
@@ -24,11 +24,10 @@ import java.util.List;
import org.apache.james.imap.encode.base.ByteImapResponseWriter;
import org.apache.james.imap.encode.base.ImapResponseComposerImpl;
import org.apache.james.imap.message.response.ListResponse;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import junit.framework.Assert;
-
public class ListingEncodingUtilsTest {
final String nameParameter = "LIST";
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java
index d5e4e72..bf57192 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java
@@ -19,24 +19,20 @@
package org.apache.james.imap.encode;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.encode.ImapResponseComposer;
-import org.apache.james.imap.encode.MailboxStatusResponseEncoder;
import org.apache.james.imap.encode.base.ByteImapResponseWriter;
import org.apache.james.imap.encode.base.ImapResponseComposerImpl;
import org.apache.james.imap.message.response.MailboxStatusResponse;
import org.apache.james.mailbox.MessageUid;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class MailboxStatusResponseEncoderTest {
MailboxStatusResponseEncoder encoder;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java
index a01dc53..86ac430 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java
@@ -31,13 +31,10 @@ import org.apache.james.imap.message.response.NamespaceResponse;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.Sequence;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class NamespaceResponseEncoderTest {
ImapSession dummySession;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java
index 87ef05c..1b2bb80 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java
@@ -19,24 +19,20 @@
package org.apache.james.imap.encode;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.apache.james.imap.api.ImapMessage;
-import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.encode.ImapResponseComposer;
-import org.apache.james.imap.encode.ListResponseEncoder;
import org.apache.james.imap.encode.base.ByteImapResponseWriter;
import org.apache.james.imap.encode.base.ImapResponseComposerImpl;
import org.apache.james.imap.message.response.LSubResponse;
import org.apache.james.imap.message.response.ListResponse;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class SearchResponseEncoderTest {
private ListResponseEncoder encoder;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java b/protocols/imap/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java
index 6e52994..5943572 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.imap.main;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -30,13 +30,10 @@ import org.apache.james.imap.decode.main.ImapRequestStreamHandler;
import org.apache.james.imap.encode.ImapEncoder;
import org.jmock.Expectations;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class ImapRequestHandlerAdandonConnectionTest {
/** System under test */
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java
index fa4b892..5a7519d 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java
@@ -47,18 +47,15 @@ import org.apache.james.mailbox.model.SimpleMailboxACL.SimpleMailboxACLEntryKey;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.jmock.Expectations;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
/**
* DeleteACLProcessor Test.
*
* @author Peter Palaga
*/
-@RunWith(JMock.class)
public class DeleteACLProcessorTest {
private static final String MAILBOX_NAME = ImapConstants.INBOX_NAME;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java
index 840b632..ad9417d 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java
@@ -45,17 +45,14 @@ import org.apache.james.mailbox.model.SimpleMailboxACL.Rfc4314Rights;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.jmock.Expectations;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
/**
* GetACLProcessor Test.
*
*/
-@RunWith(JMock.class)
public class GetACLProcessorTest {
private static final String MAILBOX_NAME = ImapConstants.INBOX_NAME;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
index 67d1a77..f46f009 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
@@ -40,13 +40,10 @@ import org.apache.james.mailbox.model.MailboxMetaData;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.jmock.Expectations;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class LSubProcessorTest {
private static final String ROOT = "ROOT";
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java
index 3e956c1..2d48f28 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java
@@ -32,13 +32,10 @@ import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.jmock.Expectations;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class ListProcessorTest {
ListProcessor processor;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java
index cb425d5..cf8e8de 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/ListRightsProcessorTest.java
@@ -48,18 +48,15 @@ import org.apache.james.mailbox.model.SimpleMailboxACL.SimpleMailboxACLEntryKey;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.jmock.Expectations;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
/**
* ListRightsProcessor Test.
*
* @author Peter Palaga
*/
-@RunWith(JMock.class)
public class ListRightsProcessorTest {
private static final String MAILBOX_NAME = ImapConstants.INBOX_NAME;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java
index da1bc78..998102e 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java
@@ -41,13 +41,10 @@ import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.jmock.Expectations;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class NamespaceProcessorTest {
private static final String SHARED_PREFIX = "SharedPrefix";
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
index 5a63525..07bf600 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
@@ -58,15 +58,12 @@ import org.apache.james.mailbox.model.SearchQuery.DateResolution;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.jmock.Expectations;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
import com.google.common.base.Optional;
-@RunWith(JMock.class)
public class SearchProcessorTest {
private static final int DAY = 6;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java
index 767708d..1f687f8 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetACLProcessorTest.java
@@ -48,18 +48,15 @@ import org.apache.james.mailbox.model.SimpleMailboxACL.SimpleMailboxACLEntryKey;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.jmock.Expectations;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
/**
* SetACLProcessor Test.
*
* @author Peter Palaga
*/
-@RunWith(JMock.class)
public class SetACLProcessorTest {
private static final String MAILBOX_NAME = ImapConstants.INBOX_NAME;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElementTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElementTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElementTest.java
index 1dfaf54..f0b3a0d 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElementTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElementTest.java
@@ -19,19 +19,15 @@
package org.apache.james.imap.processor.fetch;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import org.apache.james.imap.message.response.FetchResponse.BodyElement;
-import org.apache.james.imap.processor.fetch.PartialFetchBodyElement;
import org.jmock.Expectations;
import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
public class PartialFetchBodyElementTest {
private static final long NUMBER_OF_OCTETS = 100;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/pom.xml b/protocols/pom.xml
index 8b90a14..7110834 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -48,6 +48,62 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <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>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox-store</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-core</artifactId>
+ <version>${jsieve.version}</version>
+ </dependency>
+ <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>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-data-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <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</groupId>
+ <artifactId>metrics-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/POP3StartTlsResponseTest.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/POP3StartTlsResponseTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/POP3StartTlsResponseTest.java
index bcdfa36..8fda248 100644
--- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/POP3StartTlsResponseTest.java
+++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/POP3StartTlsResponseTest.java
@@ -19,11 +19,11 @@
package org.apache.james.protocols.pop3;
+import static org.junit.Assert.assertTrue;
+
import org.apache.james.protocols.api.StartTlsResponse;
import org.junit.Test;
-import static junit.framework.Assert.*;
-
public class POP3StartTlsResponseTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/SMTPStartTlsResponseTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/SMTPStartTlsResponseTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/SMTPStartTlsResponseTest.java
index ccdd7e3..332d48d 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/SMTPStartTlsResponseTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/SMTPStartTlsResponseTest.java
@@ -19,11 +19,11 @@
package org.apache.james.protocols.smtp;
+import static org.junit.Assert.assertTrue;
+
import org.apache.james.protocols.api.StartTlsResponse;
import org.junit.Test;
-import static junit.framework.Assert.*;
-
public class SMTPStartTlsResponseTest {
/**
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
index 25ddd96..fb798e4 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
@@ -20,9 +20,9 @@
package org.apache.james.protocols.smtp.core.fastfail;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import java.net.InetSocketAddress;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java
index 3808835..345cf09 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java
@@ -17,12 +17,9 @@
* under the License. *
****************************************************************/
-
-
-
package org.apache.james.protocols.smtp.core.fastfail;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import java.util.HashMap;
import java.util.Map;
@@ -34,8 +31,6 @@ import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession;
import org.junit.Test;
-
-
public class MaxRcptHandlerTest {
private SMTPSession setupMockedSession(final int rcptCount) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java
index 0df0aeb..70606f9 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java
@@ -20,7 +20,7 @@
package org.apache.james.protocols.smtp.core.fastfail;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import java.util.HashMap;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
index 782ce18..ec7ea8a 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
@@ -17,13 +17,11 @@
* under the License. *
****************************************************************/
-
-
package org.apache.james.protocols.smtp.core.fastfail;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import java.net.InetAddress;
import java.net.UnknownHostException;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java
index d339a98..c12df5a 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java
@@ -20,8 +20,8 @@
package org.apache.james.protocols.smtp.core.fastfail;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import java.net.InetSocketAddress;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
index 436528b..9dee55c 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
@@ -19,7 +19,7 @@
package org.apache.james.protocols.smtp.core.fastfail;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import java.util.HashMap;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/james-project/blob/f8f540a6/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
index 9ab258b..b20d4a2 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
@@ -30,8 +30,6 @@ import java.util.concurrent.Future;
import javax.inject.Inject;
-import com.google.common.base.CharMatcher;
-import org.apache.http.Header;
import org.apache.http.HttpResponse;
import org.apache.http.client.fluent.Async;
import org.apache.http.client.fluent.Content;
@@ -43,9 +41,11 @@ import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.util.CountDownConsumeInputStream;
import org.apache.james.util.ZeroedInputStream;
+import com.google.common.base.CharMatcher;
import com.google.common.base.Charsets;
import com.jayway.jsonpath.DocumentContext;
import com.jayway.jsonpath.JsonPath;
+
import cucumber.api.java.en.Given;
import cucumber.api.java.en.Then;
import cucumber.api.java.en.When;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[14/29] james-project git commit: JAMES-2124 Merge dependency
management in parent POM
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/ab4aec5f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4ac9afa..abea84d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -566,6 +566,7 @@
</distributionManagement>
<properties>
+
<!--
Following properties can be overridden in inheriting pom.xml if needed,
otherwise the set values are used by default.
@@ -578,8 +579,1706 @@
to avoid accidently overriding the common modules website. Empty by default.
-->
<deployTechnicalSiteDirectory></deployTechnicalSiteDirectory>
+
+ <activemq.version>5.15.0</activemq.version>
+ <apache-mime4j.version>0.8.1</apache-mime4j.version>
+ <camel.version>2.19.1</camel.version>
+ <derby.version>10.9.1.0</derby.version>
+ <hadoop.version>1.1.1</hadoop.version>
+ <hbase.version>0.94.27</hbase.version>
+ <javax.inject.version>1</javax.inject.version>
+ <javax.activation.groupId>javax.activation</javax.activation.groupId>
+ <javax.activation.artifactId>activation</javax.activation.artifactId>
+ <jackrabbit.version>2.5.2</jackrabbit.version>
+ <jsieve.version>0.7</jsieve.version>
+ <spring.version>3.2.14.RELEASE</spring.version>
+ <geronimo-jms-spec.version>1.1.1</geronimo-jms-spec.version>
+ <activmq-artemis.version>2.1.0</activmq-artemis.version>
+ <h2.version>1.3.170</h2.version>
+ <apache-jspf-resolver.version>1.0.1</apache-jspf-resolver.version>
+ <javamail.version>1.5.4</javamail.version>
+ <javax-activation.version>1.1.1</javax-activation.version>
+ <geronimo-activation-spec.version>1.1</geronimo-activation-spec.version>
+ <geronimo-javamail.version>1.8.3</geronimo-javamail.version>
+ <slf4j.version>1.7.25</slf4j.version>
+ <servlet-api.version>2.4</servlet-api.version>
+ <commons-daemon.version>1.0.10</commons-daemon.version>
+ <commons-collections.version>3.2.1</commons-collections.version>
+ <commons-lang.version>2.6</commons-lang.version>
+ <commons-codec.version>1.7</commons-codec.version>
+ <commons-cli.version>1.2</commons-cli.version>
+ <commons-pool.version>1.6</commons-pool.version>
+ <commons-configuration.version>1.9</commons-configuration.version>
+ <commons-dbcp.version>1.4</commons-dbcp.version>
+ <commons-net.version>3.2</commons-net.version>
+ <commons-beanutils-core.version>1.8.3</commons-beanutils-core.version>
+ <commons-io.version>2.5</commons-io.version>
+ <commons-logging.version>1.1.1</commons-logging.version>
+
+ <dnsjava.version>2.1.1</dnsjava.version>
+ <junit.version>4.11</junit.version>
+ <jmock.version>2.6.0</jmock.version>
+ <concurrent.version>1.3.4</concurrent.version>
+ <log4j.version>1.2.17</log4j.version>
+ <jcr.version>2.0</jcr.version>
+ <xbean-spring.version>3.12</xbean-spring.version>
+ <netty.version>3.10.6.Final</netty.version>
+ <geronimo-annotation-spec.version>1.0.1</geronimo-annotation-spec.version>
+ <spring-osgi-extender.version>1.2.1</spring-osgi-extender.version>
+ <org.osgi.core.version>5.0.0</org.osgi.core.version>
+ <cucumber.version>1.2.4</cucumber.version>
+
+ <exam.version>2.6.0</exam.version>
+ <url.version>1.4.0</url.version>
+ <felix.version>4.0.3</felix.version>
+ <pax-swissbox-tinybundles.version>1.3.1</pax-swissbox-tinybundles.version>
+ <karaf.version>2.3.0</karaf.version>
+ <karaf.tooling.exam.container.version>2.3.0</karaf.tooling.exam.container.version>
+ <pax-logging-api.version>1.6.4</pax-logging-api.version>
+ <jackson-data.version>2.6.3</jackson-data.version>
+ <jetty.version>9.4.4.v20170414</jetty.version>
+ <cassandra-unit.version>2.1.9.2</cassandra-unit.version>
+ <assertj-guava.version>3.1.0</assertj-guava.version>
+ <testcontainers-version>1.4.2</testcontainers-version>
+ <metrics.version>3.2.1</metrics.version>
+ <joda.version>2.9.4</joda.version>
+ <assertj.version>3.3.0</assertj.version>
+ <es.version>2.2.1</es.version>
+ <es-reporter.version>2.2.0</es-reporter.version>
+ <guava.version>18.0</guava.version>
+
+ <apache-commons-io.version>1.3.2</apache-commons-io.version>
+ <jutf7.version>1.0.0</jutf7.version>
+ <plugin.mailetdocs.version>0.1</plugin.mailetdocs.version>
+ <commons-lang3.version>3.3.2</commons-lang3.version>
+ <httpclient-osgi.version>4.5.1</httpclient-osgi.version>
+ <!-- maven-mailetdocs-plugin artifacts -->
+ <maven-artifact.version>3.0-alpha-1</maven-artifact.version>
+ <maven-plugin-annotations.version>3.4</maven-plugin-annotations.version>
+ <maven-plugin-api.version>3.2.5</maven-plugin-api.version>
+ <maven-reporting-impl.version>2.2</maven-reporting-impl.version>
+ <maven-reporting-api.version>3.0</maven-reporting-api.version>
+ <qdox.version>1.12.1</qdox.version>
+ <ical4j.version>2.0.2</ical4j.version>
+ <guavate.version>1.0.0</guavate.version>
+ <javax.activation.groupId>javax.activation</javax.activation.groupId>
+ <javax.activation.artifactId>activation</javax.activation.artifactId>
+ <javax.persistence.version>1.0.2</javax.persistence.version>
+ <lucene.version>3.6.0</lucene.version>
+ <xercesImpl.version>2.9.1</xercesImpl.version>
+ <xml-apis.version>1.3.04</xml-apis.version>
+ <geronimo-activation-spec.version>1.1</geronimo-activation-spec.version>
+ <mockito-core.version>1.9.0</mockito-core.version>
+ <jasypt.version>1.9.0</jasypt.version>
+ <jackson-databinding.version>2.6.3</jackson-databinding.version>
+ <guice.version>4.0</guice.version>
+ <jackrabbit-core.version>2.5.2</jackrabbit-core.version>
+
+ <logback.version>1.1.7</logback.version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-backends-cassandra</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-backends-cassandra</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-backends-es</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-backends-es</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-backends-jpa</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-backends-jpa</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-api</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-cassandra</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-cassandra</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-elasticsearch</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-elasticsearch</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-hbase</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-hbase</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-jcr</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-jpa</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-jpa</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-kafka</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-lucene</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-lucene</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-maildir</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-memory</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-memory</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-spring</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-store</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-store</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-tika</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-tika</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-tool</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mpt-antlib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mpt-antlib</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mpt-app</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mpt-app</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mpt-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mpt-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mpt-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-jsieve-core</artifactId>
+ <version>${jsieve.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-mailet-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-mailet-base</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-mailet-base</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-mailet-base</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-mailet-standard</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-mailet-standard</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-mime4j-core</artifactId>
+ <version>${apache-mime4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-mime4j-dom</artifactId>
+ <version>${apache-mime4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-mime4j-james-utils</artifactId>
+ <version>${apache-mime4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-cassandra-guice</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-cassandra-guice</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-cassandra-ldap-guice</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-cli</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-api</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-cassandra</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-file</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-hbase</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-jcr</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-jdbc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-jmap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-jmap</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-jmap-cassandra</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-jpa</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-ldap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-ldap-integration-testing</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-library</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-library</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-memory</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-dnsservice-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-dnsservice-api</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-dnsservice-dnsjava</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-dnsservice-library</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-dnsservice-library</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-fetchmail</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-filesystem-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-filesystem-api</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-guice-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-guice-common</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-guice-jmap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-guice-jmap</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-guice-mailbox</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-jetty</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-jmap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-jmap-integration-testing</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-jmap-integration-testing</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-jwt</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-lifecycle-api</artifactId>
+ <version>${project.version}</version>
+ </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-mailetcontainer-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-mailetcontainer-api</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-mailetcontainer-camel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-mailets</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-memory-guice</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-memory-guice</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-onami</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-protocols-imap4</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-protocols-library</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-protocols-library</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-protocols-lmtp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-protocols-managesieve</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-protocols-managesieve</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-protocols-pop3</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-protocols-smtp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-protocols-smtp</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-queue-activemq</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-queue-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-queue-api</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-queue-file</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-queue-jms</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-queue-jms</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-spring</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-testing</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util-java8</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>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-webadmin-cassandra</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-webadmin-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-webadmin-data</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-webadmin-mailbox</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-webadmin-swagger</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>metrics-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>metrics-dropwizard</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>metrics-logger</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>1.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>com.beetstra.jutf7</groupId>
+ <artifactId>jutf7</artifactId>
+ <version>${jutf7.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-guava</artifactId>
+ <version>${jackson-databinding.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jdk8</artifactId>
+ <version>${jackson-databinding.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ <version>2.6.3</version>
+ </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>
+ <version>${guavate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>${guice.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-multibindings</artifactId>
+ <version>4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jason-goodwin</groupId>
+ <artifactId>better-monads</artifactId>
+ <version>0.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jayway.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jayway.jsonpath</groupId>
+ <artifactId>json-path</artifactId>
+ <version>2.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jayway.restassured</groupId>
+ <artifactId>rest-assured</artifactId>
+ <version>2.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.nurkiewicz.asyncretry</groupId>
+ <artifactId>asyncretry</artifactId>
+ <version>0.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>com.rabbitmq</groupId>
+ <artifactId>amqp-client</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sparkjava</groupId>
+ <artifactId>spark-core</artifactId>
+ <version>2.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-client</artifactId>
+ <version>3.5.10</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>1.5.4</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>activation</artifactId>
+ <groupId>javax.activation</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.qdox</groupId>
+ <artifactId>qdox</artifactId>
+ <version>${qdox.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ <version>${commons-beanutils-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>${commons-cli.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>${commons-configuration.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>dom4j</artifactId>
+ <groupId>dom4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>servletapi</artifactId>
+ <groupId>servletapi</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xerces</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-digester</artifactId>
+ <groupId>commons-digester</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-beanutils-core</artifactId>
+ <groupId>commons-beanutils</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-beanutils-bean-collections</artifactId>
+ <groupId>commons-beanutils</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-daemon</groupId>
+ <artifactId>commons-daemon</artifactId>
+ <version>${commons-daemon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>${commons-dbcp.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xercesImpl</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>logkit</artifactId>
+ <groupId>logkit</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>avalon-framework</artifactId>
+ <groupId>avalon-framework</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>${commons-net.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${commons-pool.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xercesImpl</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xerces</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>${concurrent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>dnsjava</groupId>
+ <artifactId>dnsjava</artifactId>
+ <version>${dnsjava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-guice</artifactId>
+ <version>${cucumber.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-java</artifactId>
+ <version>${cucumber.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-junit</artifactId>
+ <version>${cucumber.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-picocontainer</artifactId>
+ <version>${cucumber.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ <version>${metrics.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-jvm</artifactId>
+ <version>${metrics.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt</artifactId>
+ <version>0.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${javax-activation.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>${javax.inject.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>${jcr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>1.1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>${joda.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>nl.jqno.equalsverifier</groupId>
+ <artifactId>equalsverifier</artifactId>
+ <version>1.7.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <version>${activemq.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>spring-osgi-core</artifactId>
+ <groupId>org.springframework.osgi</groupId>
+ </exclusion>
+ <!-- exlude this, its only used in the authentication plugin which we don't use -->
+ <exclusion>
+ <artifactId>icu4j</artifactId>
+ <groupId>com.ibm.icu</groupId>
+ </exclusion>
+ <!-- exclude this, we don't use osgi yet -->
+ <exclusion>
+ <artifactId>org.osgi.core</artifactId>
+ <groupId>org.osgi</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-jms-client</artifactId>
+ <version>${activmq-artemis.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>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ <version>${camel.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>spring-web</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${apache-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.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>${felix.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>${geronimo-activation-spec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>${geronimo-annotation-spec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <version>${geronimo-annotation-spec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo-jms-spec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>${hbase.version}</version>
+ <type>test-jar</type>
+ </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.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>${jackrabbit.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>pdfbox</artifactId>
+ <groupId>org.apache.pdfbox</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>netcdf</artifactId>
+ <groupId>edu.ucar</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-rmi</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-karaf-distribution</artifactId>
+ <version>${project.version}</version>
+ <type>tar.gz</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>org.apache.karaf.client</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <groupId>org.eclipse.osgi</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-karaf-features</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james.jspf</groupId>
+ <artifactId>apache-jspf-resolver</artifactId>
+ <version>${apache-jspf-resolver.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>dnsjava</artifactId>
+ <groupId>dnsjava</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-cli</artifactId>
+ <groupId>commons-cli</groupId>
+ </exclusion>
+ <!-- only used for the asynchronous executors -->
+ <exclusion>
+ <artifactId>dnsjnio</artifactId>
+ <groupId>uk.nominet</groupId>
+ </exclusion>
+ </exclusions>
+ </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-imap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-imap</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </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-managesieve</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-managesieve</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.protocols</groupId>
+ <artifactId>protocols-pop3</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>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.tooling.exam</groupId>
+ <artifactId>org.apache.karaf.tooling.exam.container</artifactId>
+ <version>${karaf.tooling.exam.container.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <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-api</artifactId>
+ <version>${maven-reporting-api.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.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <version>${xbean-spring.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>spring-web</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ </exclusions>
+ </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>${assertj-guava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcmail-jdk15on</artifactId>
+ <version>1.52</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ <version>1.52</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>1.52</version>
+ </dependency>
+ <dependency>
+ <groupId>org.cassandraunit</groupId>
+ <artifactId>cassandra-unit</artifactId>
+ <version>2.1.9.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>metrics-elasticsearch-reporter</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>java-hamcrest</artifactId>
+ <version>2.0.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jasypt</groupId>
+ <artifactId>jasypt</artifactId>
+ <version>${jasypt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>${jmock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <version>${jmock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mnode.ical4j</groupId>
+ <artifactId>ical4j</artifactId>
+ <version>${ical4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam</artifactId>
+ <version>${exam.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit4</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-mvn</artifactId>
+ <version>${exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <version>${pax-logging-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-tinybundles</artifactId>
+ <version>${pax-swissbox-tinybundles.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-aether</artifactId>
+ <version>${url.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${org.osgi.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jms</artifactId>
+ <version>${spring.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>${spring.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>toplink</artifactId>
+ <groupId>com.oracle.toplink</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>toplink-essentials</artifactId>
+ <groupId>com.oracle</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>hibernate</artifactId>
+ <groupId>org.hibernate</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <groupId>org.hibernate</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>spring-web</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ <version>${spring-osgi-extender.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>org.springframework.core</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>org.springframework.aop</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>org.springframework.context</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>org.springframework.beans</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ <version>${testcontainers-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>pl.pragmatists</groupId>
+ <artifactId>JUnitParams</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xercesImpl.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml-apis.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<extensions>
<extension>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ab4aec5f/protocols/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/pom.xml b/protocols/pom.xml
index 6994d53..3b5d39b 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -46,19 +46,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <netty.version>3.10.6.Final</netty.version>
- <apache-mime4j.version>0.8.1</apache-mime4j.version>
- <commons-net.version>3.2</commons-net.version>
- <commons-lang.version>2.6</commons-lang.version>
- <commons-codec.version>1.7</commons-codec.version>
- <commons-collections.version>3.2.1</commons-collections.version>
- <apache-commons-io.version>1.3.2</apache-commons-io.version>
- <jmock.version>2.5.1</jmock.version>
- <jutf7.version>1.0.0</jutf7.version>
- <junit.version>4.10</junit.version>
- <slf4j.version>1.7.25</slf4j.version>
- <jsieve.version>0.7</jsieve.version>
- <mockito-core.version>1.9.0</mockito-core.version>
</properties>
<build>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[18/29] james-project git commit: JAMES-2124 Remove non-accurate
comment
Posted by bt...@apache.org.
JAMES-2124 Remove non-accurate comment
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/78e99f3f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/78e99f3f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/78e99f3f
Branch: refs/heads/master
Commit: 78e99f3fef6ea058b1f76029aa13db1ab215537f
Parents: 43e69ba
Author: benwa <bt...@linagora.com>
Authored: Wed Aug 23 10:15:16 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 25 18:17:28 2017 +0700
----------------------------------------------------------------------
pom.xml | 1 -
server/container/core/pom.xml | 5 +----
server/data/data-api/pom.xml | 2 +-
server/data/data-cassandra/pom.xml | 3 ---
server/data/data-file/pom.xml | 2 --
server/data/data-hbase/pom.xml | 1 -
server/data/data-jcr/pom.xml | 2 --
server/data/data-jdbc/pom.xml | 4 ----
server/data/data-jpa/pom.xml | 2 --
server/data/data-library/pom.xml | 2 --
server/dns-service/dnsservice-dnsjava/pom.xml | 1 -
server/mailet/mailetcontainer-camel/pom.xml | 7 -------
server/mailet/mailets/pom.xml | 7 -------
server/protocols/protocols-pop3/pom.xml | 1 -
server/protocols/protocols-smtp/pom.xml | 3 ---
server/protocols/webadmin/webadmin-cassandra/pom.xml | 1 -
server/queue/queue-activemq/pom.xml | 2 --
server/queue/queue-file/pom.xml | 2 --
server/queue/queue-jms/pom.xml | 2 --
19 files changed, 2 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5184552..48e2f22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1729,7 +1729,6 @@
<artifactId>artemis-jms-client</artifactId>
<version>${activmq-artemis.version}</version>
</dependency>
- <!-- Other dependencies -->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/server/container/core/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml
index 7f5c4d2..7fdc7f5 100644
--- a/server/container/core/pom.xml
+++ b/server/container/core/pom.xml
@@ -42,14 +42,11 @@
<groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
-
- <!-- RFC2822Headers constants imported from mailet-base (undetected by bytecode analyzers because constants are inlined) -->
<dependency>
+ <!-- RFC2822Headers constants imported from mailet-base (undetected by bytecode analyzers because constants are inlined) -->
<groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
</dependency>
-
- <!-- Test dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/server/data/data-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-api/pom.xml b/server/data/data-api/pom.xml
index 703c42b..7b3ffa9 100644
--- a/server/data/data-api/pom.xml
+++ b/server/data/data-api/pom.xml
@@ -33,8 +33,8 @@
<name>Apache James :: Server :: Data :: API</name>
<dependencies>
- <!-- only used by JamesUser (for MailAddress) -->
<dependency>
+ <!-- only used by JamesUser (for MailAddress) -->
<groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/server/data/data-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/pom.xml b/server/data/data-cassandra/pom.xml
index 9761dd5..62a3cd6 100644
--- a/server/data/data-cassandra/pom.xml
+++ b/server/data/data-cassandra/pom.xml
@@ -35,9 +35,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
</dependency>
-
- <!-- Test dependencies -->
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/server/data/data-file/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-file/pom.xml b/server/data/data-file/pom.xml
index a1a443e..aea1655 100644
--- a/server/data/data-file/pom.xml
+++ b/server/data/data-file/pom.xml
@@ -91,8 +91,6 @@
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
-
- <!-- Test dependencies -->
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-java</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/server/data/data-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/pom.xml b/server/data/data-hbase/pom.xml
index 15cd908..2a37e64 100644
--- a/server/data/data-hbase/pom.xml
+++ b/server/data/data-hbase/pom.xml
@@ -83,7 +83,6 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
- <!-- Test dependencies -->
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-java</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/server/data/data-jcr/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/pom.xml b/server/data/data-jcr/pom.xml
index 5900ccc..06c988d 100644
--- a/server/data/data-jcr/pom.xml
+++ b/server/data/data-jcr/pom.xml
@@ -75,8 +75,6 @@
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
</dependency>
-
- <!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/server/data/data-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/pom.xml b/server/data/data-jdbc/pom.xml
index b2e1683..b2c9796 100644
--- a/server/data/data-jdbc/pom.xml
+++ b/server/data/data-jdbc/pom.xml
@@ -59,7 +59,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
@@ -91,8 +90,6 @@
<artifactId>commons-dbcp</artifactId>
<scope>runtime</scope>
</dependency>
-
- <!-- Test dependencies -->
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-java</artifactId>
@@ -108,7 +105,6 @@
<artifactId>cucumber-picocontainer</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/server/data/data-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml
index addb50a..e1b59bf 100644
--- a/server/data/data-jpa/pom.xml
+++ b/server/data/data-jpa/pom.xml
@@ -93,8 +93,6 @@
<artifactId>commons-dbcp</artifactId>
<scope>test</scope>
</dependency>
-
- <!-- Test dependencies -->
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-java</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/server/data/data-library/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-library/pom.xml b/server/data/data-library/pom.xml
index 8ea942d..4d6a18c 100644
--- a/server/data/data-library/pom.xml
+++ b/server/data/data-library/pom.xml
@@ -80,8 +80,6 @@
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
-
- <!-- Test dependencies -->
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-java</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/server/dns-service/dnsservice-dnsjava/pom.xml
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-dnsjava/pom.xml b/server/dns-service/dnsservice-dnsjava/pom.xml
index 252688b..7dda33a 100644
--- a/server/dns-service/dnsservice-dnsjava/pom.xml
+++ b/server/dns-service/dnsservice-dnsjava/pom.xml
@@ -61,7 +61,6 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/server/mailet/mailetcontainer-camel/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/pom.xml b/server/mailet/mailetcontainer-camel/pom.xml
index fab64e2..9a16ed0 100644
--- a/server/mailet/mailetcontainer-camel/pom.xml
+++ b/server/mailet/mailetcontainer-camel/pom.xml
@@ -115,7 +115,6 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
- <!-- test dependency -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -139,12 +138,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
- <!--
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-base</artifactId>
- </dependency>
- -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/server/mailet/mailets/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml
index 8acf682..0b28f93 100644
--- a/server/mailet/mailets/pom.xml
+++ b/server/mailet/mailets/pom.xml
@@ -33,12 +33,6 @@
<name>Apache James :: Server :: Mailets</name>
<dependencies>
- <!--
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-imap-processor</artifactId>
- </dependency>
- -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
@@ -147,7 +141,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
- <!-- Test dependencies -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/server/protocols/protocols-pop3/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-pop3/pom.xml b/server/protocols/protocols-pop3/pom.xml
index 4558066..c331032 100644
--- a/server/protocols/protocols-pop3/pom.xml
+++ b/server/protocols/protocols-pop3/pom.xml
@@ -37,7 +37,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
- <!-- Test dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/server/protocols/protocols-smtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml
index 3326d74..e0bb722 100644
--- a/server/protocols/protocols-smtp/pom.xml
+++ b/server/protocols/protocols-smtp/pom.xml
@@ -147,8 +147,6 @@
<artifactId>commons-net</artifactId>
<scope>test</scope>
</dependency>
-
- <!-- Test dependencies -->
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
@@ -167,7 +165,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/server/protocols/webadmin/webadmin-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-cassandra/pom.xml b/server/protocols/webadmin/webadmin-cassandra/pom.xml
index 623462d..f336eb7 100644
--- a/server/protocols/webadmin/webadmin-cassandra/pom.xml
+++ b/server/protocols/webadmin/webadmin-cassandra/pom.xml
@@ -46,7 +46,6 @@
<artifactId>metrics-logger</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>com.jayway.restassured</groupId>
<artifactId>rest-assured</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/server/queue/queue-activemq/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-activemq/pom.xml b/server/queue/queue-activemq/pom.xml
index 2e839b9..b5d680d 100644
--- a/server/queue/queue-activemq/pom.xml
+++ b/server/queue/queue-activemq/pom.xml
@@ -71,8 +71,6 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
-
- <!-- testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/server/queue/queue-file/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-file/pom.xml b/server/queue/queue-file/pom.xml
index 2ab4292..3cd82a5 100644
--- a/server/queue/queue-file/pom.xml
+++ b/server/queue/queue-file/pom.xml
@@ -57,8 +57,6 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
-
- <!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/78e99f3f/server/queue/queue-jms/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml
index 7c455af..8d6268e 100644
--- a/server/queue/queue-jms/pom.xml
+++ b/server/queue/queue-jms/pom.xml
@@ -70,8 +70,6 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
-
- <!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[26/29] james-project git commit: JAMES-2124 Respect maven sorting
order conventions
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 961f04c..cc781a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,8 +24,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache</artifactId>
<groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
<version>18</version>
<relativePath />
</parent>
@@ -903,8 +903,8 @@
<classifier>tests</classifier>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -914,8 +914,8 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -926,8 +926,8 @@
<classifier>tests</classifier>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1469,8 +1469,8 @@
<version>1.5.4</version>
<exclusions>
<exclusion>
- <artifactId>activation</artifactId>
<groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1505,28 +1505,28 @@
<version>${commons-configuration.version}</version>
<exclusions>
<exclusion>
- <artifactId>dom4j</artifactId>
<groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
</exclusion>
<exclusion>
- <artifactId>servletapi</artifactId>
<groupId>servletapi</groupId>
+ <artifactId>servletapi</artifactId>
</exclusion>
<exclusion>
- <artifactId>xerces</artifactId>
<groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
</exclusion>
<exclusion>
- <artifactId>commons-digester</artifactId>
<groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
</exclusion>
<exclusion>
- <artifactId>commons-beanutils-core</artifactId>
<groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
</exclusion>
<exclusion>
- <artifactId>commons-beanutils-bean-collections</artifactId>
<groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-bean-collections</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1541,8 +1541,8 @@
<version>${commons-dbcp.version}</version>
<exclusions>
<exclusion>
- <artifactId>xercesImpl</artifactId>
<groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1562,20 +1562,20 @@
<version>1.1</version>
<exclusions>
<exclusion>
- <artifactId>logkit</artifactId>
<groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
</exclusion>
<exclusion>
- <artifactId>avalon-framework</artifactId>
<groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
</exclusion>
<exclusion>
- <artifactId>log4j</artifactId>
<groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
<exclusion>
- <artifactId>servlet-api</artifactId>
<groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1590,16 +1590,16 @@
<version>${commons-pool.version}</version>
<exclusions>
<exclusion>
- <artifactId>xercesImpl</artifactId>
<groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
</exclusion>
<exclusion>
- <artifactId>xerces</artifactId>
<groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
</exclusion>
<exclusion>
- <artifactId>xml-apis</artifactId>
<groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1709,18 +1709,18 @@
<version>${activemq.version}</version>
<exclusions>
<exclusion>
- <artifactId>spring-osgi-core</artifactId>
<groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
</exclusion>
<!-- exlude this, its only used in the authentication plugin which we don't use -->
<exclusion>
- <artifactId>icu4j</artifactId>
<groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
</exclusion>
<!-- exclude this, we don't use osgi yet -->
<exclusion>
- <artifactId>org.osgi.core</artifactId>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1750,8 +1750,8 @@
<version>${camel.version}</version>
<exclusions>
<exclusion>
- <artifactId>spring-web</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1827,8 +1827,8 @@
<version>${httpclient-osgi.version}</version>
<exclusions>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1838,12 +1838,12 @@
<version>${jackrabbit.version}</version>
<exclusions>
<exclusion>
- <artifactId>pdfbox</artifactId>
<groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
</exclusion>
<exclusion>
- <artifactId>netcdf</artifactId>
<groupId>edu.ucar</groupId>
+ <artifactId>netcdf</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1864,12 +1864,12 @@
<type>tar.gz</type>
<exclusions>
<exclusion>
- <artifactId>org.apache.karaf.client</artifactId>
<groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.client</artifactId>
</exclusion>
<exclusion>
- <artifactId>org.eclipse.osgi</artifactId>
<groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1885,21 +1885,21 @@
<version>${apache-jspf-resolver.version}</version>
<exclusions>
<exclusion>
- <artifactId>log4j</artifactId>
<groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
<exclusion>
- <artifactId>dnsjava</artifactId>
<groupId>dnsjava</groupId>
+ <artifactId>dnsjava</artifactId>
</exclusion>
<exclusion>
- <artifactId>commons-cli</artifactId>
<groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
</exclusion>
<!-- only used for the asynchronous executors -->
<exclusion>
- <artifactId>dnsjnio</artifactId>
<groupId>uk.nominet</groupId>
+ <artifactId>dnsjnio</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1998,8 +1998,8 @@
<version>${xbean-spring.version}</version>
<exclusions>
<exclusion>
- <artifactId>spring-web</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -2174,24 +2174,24 @@
<version>${spring.version}</version>
<exclusions>
<exclusion>
- <artifactId>toplink</artifactId>
<groupId>com.oracle.toplink</groupId>
+ <artifactId>toplink</artifactId>
</exclusion>
<exclusion>
- <artifactId>toplink-essentials</artifactId>
<groupId>com.oracle</groupId>
+ <artifactId>toplink-essentials</artifactId>
</exclusion>
<exclusion>
- <artifactId>hibernate</artifactId>
<groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
</exclusion>
<exclusion>
- <artifactId>hibernate-entitymanager</artifactId>
<groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
</exclusion>
<exclusion>
- <artifactId>spring-web</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -2211,20 +2211,20 @@
<version>${spring-osgi-extender.version}</version>
<exclusions>
<exclusion>
- <artifactId>org.springframework.core</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>org.springframework.core</artifactId>
</exclusion>
<exclusion>
- <artifactId>org.springframework.aop</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>org.springframework.aop</artifactId>
</exclusion>
<exclusion>
- <artifactId>org.springframework.context</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>org.springframework.context</artifactId>
</exclusion>
<exclusion>
- <artifactId>org.springframework.beans</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>org.springframework.beans</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -2252,14 +2252,6 @@
</dependencyManagement>
<build>
- <extensions>
- <extension>
- <!-- Adding a Protocol to Deploy the Site (support for ssh/scp) -->
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>2.0</version>
- </extension>
- </extensions>
<pluginManagement>
<plugins>
<!-- Order by groupId / artifactId / scope -->
@@ -2465,6 +2457,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>attach-descriptor</id>
@@ -2473,13 +2472,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh</artifactId>
- <version>2.0</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -2687,10 +2679,10 @@
<executions>
<execution>
<id>jar</id>
- <phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
+ <phase>package</phase>
<configuration>
<archive>
<manifest>
@@ -2702,10 +2694,10 @@
</execution>
<execution>
<id>test-jar</id>
- <phase>package</phase>
<goals>
<goal>test-jar</goal>
</goals>
+ <phase>package</phase>
<configuration>
<archive>
<manifest>
@@ -2736,24 +2728,16 @@
<executions>
<execution>
<id>site</id>
- <phase>site</phase>
<goals>
<goal>generate</goal>
</goals>
+ <phase>site</phase>
</execution>
</executions>
</plugin>
<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>
<inputEncoding>UTF-8</inputEncoding>
<outputEncoding>UTF-8</outputEncoding>
@@ -2783,28 +2767,44 @@
</plugin>
</reportPlugins>
</configuration>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.3</version>
+ </dependency>
+ </dependencies>
</plugin>
<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>
- <phase>test</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>test</phase>
</execution>
</executions>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java18</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
</plugin>
</plugins>
+ <extensions>
+ <extension>
+ <!-- Adding a Protocol to Deploy the Site (support for ssh/scp) -->
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>2.0</version>
+ </extension>
+ </extensions>
</build>
<profiles>
@@ -2814,6 +2814,13 @@
-->
<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>
@@ -2821,13 +2828,6 @@
<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">
@@ -3010,17 +3010,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/2a8b24d1/protocols/api/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/api/pom.xml b/protocols/api/pom.xml
index f53e17f..9521fac 100644
--- a/protocols/api/pom.xml
+++ b/protocols/api/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>protocols</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>protocols</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/protocols/imap/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml
index 54e7dde..b3add62 100644
--- a/protocols/imap/pom.xml
+++ b/protocols/imap/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>protocols</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>protocols</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -130,8 +130,8 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <artifactId>junit-dep</artifactId>
<groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
</exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/protocols/lmtp/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/lmtp/pom.xml b/protocols/lmtp/pom.xml
index 90da688..c600ec4 100644
--- a/protocols/lmtp/pom.xml
+++ b/protocols/lmtp/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>protocols</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>protocols</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/protocols/managesieve/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/managesieve/pom.xml b/protocols/managesieve/pom.xml
index 0b85749..6fe4f15 100644
--- a/protocols/managesieve/pom.xml
+++ b/protocols/managesieve/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>protocols</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>protocols</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/protocols/netty/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/netty/pom.xml b/protocols/netty/pom.xml
index a7ad855..4c028ef 100644
--- a/protocols/netty/pom.xml
+++ b/protocols/netty/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>protocols</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>protocols</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -62,4 +62,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/protocols/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/pom.xml b/protocols/pom.xml
index 3b5d39b..8b90a14 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-project</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-project</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/protocols/pop3/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/pop3/pom.xml b/protocols/pop3/pom.xml
index 30fc2ce..91481d7 100644
--- a/protocols/pop3/pom.xml
+++ b/protocols/pop3/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>protocols</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>protocols</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/protocols/smtp/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/smtp/pom.xml b/protocols/smtp/pom.xml
index b27986e..497ff47 100644
--- a/protocols/smtp/pom.xml
+++ b/protocols/smtp/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>protocols</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>protocols</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -106,10 +106,10 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
+ <phase>package</phase>
<configuration>
<artifactSet>
<includes>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/app/pom.xml
----------------------------------------------------------------------
diff --git a/server/app/pom.xml b/server/app/pom.xml
index 5e0d744..65af04e 100644
--- a/server/app/pom.xml
+++ b/server/app/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -77,8 +77,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -88,8 +88,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -99,8 +99,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -110,16 +110,16 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
</exclusion>
<exclusion>
- <artifactId>hadoop-core</artifactId>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
</exclusion>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -132,8 +132,8 @@
<artifactId>james-server-core</artifactId>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -142,8 +142,8 @@
<artifactId>james-server-data-api</artifactId>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -154,8 +154,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -165,24 +165,24 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>jruby-complete</artifactId>
<groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
</exclusion>
<exclusion>
- <artifactId>hsqldb</artifactId>
<groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
</exclusion>
<exclusion>
- <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
</exclusion>
<exclusion>
- <artifactId>hadoop-core</artifactId>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
</exclusion>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -192,8 +192,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -203,8 +203,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -224,8 +224,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -244,8 +244,8 @@
<artifactId>james-server-dnsservice-library</artifactId>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -255,8 +255,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -274,8 +274,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -284,8 +284,8 @@
<artifactId>james-server-mailetcontainer-api</artifactId>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -295,8 +295,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -306,8 +306,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -327,8 +327,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -343,8 +343,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -355,8 +355,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -366,8 +366,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -376,8 +376,8 @@
<artifactId>james-server-queue-api</artifactId>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -387,8 +387,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -398,8 +398,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -408,16 +408,16 @@
<artifactId>james-server-spring</artifactId>
<exclusions>
<exclusion>
- <artifactId>spring-osgi-extender</artifactId>
<groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
</exclusion>
<exclusion>
- <artifactId>org.osgi.core</artifactId>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
</exclusion>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -427,8 +427,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -454,8 +454,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>tools</artifactId>
<groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -465,8 +465,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>tools</artifactId>
<groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -564,8 +564,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -575,8 +575,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -600,8 +600,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -634,8 +634,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -650,20 +650,20 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
<exclusion>
- <artifactId>lucene-core</artifactId>
<groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
</exclusion>
<exclusion>
- <artifactId>lucene-analyzers</artifactId>
<groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers</artifactId>
</exclusion>
<exclusion>
- <artifactId>lucene-smartcn</artifactId>
<groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-smartcn</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -680,16 +680,6 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
<version>1.10</version>
- <executions>
- <execution>
- <id>make-appassemble</id>
- <phase>package</phase>
- <goals>
- <goal>assemble</goal>
- <goal>generate-daemons</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<!-- Include etc/ in the beginning of the classpath declaration in the bin scripts -->
<includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
@@ -928,6 +918,16 @@
</daemon>
</daemons>
</configuration>
+ <executions>
+ <execution>
+ <id>make-appassemble</id>
+ <goals>
+ <goal>assemble</goal>
+ <goal>generate-daemons</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -935,10 +935,10 @@
<version>1.2</version>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>run</goal>
</goals>
+ <phase>package</phase>
<configuration>
<tasks>
@@ -967,19 +967,19 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
<executions>
<execution>
<id>make-assembly</id>
- <phase>package</phase>
<goals>
<goal>attached</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
- <configuration>
- <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
</plugin>
<!--
The signing process excludes the artifact created by this plugin.
@@ -990,15 +990,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <executions>
- <execution>
- <id>make-war</id>
- <phase>package</phase>
- <goals>
- <goal>war</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<webResources>
<resource>
@@ -1047,6 +1038,15 @@
</resource>
</webResources>
</configuration>
+ <executions>
+ <execution>
+ <id>make-war</id>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/cli-integration/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/cli-integration/pom.xml b/server/container/cli-integration/pom.xml
index 394b7c2..617239c 100644
--- a/server/container/cli-integration/pom.xml
+++ b/server/container/cli-integration/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/cli/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/cli/pom.xml b/server/container/cli/pom.xml
index fb94d41..934d9f7 100644
--- a/server/container/cli/pom.xml
+++ b/server/container/cli/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -81,6 +81,9 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
+ <configuration>
+ <mainClass>org.apache.james.cli.ServerCmd</mainClass>
+ </configuration>
<executions>
<execution>
<goals>
@@ -88,9 +91,6 @@
</goals>
</execution>
</executions>
- <configuration>
- <mainClass>org.apache.james.cli.ServerCmd</mainClass>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -103,10 +103,10 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>package</phase>
<configuration>
<outputDirectory>${project.build.directory}/${project.artifactId}.lib</outputDirectory>
</configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/core/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml
index 7fdc7f5..f415824 100644
--- a/server/container/core/pom.xml
+++ b/server/container/core/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/filesystem-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/filesystem-api/pom.xml b/server/container/filesystem-api/pom.xml
index deb9258..6391a76 100644
--- a/server/container/filesystem-api/pom.xml
+++ b/server/container/filesystem-api/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/cassandra-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml
index 305b480..6b4c2ae 100644
--- a/server/container/guice/cassandra-guice/pom.xml
+++ b/server/container/guice/cassandra-guice/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -253,10 +253,10 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>package</phase>
<configuration>
<outputDirectory>${project.build.directory}/${project.artifactId}.lib</outputDirectory>
</configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/cassandra-ldap-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-ldap-guice/pom.xml b/server/container/guice/cassandra-ldap-guice/pom.xml
index 6510d26..f434eaf 100644
--- a/server/container/guice/cassandra-ldap-guice/pom.xml
+++ b/server/container/guice/cassandra-ldap-guice/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -132,10 +132,10 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>package</phase>
<configuration>
<outputDirectory>${project.build.directory}/${project.artifactId}.lib</outputDirectory>
</configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/configuration/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/configuration/pom.xml b/server/container/guice/configuration/pom.xml
index 4cb99d3..51a505b 100644
--- a/server/container/guice/configuration/pom.xml
+++ b/server/container/guice/configuration/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/custom-mailets/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/custom-mailets/pom.xml b/server/container/guice/custom-mailets/pom.xml
index e6d596e..6b99f1c 100644
--- a/server/container/guice/custom-mailets/pom.xml
+++ b/server/container/guice/custom-mailets/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/guice-common/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml
index fdff922..25a67c7 100644
--- a/server/container/guice/guice-common/pom.xml
+++ b/server/container/guice/guice-common/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/jmx/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jmx/pom.xml b/server/container/guice/jmx/pom.xml
index 59cfeaf..df9326f 100644
--- a/server/container/guice/jmx/pom.xml
+++ b/server/container/guice/jmx/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/jpa-common-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-common-guice/pom.xml b/server/container/guice/jpa-common-guice/pom.xml
index 7680b06..3aa275f 100644
--- a/server/container/guice/jpa-common-guice/pom.xml
+++ b/server/container/guice/jpa-common-guice/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/jpa-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-guice/pom.xml b/server/container/guice/jpa-guice/pom.xml
index 6554fc7..99e7030 100644
--- a/server/container/guice/jpa-guice/pom.xml
+++ b/server/container/guice/jpa-guice/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -161,10 +161,10 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>package</phase>
<configuration>
<outputDirectory>${project.build.directory}/${project.artifactId}.lib</outputDirectory>
</configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/jpa-smtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/container/guice/jpa-smtp/pom.xml
index 7e6034f..1d6e2b5 100644
--- a/server/container/guice/jpa-smtp/pom.xml
+++ b/server/container/guice/jpa-smtp/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -103,8 +103,8 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -137,10 +137,10 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>package</phase>
<configuration>
<outputDirectory>${project.build.directory}/${project.artifactId}.lib</outputDirectory>
</configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/mailbox/pom.xml b/server/container/guice/mailbox/pom.xml
index 4ec9b92..e64a86a 100644
--- a/server/container/guice/mailbox/pom.xml
+++ b/server/container/guice/mailbox/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/mailet/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/mailet/pom.xml b/server/container/guice/mailet/pom.xml
index e3d7796..25cddf2 100644
--- a/server/container/guice/mailet/pom.xml
+++ b/server/container/guice/mailet/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/memory-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/pom.xml b/server/container/guice/memory-guice/pom.xml
index 7f6a4d1..5f07851 100644
--- a/server/container/guice/memory-guice/pom.xml
+++ b/server/container/guice/memory-guice/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -136,10 +136,10 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>package</phase>
<configuration>
<outputDirectory>${project.build.directory}/${project.build.finalName}.lib</outputDirectory>
</configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/onami/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/onami/pom.xml b/server/container/guice/onami/pom.xml
index a9036fd..9e14e6f 100644
--- a/server/container/guice/onami/pom.xml
+++ b/server/container/guice/onami/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
@@ -55,4 +55,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml
index 50a99be..07380bf 100644
--- a/server/container/guice/pom.xml
+++ b/server/container/guice/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/protocols/imap/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/imap/pom.xml b/server/container/guice/protocols/imap/pom.xml
index d895c84..578b51c 100644
--- a/server/container/guice/protocols/imap/pom.xml
+++ b/server/container/guice/protocols/imap/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/protocols/jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/jmap/pom.xml b/server/container/guice/protocols/jmap/pom.xml
index fb72ece..68e2c14 100644
--- a/server/container/guice/protocols/jmap/pom.xml
+++ b/server/container/guice/protocols/jmap/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/protocols/lmtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/lmtp/pom.xml b/server/container/guice/protocols/lmtp/pom.xml
index cda2c6e..8c3a35c 100644
--- a/server/container/guice/protocols/lmtp/pom.xml
+++ b/server/container/guice/protocols/lmtp/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/protocols/managedsieve/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/managedsieve/pom.xml b/server/container/guice/protocols/managedsieve/pom.xml
index 78066ba..4df5111 100644
--- a/server/container/guice/protocols/managedsieve/pom.xml
+++ b/server/container/guice/protocols/managedsieve/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/protocols/pop/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/pop/pom.xml b/server/container/guice/protocols/pop/pom.xml
index fad870c..b5375c1 100644
--- a/server/container/guice/protocols/pop/pom.xml
+++ b/server/container/guice/protocols/pop/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/protocols/smtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/smtp/pom.xml b/server/container/guice/protocols/smtp/pom.xml
index 3928544..3b1e6a1 100644
--- a/server/container/guice/protocols/smtp/pom.xml
+++ b/server/container/guice/protocols/smtp/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/protocols/webadmin-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-cassandra/pom.xml b/server/container/guice/protocols/webadmin-cassandra/pom.xml
index 3f438ad..170d5a3 100644
--- a/server/container/guice/protocols/webadmin-cassandra/pom.xml
+++ b/server/container/guice/protocols/webadmin-cassandra/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/protocols/webadmin-data/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-data/pom.xml b/server/container/guice/protocols/webadmin-data/pom.xml
index 5e5d068..2e4f2ec 100644
--- a/server/container/guice/protocols/webadmin-data/pom.xml
+++ b/server/container/guice/protocols/webadmin-data/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/protocols/webadmin-mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-mailbox/pom.xml b/server/container/guice/protocols/webadmin-mailbox/pom.xml
index 9ca7ef9..1a8bbac 100644
--- a/server/container/guice/protocols/webadmin-mailbox/pom.xml
+++ b/server/container/guice/protocols/webadmin-mailbox/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/protocols/webadmin-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-swagger/pom.xml b/server/container/guice/protocols/webadmin-swagger/pom.xml
index 3cd8701..43e5507 100644
--- a/server/container/guice/protocols/webadmin-swagger/pom.xml
+++ b/server/container/guice/protocols/webadmin-swagger/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/protocols/webadmin/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin/pom.xml b/server/container/guice/protocols/webadmin/pom.xml
index 33b26d1..8797883 100644
--- a/server/container/guice/protocols/webadmin/pom.xml
+++ b/server/container/guice/protocols/webadmin/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/jetty/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/jetty/pom.xml b/server/container/jetty/pom.xml
index 33cbf0c..ae4a65c 100644
--- a/server/container/jetty/pom.xml
+++ b/server/container/jetty/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/lifecycle-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/lifecycle-api/pom.xml b/server/container/lifecycle-api/pom.xml
index 6c81796..de2ff8c 100644
--- a/server/container/lifecycle-api/pom.xml
+++ b/server/container/lifecycle-api/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/mailbox-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/mailbox-adapter/pom.xml b/server/container/mailbox-adapter/pom.xml
index b8e94f5..14dd278 100644
--- a/server/container/mailbox-adapter/pom.xml
+++ b/server/container/mailbox-adapter/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/metrics/metrics-es-reporter/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/metrics/metrics-es-reporter/pom.xml b/server/container/metrics/metrics-es-reporter/pom.xml
index b40cb91..6c1a197 100644
--- a/server/container/metrics/metrics-es-reporter/pom.xml
+++ b/server/container/metrics/metrics-es-reporter/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/spring/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml
index f8299fe..e28ba6e 100644
--- a/server/container/spring/pom.xml
+++ b/server/container/spring/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -115,8 +115,8 @@
<version>${activemq.version}</version>
<exclusions>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -155,20 +155,20 @@
<scope>compile</scope>
<exclusions>
<exclusion>
- <artifactId>spring-core</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
- <artifactId>spring-beans</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
- <artifactId>spring-aop</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
</exclusion>
<exclusion>
- <artifactId>spring-tx</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
</exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/util-java8/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/util-java8/pom.xml b/server/container/util-java8/pom.xml
index 7da0ffe..d98a650 100644
--- a/server/container/util-java8/pom.xml
+++ b/server/container/util-java8/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/util/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/util/pom.xml b/server/container/util/pom.xml
index 1577010..8e0d38b 100644
--- a/server/container/util/pom.xml
+++ b/server/container/util/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-api/pom.xml b/server/data/data-api/pom.xml
index 7b3ffa9..4ba82a0 100644
--- a/server/data/data-api/pom.xml
+++ b/server/data/data-api/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/pom.xml b/server/data/data-cassandra/pom.xml
index 62a3cd6..e4e8377 100644
--- a/server/data/data-cassandra/pom.xml
+++ b/server/data/data-cassandra/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-file/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-file/pom.xml b/server/data/data-file/pom.xml
index aea1655..264365a 100644
--- a/server/data/data-file/pom.xml
+++ b/server/data/data-file/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/pom.xml b/server/data/data-hbase/pom.xml
index 2a37e64..027ad55 100644
--- a/server/data/data-hbase/pom.xml
+++ b/server/data/data-hbase/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -113,8 +113,8 @@
<artifactId>hadoop-core</artifactId>
<exclusions>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -128,20 +128,20 @@
<artifactId>hbase</artifactId>
<exclusions>
<exclusion>
- <artifactId>jruby-complete</artifactId>
<groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
</exclusion>
<exclusion>
- <artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
- <artifactId>log4j</artifactId>
<groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -152,8 +152,8 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <artifactId>jruby-complete</artifactId>
<groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
</exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-jcr/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/pom.xml b/server/data/data-jcr/pom.xml
index 06c988d..457da4e 100644
--- a/server/data/data-jcr/pom.xml
+++ b/server/data/data-jcr/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[17/29] james-project git commit: JAMES-2124 Update maven
contribution requirement
Posted by bt...@apache.org.
JAMES-2124 Update maven contribution requirement
Especially document the dependency ordering maven module usage.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/5a756048
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/5a756048
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/5a756048
Branch: refs/heads/master
Commit: 5a7560482e16852403c7d2e70f046967553db9c1
Parents: 33a6d55
Author: benwa <bt...@linagora.com>
Authored: Mon Aug 21 10:54:44 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 25 18:17:27 2017 +0700
----------------------------------------------------------------------
src/site/xdoc/contribute.xml | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/5a756048/src/site/xdoc/contribute.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/contribute.xml b/src/site/xdoc/contribute.xml
index 5d55caa..99f0259 100644
--- a/src/site/xdoc/contribute.xml
+++ b/src/site/xdoc/contribute.xml
@@ -257,12 +257,28 @@
<p>
6.
<strong>pom.xml</strong>
- files shall follow the same ordering as seen in the reference
- of
- the
- <a href="http://maven.apache.org/ref/3.0.3/maven-model/maven.html">Maven Model</a>
- ,
- split multiple attributes each on a new line.
+
+ <br/>
+ We also require the following best practice regarding maven:
+ <ul>
+ <li>Define your dependency versions in james-project pom.xml. This structurally ensures all projects get the
+ same version, and that there is no version clashes.</li>
+ <li>Don't use <i>org.apache.james</i> groupId for your dependencies. Use <i>${project.groupId}</i>.
+ If not, you break the policies for automatic sorting, as well as make it more ambiguous.</li>
+ <li>You should be ordering your dependencies. The sort order is:
+ <ul>
+ <ol>If the project is part of org.james.apache groupId? Internal dependencies goes first.</ol>
+ <ol>Then we order by groupId</ol>
+ <ol>Then we order by artifactId</ol>
+ <ol>Then we order by type. <i>test-jar</i> goes last.</ol>
+ </ul>
+ Hopefully, some tools are doing this sorting for you:</li>
+ </ul>
+ <pre>
+ <code>mvn com.github.ekryd.sortpom:sortpom-maven-plugin:sort -Dsort.keepBlankLines -Dsort.sortDependencies=groupId,artifactId -Dsort.nrOfIndentSpace=4 -Dsort.createBackupFile=false -Dsort.sortModules=true -Dsort.sortModules=true</code>
+ </pre>
+ <p>You should also split multiple attributes each on a new line.</p>
+ <p>You should ensure your POM files, as well as sections ordering follows the <a href="http://maven.apache.org/ref/3.0.3/maven-model/maven.html">Maven Model</a></p>
</p>
<p>
<strong>Eclipse IDE</strong>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[15/29] james-project git commit: JAMES-2124 Merge dependency
management in parent POM
Posted by bt...@apache.org.
JAMES-2124 Merge dependency management in parent POM
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ab4aec5f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ab4aec5f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ab4aec5f
Branch: refs/heads/master
Commit: ab4aec5f170bf83faea7a1975680c731bbb985e2
Parents: dbd6223
Author: benwa <bt...@linagora.com>
Authored: Fri Aug 18 18:38:51 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 25 18:17:05 2017 +0700
----------------------------------------------------------------------
backends-common/pom.xml | 57 --
mailbox/pom.xml | 479 ------------
mailet/pom.xml | 187 -----
mailet/standard/pom.xml | 2 +-
mpt/pom.xml | 420 -----------
pom.xml | 1699 ++++++++++++++++++++++++++++++++++++++++++
protocols/pom.xml | 13 -
server/pom.xml | 1532 -------------------------------------
8 files changed, 1700 insertions(+), 2689 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ab4aec5f/backends-common/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/pom.xml b/backends-common/pom.xml
index df1ffb0..c7adbcf 100644
--- a/backends-common/pom.xml
+++ b/backends-common/pom.xml
@@ -39,61 +39,4 @@
<module>jpa</module>
</modules>
- <properties>
- <junit.version>4.11</junit.version>
- <slf4j.version>1.7.25</slf4j.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-util-java8</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>18.0</version>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>3.8.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
- <version>1.4.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ab4aec5f/mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index 2470a49..93994d2 100644
--- a/mailbox/pom.xml
+++ b/mailbox/pom.xml
@@ -61,487 +61,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <javax.activation.groupId>javax.activation</javax.activation.groupId>
- <javax.activation.artifactId>activation</javax.activation.artifactId>
- <javax.persistence.version>1.0.2</javax.persistence.version>
- <javax.inject.version>1</javax.inject.version>
- <apache-mime4j.version>0.8.1</apache-mime4j.version>
- <activation.version>1.1.1</activation.version>
- <jmock.version>2.5.1</jmock.version>
- <hbase.version>0.94.27</hbase.version>
- <hadoop.version>1.0.1</hadoop.version>
- <spring.version>3.2.14.RELEASE</spring.version>
- <commons-io.version>2.4</commons-io.version>
- <commons-lang.version>2.6</commons-lang.version>
- <commons-pool.version>1.6</commons-pool.version>
- <commons-codec.version>1.7</commons-codec.version>
- <commons-dbcp.version>1.4</commons-dbcp.version>
- <commons-configuration.version>1.9</commons-configuration.version>
- <commons-beanutils-core.version>1.8.3</commons-beanutils-core.version>
- <h2.version>1.3.170</h2.version>
- <derby.version>10.9.1.0</derby.version>
- <jcr.version>2.0</jcr.version>
- <jackrabbit.version>2.5.2</jackrabbit.version>
- <lucene.version>3.6.0</lucene.version>
- <xercesImpl.version>2.9.1</xercesImpl.version>
- <xml-apis.version>1.3.04</xml-apis.version>
- <geronimo-annotation-spec.version>1.1.1</geronimo-annotation-spec.version>
- <geronimo-activation-spec.version>1.1</geronimo-activation-spec.version>
- <slf4j.version>1.7.25</slf4j.version>
- <junit.version>4.11</junit.version>
- <mockito-core.version>1.9.0</mockito-core.version>
- <jasypt.version>1.9.0</jasypt.version>
- <guava.version>18.0</guava.version>
- <jackson-databinding.version>2.6.3</jackson-databinding.version>
- <cassandra-unit.version>2.1.9.2</cassandra-unit.version>
- <logback.version>1.1.7</logback.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-es</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-es</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-jpa</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-jpa</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-cassandra</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-elasticsearch</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-elasticsearch</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-hbase</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jcr</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jpa</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-lucene</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-lucene</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-maildir</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tika</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tika</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tool</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-api</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>mail</artifactId>
- <groupId>javax.mail</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mime4j-core</artifactId>
- <version>${apache-mime4j.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- <version>${apache-mime4j.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mime4j-james-utils</artifactId>
- <version>${apache-mime4j.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-util</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-util-java8</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>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson-databinding.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-guava</artifactId>
- <version>${jackson-databinding.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jdk8</artifactId>
- <version>${jackson-databinding.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>${guava.version}</version>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>${h2.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <version>1.5.4</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- <version>${commons-beanutils-core.version}</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>${commons-configuration.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>dom4j</artifactId>
- <groupId>dom4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>servletapi</artifactId>
- <groupId>servletapi</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xerces</artifactId>
- <groupId>xerces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-digester</artifactId>
- <groupId>commons-digester</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-beanutils-core</artifactId>
- <groupId>commons-beanutils</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-beanutils-bean-collections</artifactId>
- <groupId>commons-beanutils</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>${commons-dbcp.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>xercesImpl</artifactId>
- <groupId>xerces</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>${commons-pool.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>${activation.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>${javax.inject.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>${jcr.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>nl.jqno.equalsverifier</groupId>
- <artifactId>equalsverifier</artifactId>
- <version>1.7.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>${geronimo-activation-spec.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>${geronimo-annotation-spec.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <version>${hadoop.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>${hbase.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>jackson-core-asl</artifactId>
- <groupId>org.codehaus.jackson</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jackson-mapper-asl</artifactId>
- <groupId>org.codehaus.jackson</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>${hbase.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <version>${jackrabbit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
- <version>${jackrabbit.version}</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>3.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.jasypt</groupId>
- <artifactId>jasypt</artifactId>
- <version>${jasypt.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito-core.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
- <version>1.3.1</version>
- </dependency>
- <dependency>
- <groupId>org.xenei</groupId>
- <artifactId>junit-contracts</artifactId>
- <version>0.1.5</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xercesImpl.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${xml-apis.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<repositories>
<!-- apache.snapshot is needed for james-project SNAPSHOT, see JAMES-1470 -->
<repository>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ab4aec5f/mailet/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/pom.xml b/mailet/pom.xml
index 3dac297..f9ffb34 100644
--- a/mailet/pom.xml
+++ b/mailet/pom.xml
@@ -61,195 +61,8 @@
<properties>
<!-- Override the source descriptor -->
<sourceReleaseAssemblyDescriptor>project</sourceReleaseAssemblyDescriptor>
- <plugin.mailetdocs.version>0.1</plugin.mailetdocs.version>
- <javax.inject.version>1</javax.inject.version>
- <junit.version>4.10</junit.version>
- <activation.version>1.1.1</activation.version>
- <commons-collections.version>3.2.1</commons-collections.version>
- <commons-io.version>2.4</commons-io.version>
- <commons-lang.version>2.6</commons-lang.version>
- <commons-lang3.version>3.3.2</commons-lang3.version>
- <httpclient-osgi.version>4.5.1</httpclient-osgi.version>
- <!-- maven-mailetdocs-plugin artifacts -->
- <maven-artifact.version>3.0-alpha-1</maven-artifact.version>
- <maven-plugin-annotations.version>3.4</maven-plugin-annotations.version>
- <maven-plugin-api.version>3.2.5</maven-plugin-api.version>
- <maven-reporting-impl.version>2.2</maven-reporting-impl.version>
- <maven-reporting-api.version>3.0</maven-reporting-api.version>
- <mime4j.version>0.8.1</mime4j.version>
- <qdox.version>1.12.1</qdox.version>
- <slf4j.version>1.7.25</slf4j.version>
- <jackson-data.version>2.6.3</jackson-data.version>
- <ical4j.version>2.0.2</ical4j.version>
- <guavate.version>1.0.0</guavate.version>
- <apache-commons-io.version>1.3.2</apache-commons-io.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mime4j-core</artifactId>
- <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>
- </dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <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>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>${javax.inject.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- <version>${apache-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>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <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-api</artifactId>
- <version>${maven-reporting-api.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.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>3.8.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-guava</artifactId>
- <version>3.1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk15on</artifactId>
- <version>1.52</version>
- </dependency>
- <dependency>
- <groupId>org.mnode.ical4j</groupId>
- <artifactId>ical4j</artifactId>
- <version>${ical4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>1.9.5</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<build>
<pluginManagement>
<plugins>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ab4aec5f/mailet/standard/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml
index 0551644..7ad13a5 100644
--- a/mailet/standard/pom.xml
+++ b/mailet/standard/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
- <version>${mime4j.version}</version>
+ <version>${apache-mime4j.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ab4aec5f/mpt/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/pom.xml b/mpt/pom.xml
index 5bea082..67a10d9 100644
--- a/mpt/pom.xml
+++ b/mpt/pom.xml
@@ -69,426 +69,6 @@
<logback.version>1.1.7</logback.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <!-- Other Apache James sub projects -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-es</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-es</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-jpa</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-cassandra</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-cassandra</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-elasticsearch</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-elasticsearch</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-hbase</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jcr</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jpa</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jpa</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-lucene</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-lucene</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-maildir</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <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-mpt-antlib</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-antlib</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-app</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-app</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-core</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-cassandra-guice</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-cassandra-guice</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-cassandra</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-file</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-memory</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-common</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-jmap</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </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>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>metrics-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>metrics-logger</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
- <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>
- </dependency>
- <dependency>
- <groupId>com.spotify</groupId>
- <artifactId>docker-client</artifactId>
- <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>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- <exclusions>
- <exclusion>
- <artifactId>logkit</artifactId>
- <groupId>logkit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>avalon-framework</artifactId>
- <groupId>avalon-framework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <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>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>${hbase.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <version>${jackrabbit-core.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>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-managesieve</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <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>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- <version>${jmock.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>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
- <version>1.4.2</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
<build>
<plugins>
<plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[07/29] james-project git commit: JAMES-2124 automatically sort all
dependencies
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/jmap/pom.xml b/server/container/guice/protocols/jmap/pom.xml
index 5bcc8bf..fb72ece 100644
--- a/server/container/guice/protocols/jmap/pom.xml
+++ b/server/container/guice/protocols/jmap/pom.xml
@@ -18,13 +18,13 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-guice-jmap</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/lmtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/lmtp/pom.xml b/server/container/guice/protocols/lmtp/pom.xml
index 7c757f4..cda2c6e 100644
--- a/server/container/guice/protocols/lmtp/pom.xml
+++ b/server/container/guice/protocols/lmtp/pom.xml
@@ -18,13 +18,13 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-guice-lmtp</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/managedsieve/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/managedsieve/pom.xml b/server/container/guice/protocols/managedsieve/pom.xml
index 6fde962..78066ba 100644
--- a/server/container/guice/protocols/managedsieve/pom.xml
+++ b/server/container/guice/protocols/managedsieve/pom.xml
@@ -18,13 +18,13 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-guice-managedsieve</artifactId>
@@ -45,10 +45,6 @@
<artifactId>james-server-protocols-managesieve</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-managesieve</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
@@ -56,6 +52,10 @@
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-managesieve</artifactId>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/pop/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/pop/pom.xml b/server/container/guice/protocols/pop/pom.xml
index 565b4f0..fad870c 100644
--- a/server/container/guice/protocols/pop/pom.xml
+++ b/server/container/guice/protocols/pop/pom.xml
@@ -18,13 +18,13 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-guice-pop</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/smtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/smtp/pom.xml b/server/container/guice/protocols/smtp/pom.xml
index 908122f..3928544 100644
--- a/server/container/guice/protocols/smtp/pom.xml
+++ b/server/container/guice/protocols/smtp/pom.xml
@@ -18,13 +18,13 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-guice-smtp</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/webadmin-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-cassandra/pom.xml b/server/container/guice/protocols/webadmin-cassandra/pom.xml
index 91aa5a8..3f438ad 100644
--- a/server/container/guice/protocols/webadmin-cassandra/pom.xml
+++ b/server/container/guice/protocols/webadmin-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>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-guice-webadmin-cassandra</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/webadmin-data/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-data/pom.xml b/server/container/guice/protocols/webadmin-data/pom.xml
index b98c809..5e5d068 100644
--- a/server/container/guice/protocols/webadmin-data/pom.xml
+++ b/server/container/guice/protocols/webadmin-data/pom.xml
@@ -18,13 +18,13 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-guice-webadmin-data</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/webadmin-mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-mailbox/pom.xml b/server/container/guice/protocols/webadmin-mailbox/pom.xml
index b295e92..9ca7ef9 100644
--- a/server/container/guice/protocols/webadmin-mailbox/pom.xml
+++ b/server/container/guice/protocols/webadmin-mailbox/pom.xml
@@ -18,13 +18,13 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-guice-webadmin-mailbox</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/webadmin-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-swagger/pom.xml b/server/container/guice/protocols/webadmin-swagger/pom.xml
index 05adf0d..3cd8701 100644
--- a/server/container/guice/protocols/webadmin-swagger/pom.xml
+++ b/server/container/guice/protocols/webadmin-swagger/pom.xml
@@ -18,13 +18,13 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-guice-webadmin-swagger</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/webadmin/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin/pom.xml b/server/container/guice/protocols/webadmin/pom.xml
index 5d6e1a6..33b26d1 100644
--- a/server/container/guice/protocols/webadmin/pom.xml
+++ b/server/container/guice/protocols/webadmin/pom.xml
@@ -18,13 +18,13 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-guice-webadmin</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/mailbox-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/mailbox-adapter/pom.xml b/server/container/mailbox-adapter/pom.xml
index f30b911..b8e94f5 100644
--- a/server/container/mailbox-adapter/pom.xml
+++ b/server/container/mailbox-adapter/pom.xml
@@ -35,50 +35,50 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
+ <artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
+ <artifactId>apache-james-mailbox-maildir</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util-java8</artifactId>
+ <artifactId>apache-james-mailbox-memory</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
+ <artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
+ <artifactId>apache-james-mailbox-store</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
+ <artifactId>apache-james-mailbox-tool</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-maildir</artifactId>
+ <artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tool</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -99,6 +99,10 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/metrics/metrics-es-reporter/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/metrics/metrics-es-reporter/pom.xml b/server/container/metrics/metrics-es-reporter/pom.xml
index 1635a22..b40cb91 100644
--- a/server/container/metrics/metrics-es-reporter/pom.xml
+++ b/server/container/metrics/metrics-es-reporter/pom.xml
@@ -18,13 +18,13 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>metrics-es-reporter</artifactId>
@@ -35,13 +35,13 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>metrics-dropwizard</artifactId>
+ <artifactId>james-server-util-java8</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util-java8</artifactId>
- <type>test-jar</type>
+ <artifactId>metrics-dropwizard</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -68,12 +68,12 @@
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
- <artifactId>metrics-elasticsearch-reporter</artifactId>
+ <artifactId>elasticsearch</artifactId>
+ <version>2.2.1</version>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
- <version>2.2.1</version>
+ <artifactId>metrics-elasticsearch-reporter</artifactId>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
@@ -90,4 +90,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/spring/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml
index de37a0b..f8299fe 100644
--- a/server/container/spring/pom.xml
+++ b/server/container/spring/pom.xml
@@ -35,37 +35,37 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
+ <artifactId>apache-james-mailbox-tool</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
+ <artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailetcontainer-api</artifactId>
+ <artifactId>james-server-core</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-library</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
+ <artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-core</artifactId>
+ <artifactId>james-server-filesystem-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -73,30 +73,69 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tool</artifactId>
+ <artifactId>james-server-mailetcontainer-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-protocols-library</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sparkjava</groupId>
+ <artifactId>spark-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-spring</artifactId>
+ <version>${activemq.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-api</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-spring</artifactId>
- <version>${activemq.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -108,24 +147,28 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<scope>compile</scope>
<exclusions>
<exclusion>
- <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
+ <groupId>org.springframework</groupId>
</exclusion>
<exclusion>
- <groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
+ <groupId>org.springframework</groupId>
</exclusion>
<exclusion>
- <groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
+ <groupId>org.springframework</groupId>
</exclusion>
<exclusion>
- <groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
+ <groupId>org.springframework</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -138,49 +181,6 @@
<artifactId>spring-osgi-extender</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sparkjava</groupId>
- <artifactId>spark-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>pl.pragmatists</groupId>
<artifactId>JUnitParams</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/util-java8/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/util-java8/pom.xml b/server/container/util-java8/pom.xml
index 92da74f..7da0ffe 100644
--- a/server/container/util-java8/pom.xml
+++ b/server/container/util-java8/pom.xml
@@ -30,7 +30,6 @@
<artifactId>james-server-util-java8</artifactId>
<name>Apache James :: Server :: Common Utilities :: Java 8</name>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -66,6 +65,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>nl.jqno.equalsverifier</groupId>
+ <artifactId>equalsverifier</artifactId>
+ <version>1.7.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
@@ -79,12 +84,6 @@
<artifactId>testcontainers</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>nl.jqno.equalsverifier</groupId>
- <artifactId>equalsverifier</artifactId>
- <scope>test</scope>
- <version>1.7.6</version>
- </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/util/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/util/pom.xml b/server/container/util/pom.xml
index 48f4e75..1577010 100644
--- a/server/container/util/pom.xml
+++ b/server/container/util/pom.xml
@@ -34,16 +34,12 @@
<dependencies>
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -55,6 +51,10 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/pom.xml b/server/data/data-cassandra/pom.xml
index bbd8dff..9761dd5 100644
--- a/server/data/data-cassandra/pom.xml
+++ b/server/data/data-cassandra/pom.xml
@@ -35,6 +35,15 @@
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
</dependency>
+
+ <!-- Test dependencies -->
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-backends-cassandra</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
@@ -45,7 +54,19 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-dnsservice-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -64,31 +85,6 @@
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <!-- Test dependencies -->
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-java</artifactId>
<scope>test</scope>
@@ -125,11 +121,24 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>noTest</id>
@@ -152,13 +161,4 @@
</profile>
</profiles>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-file/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-file/pom.xml b/server/data/data-file/pom.xml
index 7b2aafa..a1a443e 100644
--- a/server/data/data-file/pom.xml
+++ b/server/data/data-file/pom.xml
@@ -35,11 +35,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
+ <artifactId>james-server-core</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -51,35 +51,45 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-core</artifactId>
+ <artifactId>james-server-data-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-api</artifactId>
+ <artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-dnsservice-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-filesystem-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
</dependency>
<!-- Test dependencies -->
@@ -99,26 +109,12 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- <type>test-jar</type>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -128,6 +124,10 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/pom.xml b/server/data/data-hbase/pom.xml
index 52210e3..15cd908 100644
--- a/server/data/data-hbase/pom.xml
+++ b/server/data/data-hbase/pom.xml
@@ -33,67 +33,55 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>apache-james-mailbox-hbase</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
+ <artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-dnsservice-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>13.0</version>
+ <!--$NO-MVN-MAN-VER$-->
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jruby</groupId>
- <artifactId>jruby-complete</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</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>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
</dependency>
<!-- Test dependencies -->
<dependency>
@@ -112,54 +100,63 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>13.0</version><!--$NO-MVN-MAN-VER$-->
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-hbase</artifactId>
- <classifier>tests</classifier>
+ <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>
- <groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
+ <groupId>org.jruby</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
+ <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>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
@@ -168,6 +165,10 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-jcr/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/pom.xml b/server/data/data-jcr/pom.xml
index e5c146f..5900ccc 100644
--- a/server/data/data-jcr/pom.xml
+++ b/server/data/data-jcr/pom.xml
@@ -35,43 +35,45 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
+ <artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
+ <artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-core</artifactId>
+ <artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-api</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
</dependency>
<!-- Test dependencies -->
@@ -81,24 +83,21 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <scope>test</scope>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -106,8 +105,9 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</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/server/data/data-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/pom.xml b/server/data/data-jdbc/pom.xml
index da2c8ca..b2e1683 100644
--- a/server/data/data-jdbc/pom.xml
+++ b/server/data/data-jdbc/pom.xml
@@ -35,39 +35,44 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util</artifactId>
+ <artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>james-server-core</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
+ <artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-core</artifactId>
+ <artifactId>james-server-data-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
+ <artifactId>james-server-filesystem-api</artifactId>
</dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-api</artifactId>
+ <artifactId>james-server-filesystem-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -78,13 +83,13 @@
<artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
</dependency>
-
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <scope>runtime</scope>
</dependency>
<!-- Test dependencies -->
@@ -103,41 +108,36 @@
<artifactId>cucumber-picocontainer</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
<dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
- <type>test-jar</type>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<scope>runtime</scope>
</dependency>
-
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
- <type>test-jar</type>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-jmap-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jmap-cassandra/pom.xml b/server/data/data-jmap-cassandra/pom.xml
index b4d0fb0..918d2bb 100644
--- a/server/data/data-jmap-cassandra/pom.xml
+++ b/server/data/data-jmap-cassandra/pom.xml
@@ -19,6 +19,8 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
@@ -26,14 +28,11 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>james-server-data-jmap-cassandra</artifactId>
<packaging>jar</packaging>
<name>Apache James :: Server :: Data :: JMAP :: Cassandra persistance</name>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -42,8 +41,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>
@@ -52,8 +51,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>james-server-data-jmap</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -95,6 +94,15 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>noTest</id>
@@ -116,13 +124,4 @@
</build>
</profile>
</profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jmap/pom.xml b/server/data/data-jmap/pom.xml
index ad127fb..26bd964 100644
--- a/server/data/data-jmap/pom.xml
+++ b/server/data/data-jmap/pom.xml
@@ -51,10 +51,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- </dependency>
- <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
@@ -64,6 +60,10 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml
index 1e60351..addb50a 100644
--- a/server/data/data-jpa/pom.xml
+++ b/server/data/data-jpa/pom.xml
@@ -40,41 +40,59 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
+ <artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
+ <artifactId>james-server-data-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
+ <artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-dnsservice-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- Test dependencies -->
<dependency>
@@ -98,31 +116,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>test</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -138,10 +138,17 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
<version>2.4.2</version>
+ <executions>
+ <execution>
+ <id>enhancer</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
- <includes>
- org/apache/james/user/jpa/model/JPAUser.class,org/apache/james/rrt/jpa/model/JPARecipientRewrite.class,org/apache/james/domainlist/jpa/model/JPADomain.class
- </includes>
+ <includes>org/apache/james/user/jpa/model/JPAUser.class,org/apache/james/rrt/jpa/model/JPARecipientRewrite.class,org/apache/james/domainlist/jpa/model/JPADomain.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
<enforcePropertyRestrictions>true</enforcePropertyRestrictions>
<toolProperties>
@@ -151,21 +158,10 @@
</property>
<property>
<name>metaDataFactory</name>
- <value>
- jpa(Types=org.apache.james.user.jpa.model.JPAUser;org.apache.james.rrt.jpa.model.JPARecipientRewrite;org.apache.james.domainlist.jpa.model.JPADomain)
- </value>
+ <value>jpa(Types=org.apache.james.user.jpa.model.JPAUser;org.apache.james.rrt.jpa.model.JPARecipientRewrite;org.apache.james.domainlist.jpa.model.JPADomain)</value>
</property>
</toolProperties>
</configuration>
- <executions>
- <execution>
- <id>enhancer</id>
- <phase>process-classes</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-ldap/pom.xml b/server/data/data-ldap/pom.xml
index 0c83739..4f6a8f5 100644
--- a/server/data/data-ldap/pom.xml
+++ b/server/data/data-ldap/pom.xml
@@ -35,31 +35,23 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
- <dependency>
<groupId>com.github.steveash.guavate</groupId>
<artifactId>guavate</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -67,6 +59,10 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
</dependency>
@@ -76,6 +72,10 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-library/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-library/pom.xml b/server/data/data-library/pom.xml
index a13c071..8ea942d 100644
--- a/server/data/data-library/pom.xml
+++ b/server/data/data-library/pom.xml
@@ -35,7 +35,12 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>apache-mailet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -47,11 +52,17 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>james-server-dnsservice-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>com.github.steveash.guavate</groupId>
@@ -62,20 +73,12 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
</dependency>
<!-- Test dependencies -->
@@ -90,6 +93,10 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -111,23 +118,16 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-core</artifactId>
- <scope>test</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
<scope>test</scope>
- <type>test-jar</type>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-memory/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-memory/pom.xml b/server/data/data-memory/pom.xml
index 28202c5..989cae5 100644
--- a/server/data/data-memory/pom.xml
+++ b/server/data/data-memory/pom.xml
@@ -43,13 +43,13 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
+ <artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
+ <artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/dns-service/dnsservice-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-api/pom.xml b/server/dns-service/dnsservice-api/pom.xml
index b450545..23ba212 100644
--- a/server/dns-service/dnsservice-api/pom.xml
+++ b/server/dns-service/dnsservice-api/pom.xml
@@ -33,16 +33,16 @@
<name>Apache James :: Server :: DNS Service :: API</name>
<dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/dns-service/dnsservice-dnsjava/pom.xml
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-dnsjava/pom.xml b/server/dns-service/dnsservice-dnsjava/pom.xml
index eda568a..252688b 100644
--- a/server/dns-service/dnsservice-dnsjava/pom.xml
+++ b/server/dns-service/dnsservice-dnsjava/pom.xml
@@ -46,18 +46,14 @@
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
</dependency>
@@ -65,10 +61,6 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- </dependency>
<dependency>
<groupId>junit</groupId>
@@ -76,6 +68,10 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
@@ -86,6 +82,10 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/dns-service/dnsservice-library/pom.xml
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-library/pom.xml b/server/dns-service/dnsservice-library/pom.xml
index 36fe4a8..0f2b6c1 100644
--- a/server/dns-service/dnsservice-library/pom.xml
+++ b/server/dns-service/dnsservice-library/pom.xml
@@ -35,34 +35,34 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>apache-mailet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-api</artifactId>
+ <artifactId>james-server-dnsservice-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/karaf/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/server/karaf/distribution/pom.xml b/server/karaf/distribution/pom.xml
index ac6c3ff..0729dbf 100644
--- a/server/karaf/distribution/pom.xml
+++ b/server/karaf/distribution/pom.xml
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server</artifactId>
+ <groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -16,6 +16,11 @@
<dependencies>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-karaf-features</artifactId>
+ <type>pom</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
<version>${karaf.version}</version>
@@ -28,19 +33,13 @@
<type>xml</type>
<classifier>features</classifier>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-karaf-features</artifactId>
- <type>pom</type>
- </dependency>
</dependencies>
-
<build>
<resources>
<resource>
- <directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
+ <directory>src/main/filtered-resources</directory>
<includes>
<include>**/*</include>
</includes>
@@ -50,12 +49,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <useDefaultDelimiters>false</useDefaultDelimiters>
- <delimiters>
- <delimiter>${*}</delimiter>
- </delimiters>
- </configuration>
<executions>
<execution>
<id>filter</id>
@@ -65,6 +58,12 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <delimiters>
+ <delimiter>${*}</delimiter>
+ </delimiters>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -122,17 +121,12 @@
<goals>
<goal>add-features-to-repo</goal>
</goals>
+ <inherited>false</inherited>
<configuration>
<descriptors>
- <descriptor>
- mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features
- </descriptor>
- <descriptor>
- mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features
- </descriptor>
- <descriptor>
- mvn:org.apache.james.karaf/james-karaf-features/${project.version}/xml/features
- </descriptor>
+ <descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.james.karaf/james-karaf-features/${project.version}/xml/features</descriptor>
</descriptors>
<features>
<feature>config</feature>
@@ -142,7 +136,6 @@
<includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
<repository>target/features-repo</repository>
</configuration>
- <inherited>false</inherited>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/karaf/features/pom.xml
----------------------------------------------------------------------
diff --git a/server/karaf/features/pom.xml b/server/karaf/features/pom.xml
index bd04f2a..c8627f6 100644
--- a/server/karaf/features/pom.xml
+++ b/server/karaf/features/pom.xml
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server</artifactId>
+ <groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -24,9 +24,9 @@
<build>
<resources>
<resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
<targetPath>${project.build.directory}</targetPath>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
</resource>
</resources>
@@ -89,4 +89,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/karaf/integration/pom.xml
----------------------------------------------------------------------
diff --git a/server/karaf/integration/pom.xml b/server/karaf/integration/pom.xml
index 0348012..3bcc628 100644
--- a/server/karaf/integration/pom.xml
+++ b/server/karaf/integration/pom.xml
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server</artifactId>
+ <groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -15,14 +15,43 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-dnsservice-dnsjava</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Apache Felix Karaf integration -->
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-fetchmail</artifactId>
+ <artifactId>james-karaf-distribution</artifactId>
+ <type>tar.gz</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>org.apache.karaf.client</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <groupId>org.eclipse.osgi</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-karaf-features</artifactId>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -31,41 +60,39 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-mailetcontainer-camel</artifactId>
+ <artifactId>james-server-dnsservice-dnsjava</artifactId>
<scope>test</scope>
</dependency>
-
- <!-- Pax-Exam dependencies -->
<dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam</artifactId>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-fetchmail</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.tooling.exam</groupId>
- <artifactId>org.apache.karaf.tooling.exam.container</artifactId>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-mailetcontainer-camel</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit4</artifactId>
+ <groupId>org.apache.karaf.tooling.exam</groupId>
+ <artifactId>org.apache.karaf.tooling.exam.container</artifactId>
<scope>test</scope>
</dependency>
+ <!-- Pax-Exam dependencies -->
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-link-mvn</artifactId>
- <scope>test</scope>
+ <artifactId>pax-exam</artifactId>
</dependency>
-
<dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-aether</artifactId>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit4</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-mvn</artifactId>
<scope>test</scope>
</dependency>
@@ -74,42 +101,14 @@
<artifactId>pax-swissbox-tinybundles</artifactId>
</dependency>
- <!-- Apache Felix Karaf integration -->
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-karaf-distribution</artifactId>
- <scope>test</scope>
- <type>tar.gz</type>
- <exclusions>
- <exclusion>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-aether</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-karaf-features</artifactId>
- <type>pom</type>
- </dependency>
-
</dependencies>
-
<build>
<plugins>
<plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[06/29] james-project git commit: JAMES-2124 automatically sort all
dependencies
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/mailet/integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml
index 3b0fbf3..3d0cf1a 100644
--- a/server/mailet/integration-testing/pom.xml
+++ b/server/mailet/integration-testing/pom.xml
@@ -56,14 +56,14 @@
<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>
@@ -79,13 +79,13 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util-java8</artifactId>
- <type>test-jar</type>
+ <artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-testing</artifactId>
+ <artifactId>james-server-util-java8</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -94,6 +94,10 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<scope>test</scope>
@@ -104,10 +108,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/mailet/mailetcontainer-camel/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/pom.xml b/server/mailet/mailetcontainer-camel/pom.xml
index 32b91c2..fab64e2 100644
--- a/server/mailet/mailetcontainer-camel/pom.xml
+++ b/server/mailet/mailetcontainer-camel/pom.xml
@@ -35,61 +35,69 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailetcontainer-api</artifactId>
+ <artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-api</artifactId>
+ <artifactId>apache-mailet-base</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util</artifactId>
+ <artifactId>apache-mailet-standard</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
+ <artifactId>james-server-core</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-library</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>james-server-data-memory</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
+ <artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-core</artifactId>
+ <artifactId>james-server-dnsservice-library</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util-java8</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-api</artifactId>
+ <artifactId>james-server-mailetcontainer-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>metrics-api</artifactId>
+ <artifactId>james-server-util-java8</artifactId>
</dependency>
- <!--
- <dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-base</artifactId>
- </dependency>
- -->
+ <artifactId>james-server-mailetcontainer-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>metrics-api</artifactId>
</dependency>
<dependency>
<groupId>com.github.steveash.guavate</groupId>
@@ -100,16 +108,12 @@
<artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
<!-- test dependency -->
<dependency>
@@ -118,40 +122,36 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-memory</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <classifier>tests</classifier>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-standard</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
+ <!--
+ <dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailetcontainer-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
+ <artifactId>apache-mailet-base</artifactId>
+ </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.mockito</groupId>
- <artifactId>mockito-core</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/server/mailet/mailets/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml
index 3cdc25b..8acf682 100644
--- a/server/mailet/mailets/pom.xml
+++ b/server/mailet/mailets/pom.xml
@@ -33,126 +33,119 @@
<name>Apache James :: Server :: Mailets</name>
<dependencies>
+ <!--
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-imap-processor</artifactId>
+ </dependency>
+ -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-library</artifactId>
+ <artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>apache-james-mailbox-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
+ <artifactId>apache-james-mailbox-memory</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-api</artifactId>
+ <artifactId>apache-james-mailbox-memory</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
+ <artifactId>apache-james-mailbox-store</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
+ <artifactId>apache-james-mailbox-store</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
+ <artifactId>apache-mailet-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-core</artifactId>
+ <artifactId>apache-mailet-base</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>metrics-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-managesieve</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-managesieve</artifactId>
- <type>test-jar</type>
+ <artifactId>apache-mailet-base</artifactId>
+ <classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-api</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-smtp</artifactId>
+ <artifactId>apache-mailet-standard</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <scope>compile</scope>
+ <artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-standard</artifactId>
- <scope>compile</scope>
+ <artifactId>apache-mime4j-james-utils</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.jspf</groupId>
- <artifactId>apache-jspf-resolver</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
+ <artifactId>james-server-data-library</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mime4j-james-utils</artifactId>
+ <artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-dnsservice-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-dnsservice-library</artifactId>
</dependency>
<dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-queue-api</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-imap-processor</artifactId>
- </dependency>
- -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
+ <artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>metrics-api</artifactId>
</dependency>
<!-- Test dependencies -->
<dependency>
@@ -161,49 +154,48 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <scope>test</scope>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
- <type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.james.jspf</groupId>
+ <artifactId>apache-jspf-resolver</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-managesieve</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-managesieve</artifactId>
<type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-smtp</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
@@ -220,6 +212,14 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
</dependencies>
<build>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[10/29] james-project git commit: JAMES-2124 automatically sort all
dependencies
Posted by bt...@apache.org.
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
[12/29] james-project git commit: JAMES-2024 Rely on Mockito where
JMOCK upgrade made tests fails
Posted by bt...@apache.org.
JAMES-2024 Rely on Mockito where JMOCK upgrade made tests fails
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/33a6d55e
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/33a6d55e
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/33a6d55e
Branch: refs/heads/master
Commit: 33a6d55e02cea5e724525b0bd8ccdcabf19d54b4
Parents: ab4aec5
Author: benwa <bt...@linagora.com>
Authored: Sat Aug 19 14:03:04 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 25 18:17:05 2017 +0700
----------------------------------------------------------------------
protocols/imap/pom.xml | 1 -
.../imap/processor/GetQuotaProcessorTest.java | 184 ++++++++-----------
.../imap/processor/SetQuotaProcessorTest.java | 54 +++---
.../processor/StatusResponseTypeMatcher.java | 6 +
4 files changed, 101 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/33a6d55e/protocols/imap/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml
index 4ce0ca7..54e7dde 100644
--- a/protocols/imap/pom.xml
+++ b/protocols/imap/pom.xml
@@ -41,7 +41,6 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.1.7</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/33a6d55e/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java
index 162ea9d..f96e9a9 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/GetQuotaProcessorTest.java
@@ -19,10 +19,17 @@
package org.apache.james.imap.processor;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapSessionState;
import org.apache.james.imap.api.ImapSessionUtils;
-import org.apache.james.imap.api.message.response.StatusResponse;
+import org.apache.james.imap.api.message.response.ImapResponseMessage;
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.message.request.GetQuotaRequest;
@@ -41,17 +48,12 @@ import org.apache.james.mailbox.quota.QuotaRootResolver;
import org.apache.james.mailbox.store.quota.QuotaImpl;
import org.apache.james.mailbox.store.quota.QuotaRootImpl;
import org.apache.james.metrics.api.NoopMetricFactory;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
-import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableList;
-@RunWith(JMock.class)
public class GetQuotaProcessorTest {
private static final QuotaRoot QUOTA_ROOT = QuotaRootImpl.quotaRoot("plop");
@@ -60,7 +62,6 @@ public class GetQuotaProcessorTest {
public static final Quota STORAGE_QUOTA = QuotaImpl.quota(240, 15890);
private GetQuotaProcessor testee;
- private Mockery mockery;
private ImapSession mockedImapSession;
private ImapProcessor.Responder mockedResponder;
private QuotaManager mockedQuotaManager;
@@ -71,137 +72,98 @@ public class GetQuotaProcessorTest {
@Before
public void setUp() {
mailboxSession = new MockMailboxSession("plop");
- mockery = new JUnit4Mockery();
UnpooledStatusResponseFactory statusResponseFactory = new UnpooledStatusResponseFactory();
- mockedImapSession = mockery.mock(ImapSession.class);
- mockedQuotaManager = mockery.mock(QuotaManager.class);
- mockedQuotaRootResolver = mockery.mock(QuotaRootResolver.class);
- mockedResponder = mockery.mock(ImapProcessor.Responder.class);
- mockedMailboxManager = mockery.mock(MailboxManager.class);
- testee = new GetQuotaProcessor(mockery.mock(ImapProcessor.class), mockedMailboxManager,
+ mockedImapSession = mock(ImapSession.class);
+ mockedQuotaManager = mock(QuotaManager.class);
+ mockedQuotaRootResolver = mock(QuotaRootResolver.class);
+ mockedResponder = mock(ImapProcessor.Responder.class);
+ mockedMailboxManager = mock(MailboxManager.class);
+ testee = new GetQuotaProcessor(mock(ImapProcessor.class), mockedMailboxManager,
statusResponseFactory, mockedQuotaManager, mockedQuotaRootResolver, new NoopMetricFactory());
}
@Test
public void processorShouldWorkOnValidRights() throws Exception {
GetQuotaRequest getQuotaRequest = new GetQuotaRequest("A004", ImapCommand.anyStateCommand("Name"), "quotaRoot");
- Expectations expectations = new Expectations();
-
- expectations.allowing(mockedImapSession).getState();
- expectations.will(Expectations.returnValue(ImapSessionState.AUTHENTICATED));
-
- expectations.allowing(mockedImapSession).getAttribute(expectations.with(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY));
- expectations.will(Expectations.returnValue(mailboxSession));
-
- expectations.allowing(mockedQuotaRootResolver).createQuotaRoot(expectations.with("quotaRoot"));
- expectations.will(Expectations.returnValue(QUOTA_ROOT));
-
- expectations.allowing(mockedQuotaRootResolver).retrieveAssociatedMailboxes(expectations.with(QUOTA_ROOT), expectations.with(mailboxSession));
- expectations.will(Expectations.returnValue(Lists.newArrayList(MAILBOX_PATH)));
-
- expectations.allowing(mockedMailboxManager).hasRight(expectations.with(MAILBOX_PATH),
- expectations.with(SimpleMailboxACL.Rfc4314Rights.r_Read_RIGHT), expectations.with(mailboxSession));
- expectations.will(Expectations.returnValue(true));
-
- expectations.allowing(mockedQuotaManager).getMessageQuota(expectations.with(QUOTA_ROOT));
- expectations.will(Expectations.returnValue(MESSAGE_QUOTA));
-
- expectations.allowing(mockedQuotaManager).getStorageQuota(expectations.with(QUOTA_ROOT));
- expectations.will(Expectations.returnValue(STORAGE_QUOTA));
- expectations.allowing(mockedMailboxManager).startProcessingRequest(expectations.with(mailboxSession));
+ when(mockedImapSession.getState()).thenReturn(ImapSessionState.AUTHENTICATED);
+ when(mockedImapSession.getAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY))
+ .thenReturn(mailboxSession);
+ when(mockedQuotaRootResolver.createQuotaRoot("quotaRoot"))
+ .thenReturn(QUOTA_ROOT);
+ when(mockedQuotaRootResolver.retrieveAssociatedMailboxes(QUOTA_ROOT, mailboxSession))
+ .thenReturn(ImmutableList.of(MAILBOX_PATH));
+ when(mockedMailboxManager.hasRight(MAILBOX_PATH, SimpleMailboxACL.Rfc4314Rights.r_Read_RIGHT, mailboxSession))
+ .thenReturn(true);
+ when(mockedQuotaManager.getMessageQuota(QUOTA_ROOT)).thenReturn(MESSAGE_QUOTA);
+ when(mockedQuotaManager.getStorageQuota(QUOTA_ROOT)).thenReturn(STORAGE_QUOTA);
+
+ QuotaResponse storageQuotaResponse = new QuotaResponse("STORAGE", "plop", STORAGE_QUOTA);
+ QuotaResponse messageQuotaResponse = new QuotaResponse("MESSAGE", "plop", MESSAGE_QUOTA);
- expectations.allowing(mockedMailboxManager).endProcessingRequest(expectations.with(mailboxSession));
-
- final QuotaResponse storageQuotaResponse = new QuotaResponse("STORAGE", "plop", STORAGE_QUOTA);
- final QuotaResponse messageQuotaResponse = new QuotaResponse("MESSAGE", "plop", MESSAGE_QUOTA);
-
- mockery.checking(expectations);
+ testee.doProcess(getQuotaRequest, mockedResponder, mockedImapSession);
- mockery.checking(new Expectations() {
- {
- oneOf(mockedResponder).respond(with(equal(storageQuotaResponse)));
- oneOf(mockedResponder).respond(with(equal(messageQuotaResponse)));
- oneOf(mockedResponder).respond(with(new StatusResponseTypeMatcher(StatusResponse.Type.OK)));
- }
- });
+ ArgumentCaptor<ImapResponseMessage> argumentCaptor = ArgumentCaptor.forClass(ImapResponseMessage.class);
+ verify(mockedResponder, times(3)).respond(argumentCaptor.capture());
+ verifyNoMoreInteractions(mockedResponder);
- testee.doProcess(getQuotaRequest, mockedResponder, mockedImapSession);
+ assertThat(argumentCaptor.getAllValues())
+ .hasSize(3)
+ .contains(storageQuotaResponse, messageQuotaResponse);
+ assertThat(argumentCaptor.getAllValues().get(2))
+ .matches(StatusResponseTypeMatcher.OK_RESPONSE_MATCHER::matches);
}
@Test
public void processorShouldWorkOnExceptionThrown() throws Exception {
GetQuotaRequest getQuotaRequest = new GetQuotaRequest("A004", ImapCommand.anyStateCommand("Name"), "quotaRoot");
- Expectations expectations = new Expectations();
-
- expectations.allowing(mockedImapSession).getState();
- expectations.will(Expectations.returnValue(ImapSessionState.AUTHENTICATED));
-
- expectations.allowing(mockedImapSession).getAttribute(expectations.with(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY));
- expectations.will(Expectations.returnValue(mailboxSession));
-
- expectations.allowing(mockedQuotaRootResolver).createQuotaRoot(expectations.with("quotaRoot"));
- expectations.will(Expectations.returnValue(QUOTA_ROOT));
- expectations.allowing(mockedQuotaRootResolver).retrieveAssociatedMailboxes(expectations.with(QUOTA_ROOT), expectations.with(mailboxSession));
- expectations.will(Expectations.returnValue(Lists.newArrayList(MAILBOX_PATH)));
+ when(mockedImapSession.getState()).thenReturn(ImapSessionState.AUTHENTICATED);
+ when(mockedImapSession.getAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY))
+ .thenReturn(mailboxSession);
+ when(mockedQuotaRootResolver.createQuotaRoot("quotaRoot"))
+ .thenReturn(QUOTA_ROOT);
+ when(mockedQuotaRootResolver.retrieveAssociatedMailboxes(QUOTA_ROOT, mailboxSession))
+ .thenReturn(ImmutableList.of(MAILBOX_PATH));
+ when(mockedMailboxManager.hasRight(MAILBOX_PATH, SimpleMailboxACL.Rfc4314Rights.r_Read_RIGHT, mailboxSession))
+ .thenReturn(true);
+ when(mockedQuotaManager.getMessageQuota(QUOTA_ROOT)).thenThrow(new MailboxException());
+ when(mockedQuotaManager.getStorageQuota(QUOTA_ROOT)).thenReturn(STORAGE_QUOTA);
- expectations.allowing(mockedMailboxManager).hasRight(expectations.with(MAILBOX_PATH),
- expectations.with(SimpleMailboxACL.Rfc4314Rights.r_Read_RIGHT), expectations.with(mailboxSession));
- expectations.will(Expectations.returnValue(true));
-
- expectations.allowing(mockedQuotaManager).getMessageQuota(expectations.with(QUOTA_ROOT));
- expectations.will(Expectations.throwException(new MailboxException()));
-
- expectations.allowing(mockedMailboxManager).startProcessingRequest(expectations.with(mailboxSession));
-
- expectations.allowing(mockedMailboxManager).endProcessingRequest(expectations.with(mailboxSession));
-
- mockery.checking(expectations);
+ testee.doProcess(getQuotaRequest, mockedResponder, mockedImapSession);
- mockery.checking(new Expectations() {
- {
- oneOf(mockedResponder).respond(with(new StatusResponseTypeMatcher(StatusResponse.Type.BAD)));
- }
- });
+ ArgumentCaptor<ImapResponseMessage> argumentCaptor = ArgumentCaptor.forClass(ImapResponseMessage.class);
+ verify(mockedResponder).respond(argumentCaptor.capture());
+ verifyNoMoreInteractions(mockedResponder);
- testee.doProcess(getQuotaRequest, mockedResponder, mockedImapSession);
+ assertThat(argumentCaptor.getAllValues())
+ .hasSize(1)
+ .allMatch(StatusResponseTypeMatcher.BAD_RESPONSE_MATCHER::matches);
}
@Test
public void processorShouldWorkOnNoRights() throws Exception {
GetQuotaRequest getQuotaRequest = new GetQuotaRequest("A004", ImapCommand.anyStateCommand("Name"), "quotaRoot");
- Expectations expectations = new Expectations();
-
- expectations.allowing(mockedImapSession).getState();
- expectations.will(Expectations.returnValue(ImapSessionState.AUTHENTICATED));
- expectations.allowing(mockedImapSession).getAttribute(expectations.with(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY));
- expectations.will(Expectations.returnValue(mailboxSession));
+ when(mockedImapSession.getState()).thenReturn(ImapSessionState.AUTHENTICATED);
+ when(mockedImapSession.getAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY))
+ .thenReturn(mailboxSession);
+ when(mockedQuotaRootResolver.createQuotaRoot("quotaRoot"))
+ .thenReturn(QUOTA_ROOT);
+ when(mockedQuotaRootResolver.retrieveAssociatedMailboxes(QUOTA_ROOT, mailboxSession))
+ .thenReturn(ImmutableList.of(MAILBOX_PATH));
+ when(mockedMailboxManager.hasRight(MAILBOX_PATH, SimpleMailboxACL.Rfc4314Rights.r_Read_RIGHT, mailboxSession))
+ .thenReturn(false);
- expectations.allowing(mockedQuotaRootResolver).createQuotaRoot(expectations.with("quotaRoot"));
- expectations.will(Expectations.returnValue(QUOTA_ROOT));
-
- expectations.allowing(mockedQuotaRootResolver).retrieveAssociatedMailboxes(expectations.with(QUOTA_ROOT), expectations.with(mailboxSession));
- expectations.will(Expectations.returnValue(Lists.newArrayList(MAILBOX_PATH)));
-
- expectations.allowing(mockedMailboxManager).hasRight(expectations.with(MAILBOX_PATH),
- expectations.with(SimpleMailboxACL.Rfc4314Rights.r_Read_RIGHT), expectations.with(mailboxSession));
- expectations.will(Expectations.returnValue(false));
-
- expectations.allowing(mockedMailboxManager).startProcessingRequest(expectations.with(mailboxSession));
-
- expectations.allowing(mockedMailboxManager).endProcessingRequest(expectations.with(mailboxSession));
-
- mockery.checking(expectations);
+ testee.doProcess(getQuotaRequest, mockedResponder, mockedImapSession);
- mockery.checking(new Expectations() {
- {
- oneOf(mockedResponder).respond(with(new StatusResponseTypeMatcher(StatusResponse.Type.NO)));
- }
- });
+ ArgumentCaptor<ImapResponseMessage> argumentCaptor = ArgumentCaptor.forClass(ImapResponseMessage.class);
+ verify(mockedResponder).respond(argumentCaptor.capture());
+ verifyNoMoreInteractions(mockedResponder);
- testee.doProcess(getQuotaRequest, mockedResponder, mockedImapSession);
+ assertThat(argumentCaptor.getAllValues())
+ .hasSize(1)
+ .allMatch(StatusResponseTypeMatcher.NO_RESPONSE_MATCHER::matches);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/33a6d55e/protocols/imap/src/test/java/org/apache/james/imap/processor/SetQuotaProcessorTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetQuotaProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetQuotaProcessorTest.java
index 80e749e..91337c6 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SetQuotaProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SetQuotaProcessorTest.java
@@ -19,10 +19,16 @@
package org.apache.james.imap.processor;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapSessionState;
import org.apache.james.imap.api.ImapSessionUtils;
-import org.apache.james.imap.api.message.response.StatusResponse;
+import org.apache.james.imap.api.message.response.ImapResponseMessage;
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.message.request.SetQuotaRequest;
@@ -31,19 +37,12 @@ import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.mock.MockMailboxSession;
import org.apache.james.metrics.api.NoopMetricFactory;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
-@RunWith(JMock.class)
public class SetQuotaProcessorTest {
-
private SetQuotaProcessor testee;
- private Mockery mockery;
private ImapSession mockedImapSession;
private ImapProcessor.Responder mockedResponder;
private MailboxManager mockedMailboxManager;
@@ -52,39 +51,30 @@ public class SetQuotaProcessorTest {
@Before
public void setUp() {
mailboxSession = new MockMailboxSession("plop");
- mockery = new JUnit4Mockery();
UnpooledStatusResponseFactory statusResponseFactory = new UnpooledStatusResponseFactory();
- mockedImapSession = mockery.mock(ImapSession.class);
- mockedResponder = mockery.mock(ImapProcessor.Responder.class);
- mockedMailboxManager = mockery.mock(MailboxManager.class);
- testee = new SetQuotaProcessor(mockery.mock(ImapProcessor.class), mockedMailboxManager,
+ mockedImapSession = mock(ImapSession.class);
+ mockedResponder = mock(ImapProcessor.Responder.class);
+ mockedMailboxManager = mock(MailboxManager.class);
+ testee = new SetQuotaProcessor(mock(ImapProcessor.class), mockedMailboxManager,
statusResponseFactory, new NoopMetricFactory());
}
@Test
public void processorShouldWorkOnNoRights() throws Exception {
SetQuotaRequest setQuotaRequest = new SetQuotaRequest("A004", ImapCommand.anyStateCommand("Name"), "quotaRoot");
- Expectations expectations = new Expectations();
-
- expectations.allowing(mockedImapSession).getState();
- expectations.will(Expectations.returnValue(ImapSessionState.AUTHENTICATED));
-
- expectations.allowing(mockedImapSession).getAttribute(expectations.with(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY));
- expectations.will(Expectations.returnValue(mailboxSession));
- expectations.allowing(mockedMailboxManager).startProcessingRequest(expectations.with(mailboxSession));
-
- expectations.allowing(mockedMailboxManager).endProcessingRequest(expectations.with(mailboxSession));
-
- mockery.checking(expectations);
-
- mockery.checking(new Expectations() {
- {
- oneOf(mockedResponder).respond(with(new StatusResponseTypeMatcher(StatusResponse.Type.NO)));
- }
- });
+ when(mockedImapSession.getState()).thenReturn(ImapSessionState.AUTHENTICATED);
+ when(mockedImapSession.getAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY))
+ .thenReturn(mailboxSession);
testee.doProcess(setQuotaRequest, mockedResponder, mockedImapSession);
+
+ ArgumentCaptor<ImapResponseMessage> imapResponseMessageArgumentCaptor = ArgumentCaptor.forClass(ImapResponseMessage.class);
+ verify(mockedResponder).respond(imapResponseMessageArgumentCaptor.capture());
+ assertThat(imapResponseMessageArgumentCaptor.getAllValues())
+ .hasSize(1)
+ .allMatch(StatusResponseTypeMatcher.NO_RESPONSE_MATCHER::matches);
+ verifyNoMoreInteractions(mockedResponder);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/33a6d55e/protocols/imap/src/test/java/org/apache/james/imap/processor/StatusResponseTypeMatcher.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/StatusResponseTypeMatcher.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/StatusResponseTypeMatcher.java
index bfca14d..0cdc650 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/StatusResponseTypeMatcher.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/StatusResponseTypeMatcher.java
@@ -30,6 +30,12 @@ import org.hamcrest.Description;
*
*/
public class StatusResponseTypeMatcher extends BaseMatcher<StatusResponse> {
+
+ public static final StatusResponseTypeMatcher OK_RESPONSE_MATCHER = new StatusResponseTypeMatcher(StatusResponse.Type.OK);
+ public static final StatusResponseTypeMatcher BAD_RESPONSE_MATCHER = new StatusResponseTypeMatcher(StatusResponse.Type.BAD);
+ public static final StatusResponseTypeMatcher NO_RESPONSE_MATCHER = new StatusResponseTypeMatcher(StatusResponse.Type.NO);
+
+
private final org.apache.james.imap.api.message.response.StatusResponse.Type serverResponseType;
public StatusResponseTypeMatcher(org.apache.james.imap.api.message.response.StatusResponse.Type responseCode) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[20/29] james-project git commit: JAMES-2124 Avoid POM version
overiding
Posted by bt...@apache.org.
JAMES-2124 Avoid POM version overiding
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8aed4b08
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8aed4b08
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8aed4b08
Branch: refs/heads/master
Commit: 8aed4b08d3bedfd4d7ed69df9fad48ea4d0bb18c
Parents: 2a8b24d
Author: benwa <bt...@linagora.com>
Authored: Thu Aug 24 07:57:22 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 25 18:18:14 2017 +0700
----------------------------------------------------------------------
backends-common/cassandra/pom.xml | 4 ----
backends-common/elasticsearch/pom.xml | 2 --
backends-common/jpa/pom.xml | 1 -
mailbox/cassandra/pom.xml | 3 ---
mailbox/hbase/pom.xml | 1 -
mailbox/tika/pom.xml | 2 --
mailet/api/pom.xml | 1 -
mailet/base/pom.xml | 2 --
mailet/icalendar/pom.xml | 1 -
metrics/metrics-logger/pom.xml | 1 -
mpt/core/pom.xml | 1 -
mpt/impl/imap-mailbox/cyrus/pom.xml | 1 -
mpt/impl/smtp/cassandra/pom.xml | 1 -
mpt/mavenplugin/pom.xml | 1 -
server/container/guice/cassandra-guice/pom.xml | 1 -
server/container/util-java8/pom.xml | 1 -
server/data/data-api/pom.xml | 1 -
server/data/data-cassandra/pom.xml | 4 ++--
server/data/data-jmap-cassandra/pom.xml | 1 -
.../cassandra-jmap-integration-testing/pom.xml | 1 -
.../jmap-integration-testing-common/pom.xml | 2 --
server/protocols/jmap/pom.xml | 3 ---
server/protocols/webadmin-integration-test/pom.xml | 1 -
server/protocols/webadmin/webadmin-core/pom.xml | 1 -
24 files changed, 2 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/backends-common/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/pom.xml b/backends-common/cassandra/pom.xml
index 6da5354..6b57226 100644
--- a/backends-common/cassandra/pom.xml
+++ b/backends-common/cassandra/pom.xml
@@ -60,7 +60,6 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.6</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
@@ -74,7 +73,6 @@
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
- <version>1.7.6</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -85,13 +83,11 @@
<dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
- <version>2.1.9.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.9.0</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/backends-common/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/elasticsearch/pom.xml b/backends-common/elasticsearch/pom.xml
index 136b1d2..210e8de 100644
--- a/backends-common/elasticsearch/pom.xml
+++ b/backends-common/elasticsearch/pom.xml
@@ -42,12 +42,10 @@
<dependency>
<groupId>com.github.fge</groupId>
<artifactId>throwing-lambdas</artifactId>
- <version>0.5.0</version>
</dependency>
<dependency>
<groupId>com.jayway.awaitility</groupId>
<artifactId>awaitility</artifactId>
- <version>1.6.5</version>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/backends-common/jpa/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/jpa/pom.xml b/backends-common/jpa/pom.xml
index 1d99f0a..dbab212 100644
--- a/backends-common/jpa/pom.xml
+++ b/backends-common/jpa/pom.xml
@@ -17,7 +17,6 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.3.170</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/mailbox/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml
index 85cd43a..51b65ad 100644
--- a/mailbox/cassandra/pom.xml
+++ b/mailbox/cassandra/pom.xml
@@ -74,7 +74,6 @@
<dependency>
<groupId>com.github.fge</groupId>
<artifactId>throwing-lambdas</artifactId>
- <version>0.5.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -83,7 +82,6 @@
<dependency>
<groupId>com.jayway.awaitility</groupId>
<artifactId>awaitility</artifactId>
- <version>1.6.5</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -129,7 +127,6 @@
<dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
- <version>${cassandra-unit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/mailbox/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/hbase/pom.xml b/mailbox/hbase/pom.xml
index 0a2d28b..30c3df4 100644
--- a/mailbox/hbase/pom.xml
+++ b/mailbox/hbase/pom.xml
@@ -122,7 +122,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/mailbox/tika/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml
index dffea3b..d5775fc 100644
--- a/mailbox/tika/pom.xml
+++ b/mailbox/tika/pom.xml
@@ -61,7 +61,6 @@
<dependency>
<groupId>com.jayway.awaitility</groupId>
<artifactId>awaitility</artifactId>
- <version>1.6.3</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -76,7 +75,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/mailet/api/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/api/pom.xml b/mailet/api/pom.xml
index 9780510..70a6b44 100644
--- a/mailet/api/pom.xml
+++ b/mailet/api/pom.xml
@@ -52,7 +52,6 @@
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
- <version>1.7.5</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/mailet/base/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/base/pom.xml b/mailet/base/pom.xml
index 57bf7e7..54c72da 100644
--- a/mailet/base/pom.xml
+++ b/mailet/base/pom.xml
@@ -62,7 +62,6 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
@@ -76,7 +75,6 @@
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
- <version>1.7.5</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/mailet/icalendar/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/icalendar/pom.xml b/mailet/icalendar/pom.xml
index 0f1f491..e8ca072 100644
--- a/mailet/icalendar/pom.xml
+++ b/mailet/icalendar/pom.xml
@@ -92,7 +92,6 @@
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
- <version>1.7.5</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/metrics/metrics-logger/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/metrics-logger/pom.xml b/metrics/metrics-logger/pom.xml
index 09519ab..f1e72ed 100644
--- a/metrics/metrics-logger/pom.xml
+++ b/metrics/metrics-logger/pom.xml
@@ -41,7 +41,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.2</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/mpt/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/core/pom.xml b/mpt/core/pom.xml
index aefc854..7e0ded5 100644
--- a/mpt/core/pom.xml
+++ b/mpt/core/pom.xml
@@ -44,7 +44,6 @@
<dependency>
<groupId>com.jayway.awaitility</groupId>
<artifactId>awaitility</artifactId>
- <version>1.6.5</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/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 9cca0b1..78986b3 100644
--- a/mpt/impl/imap-mailbox/cyrus/pom.xml
+++ b/mpt/impl/imap-mailbox/cyrus/pom.xml
@@ -38,7 +38,6 @@
<dependency>
<groupId>com.jayway.awaitility</groupId>
<artifactId>awaitility</artifactId>
- <version>1.6.5</version>
</dependency>
<dependency>
<groupId>com.spotify</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/mpt/impl/smtp/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/pom.xml b/mpt/impl/smtp/cassandra/pom.xml
index 0627cec..46f9120 100644
--- a/mpt/impl/smtp/cassandra/pom.xml
+++ b/mpt/impl/smtp/cassandra/pom.xml
@@ -92,7 +92,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
</dependency>
<dependency>
<groupId>org.cassandraunit</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/mpt/mavenplugin/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/mavenplugin/pom.xml b/mpt/mavenplugin/pom.xml
index 9c10a22..db14a28 100644
--- a/mpt/mavenplugin/pom.xml
+++ b/mpt/mavenplugin/pom.xml
@@ -54,7 +54,6 @@ to the library requiring no extra coding.</description>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/server/container/guice/cassandra-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml
index 6b4c2ae..6f8123d 100644
--- a/server/container/guice/cassandra-guice/pom.xml
+++ b/server/container/guice/cassandra-guice/pom.xml
@@ -207,7 +207,6 @@
<dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
- <version>${cassandra-unit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/server/container/util-java8/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/util-java8/pom.xml b/server/container/util-java8/pom.xml
index d98a650..43bfcf3 100644
--- a/server/container/util-java8/pom.xml
+++ b/server/container/util-java8/pom.xml
@@ -67,7 +67,6 @@
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
- <version>1.7.6</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/server/data/data-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-api/pom.xml b/server/data/data-api/pom.xml
index 4ba82a0..7052d31 100644
--- a/server/data/data-api/pom.xml
+++ b/server/data/data-api/pom.xml
@@ -58,7 +58,6 @@
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
- <version>1.7.6</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/server/data/data-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/pom.xml b/server/data/data-cassandra/pom.xml
index e4e8377..2b0b28d 100644
--- a/server/data/data-cassandra/pom.xml
+++ b/server/data/data-cassandra/pom.xml
@@ -99,11 +99,12 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
- <version>1.7.6</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
@@ -113,7 +114,6 @@
<dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
- <version>${cassandra-unit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/server/data/data-jmap-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jmap-cassandra/pom.xml b/server/data/data-jmap-cassandra/pom.xml
index d1b1f93..93e89b3 100644
--- a/server/data/data-jmap-cassandra/pom.xml
+++ b/server/data/data-jmap-cassandra/pom.xml
@@ -80,7 +80,6 @@
<dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
- <version>${cassandra-unit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
index c38eeed..20de651 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
@@ -135,7 +135,6 @@
<dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
- <version>${cassandra-unit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
index f8831a5..84b1dbc 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
@@ -79,8 +79,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
- <!--$NO-MVN-MAN-VER$-->
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/server/protocols/jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml
index 087c516..16292dc 100644
--- a/server/protocols/jmap/pom.xml
+++ b/server/protocols/jmap/pom.xml
@@ -202,7 +202,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -219,13 +218,11 @@
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
- <version>1.7.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.3.2</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/server/protocols/webadmin-integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/pom.xml
index 693e3ea..bbdc8a5 100644
--- a/server/protocols/webadmin-integration-test/pom.xml
+++ b/server/protocols/webadmin-integration-test/pom.xml
@@ -101,7 +101,6 @@
<dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
- <version>${cassandra-unit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8aed4b08/server/protocols/webadmin/webadmin-core/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml
index 80052a1..4d5e1c5 100644
--- a/server/protocols/webadmin/webadmin-core/pom.xml
+++ b/server/protocols/webadmin/webadmin-core/pom.xml
@@ -96,7 +96,6 @@
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
- <version>1.7.6</version>
<scope>test</scope>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[28/29] james-project git commit: JAMES-2124 Fix more eclipse warnings
Posted by bt...@apache.org.
JAMES-2124 Fix more eclipse warnings
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c147f0a0
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c147f0a0
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c147f0a0
Branch: refs/heads/master
Commit: c147f0a09c3d734d381e87698cdbc5129db271c7
Parents: 4ba8102
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Thu Aug 24 15:25:59 2017 +0200
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 25 18:18:24 2017 +0700
----------------------------------------------------------------------
.../main/java/org/apache/james/mailbox/MailboxListener.java | 1 -
.../java/org/apache/james/mailbox/mock/MockMailboxSession.java | 2 --
.../java/org/apache/james/mailbox/jcr/JCRMailboxManager.java | 5 -----
.../java/org/apache/james/mailbox/jcr/JCRMessageManager.java | 6 +-----
.../org/apache/james/mailbox/store/search/MessageSearches.java | 5 +----
.../james/mailbox/store/search/SimpleMessageSearchIndex.java | 2 +-
.../apache/james/mailbox/store/GroupFolderResolverTest.java | 2 --
.../java/org/apache/james/mpt/protocol/ProtocolSession.java | 1 -
.../java/org/apache/james/imap/processor/EnableProcessor.java | 2 --
.../apache/james/protocols/lmtp/AbstractLMTPServerTest.java | 4 ----
.../apache/james/protocols/pop3/AbstractPOP3ServerTest.java | 3 ---
.../james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java | 3 ---
.../apache/james/protocols/smtp/AbstractSMTPServerTest.java | 3 ---
.../protocols/smtp/netty/NettyStartTlsSMTPServerTest.java | 3 ---
.../org/apache/james/utils/InMemoryMailRepositoryStore.java | 4 ----
.../org/apache/james/modules/data/JPADomainListModule.java | 4 ----
.../apache/james/adapter/mailbox/MailboxManagementTest.java | 3 ---
.../mailrepositorystore/MailRepositoryStoreBeanFactory.java | 5 -----
.../lifecycle/osgi/OsgiLifecycleBeanFactoryPostProcessor.java | 1 +
.../src/test/java/org/apache/james/util/MDCBuilderTest.java | 1 +
.../apache/james/mailrepository/api/MailRepositoryStore.java | 1 -
.../apache/james/mailrepository/jdbc/MessageInputStream.java | 1 -
.../james/dnsservice/api/TemporaryResolutionException.java | 1 -
.../james/mailetcontainer/impl/JamesMailetContextTest.java | 4 ----
.../apache/james/samples/mailets/InstrumentationMailet.java | 2 --
.../james/transport/mailets/remoteDelivery/BouncerTest.java | 3 ---
.../transport/mailets/remoteDelivery/DeliveryRunnableTest.java | 3 ---
.../apache/james/jmap/AccessTokenAuthenticationStrategy.java | 4 ----
.../james/imapserver/netty/NettyImapRequestLineReader.java | 1 -
.../lib/jmx/AbstractCommandHandlerResultJMXMonitor.java | 2 +-
.../lib/jmx/AbstractConnectHandlerResultJMXMonitor.java | 1 +
.../protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java | 1 +
.../org/apache/james/pop3server/POP3TestConfiguration.java | 1 -
.../src/main/java/org/apache/james/smtpserver/TLDLookup.java | 3 ---
.../org/apache/james/smtpserver/SMTPTestConfiguration.java | 1 -
.../org/apache/james/queue/activemq/ActiveMQMailQueueTest.java | 4 ----
.../src/main/java/org/apache/james/queue/api/MailQueue.java | 1 -
.../org/apache/james/queue/jms/AbstractJMSMailQueueTest.java | 3 ---
38 files changed, 8 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java
index 32afb9c..2b074a1 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/MailboxListener.java
@@ -60,7 +60,6 @@ public interface MailboxListener {
/**
* A mailbox event.
*/
- @SuppressWarnings("serial")
abstract class Event implements Serializable {
private final MailboxSession session;
private final MailboxPath path;
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java
index 0a01ab5..1035687 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java
@@ -27,8 +27,6 @@ import java.util.Map;
import java.util.Random;
import org.apache.james.mailbox.MailboxSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class MockMailboxSession implements MailboxSession{
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java
index c330140..7ab1b4f 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java
@@ -35,8 +35,6 @@ import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.StoreMessageManager;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* JCR implementation of a MailboxManager
@@ -44,8 +42,6 @@ import org.slf4j.LoggerFactory;
*/
public class JCRMailboxManager extends StoreMailboxManager implements JCRImapConstants {
- private final Logger logger = LoggerFactory.getLogger(JCRMailboxManager.class);
-
public JCRMailboxManager(JCRMailboxSessionMapperFactory mapperFactory, Authenticator authenticator, Authorizator authorizator,
MailboxACLResolver aclResolver, GroupMembershipResolver groupMembershipResolver,
MessageParser messageParser, MessageId.Factory messageIdFactory) {
@@ -72,7 +68,6 @@ public class JCRMailboxManager extends StoreMailboxManager implements JCRImapCon
(JCRMailbox) mailboxEntity,
getAclResolver(),
getGroupMembershipResolver(),
- logger,
getQuotaManager(),
getQuotaRootResolver(),
getMessageParser(),
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
----------------------------------------------------------------------
diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
index 7307087..08b4688 100644
--- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
+++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
@@ -44,7 +44,6 @@ import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
-import org.slf4j.Logger;
/**
* JCR implementation of a {@link org.apache.james.mailbox.MessageManager}
@@ -52,16 +51,13 @@ import org.slf4j.Logger;
*/
public class JCRMessageManager extends StoreMessageManager {
- private final Logger log;
-
public JCRMessageManager(MailboxSessionMapperFactory mapperFactory, MessageSearchIndex index,
final MailboxEventDispatcher dispatcher, MailboxPathLocker locker, JCRMailbox mailbox,
- MailboxACLResolver aclResolver, GroupMembershipResolver groupMembershipResolver, Logger log,
+ MailboxACLResolver aclResolver, GroupMembershipResolver groupMembershipResolver,
QuotaManager quotaManager, QuotaRootResolver quotaRootResolver, MessageParser messageParser, MessageId.Factory messageIdFactory, BatchSizes batchSizes, ImmutableMailboxMessage.Factory immutableMailboxMessageFactory)
throws MailboxException {
super(mapperFactory, index, dispatcher, locker, mailbox, aclResolver, groupMembershipResolver, quotaManager,
quotaRootResolver, messageParser, messageIdFactory, batchSizes, immutableMailboxMessageFactory);
- this.log = log;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
index 5625a31..7f99d34 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java
@@ -37,7 +37,6 @@ import java.util.TimeZone;
import javax.mail.Flags;
-import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.exception.UnsupportedSearchException;
@@ -95,12 +94,10 @@ public class MessageSearches implements Iterable<SimpleMessageSearchIndex.Search
private Iterator<MailboxMessage> messages;
private SearchQuery query;
- private MailboxSession session;
- public MessageSearches(Iterator<MailboxMessage> messages, SearchQuery query, MailboxSession session) {
+ public MessageSearches(Iterator<MailboxMessage> messages, SearchQuery query) {
this.messages = messages;
this.query = query;
- this.session = session;
}
/**
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java
index 60f98a8..a716105 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java
@@ -140,7 +140,7 @@ public class SimpleMessageSearchIndex implements MessageSearchIndex {
hitSet.add(m);
}
}
- return ImmutableList.copyOf(new MessageSearches(hitSet.iterator(), query, session).iterator());
+ return ImmutableList.copyOf(new MessageSearches(hitSet.iterator(), query).iterator());
}
private boolean isMatchingUser(MailboxSession session, Mailbox mailbox) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java
index be87636..6f0cee6 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/GroupFolderResolverTest.java
@@ -28,12 +28,10 @@ import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.junit.Test;
-import org.slf4j.Logger;
public class GroupFolderResolverTest {
private static final long UID_VALIDITY = 9999;
- private Logger log = null;
private List<Locale> localePreferences = null;
private List<String> sharedSpaces = null;
private char pathSeparator = ' ';
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
----------------------------------------------------------------------
diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
index 0581e2e..1f7c4ce 100644
--- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
+++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
@@ -679,7 +679,6 @@ public class ProtocolSession implements ProtocolInteractor {
* An exception which is thrown when the actual response from a server is
* different from that expected.
*/
- @SuppressWarnings("serial")
public static class InvalidServerResponseException extends Exception {
public InvalidServerResponseException(String message) {
super(message);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java
index edce42d..6d630ae 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java
@@ -45,8 +45,6 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableList;
-
public class EnableProcessor extends AbstractMailboxProcessor<EnableRequest> implements CapabilityImplementingProcessor {
private static final Logger LOGGER = LoggerFactory.getLogger(EnableProcessor.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java
----------------------------------------------------------------------
diff --git a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java
index f2badab..dee82d3 100644
--- a/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java
+++ b/protocols/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java
@@ -51,13 +51,9 @@ import org.apache.james.protocols.smtp.hook.MessageHook;
import org.apache.james.protocols.smtp.utils.TestMessageHook;
import org.junit.Ignore;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public abstract class AbstractLMTPServerTest extends AbstractSMTPServerTest{
- private static final Logger LOGGER = LoggerFactory.getLogger(AbstractLMTPServerTest.class);
-
@Override
protected Protocol createProtocol(ProtocolHandler... handlers) throws WiringException {
LMTPProtocolHandlerChain chain = new LMTPProtocolHandlerChain();
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java
index dda1f7f..595a938 100644
--- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java
+++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractPOP3ServerTest.java
@@ -42,14 +42,11 @@ import org.apache.james.protocols.pop3.utils.MockMailbox;
import org.apache.james.protocols.pop3.utils.MockMailbox.Message;
import org.apache.james.protocols.pop3.utils.TestPassCmdHandler;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public abstract class AbstractPOP3ServerTest {
private static final Message MESSAGE1 = new Message("Subject: test\r\nX-Header: value\r\n", "My Body\r\n");
private static final Message MESSAGE2 = new Message("Subject: test2\r\nX-Header: value2\r\n", "My Body with a DOT.\r\n.\r\n");
- private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPOP3ServerTest.class);
private POP3Protocol createProtocol(AbstractPassCmdHandler handler) throws WiringException {
return new POP3Protocol(new POP3ProtocolHandlerChain(handler), new POP3Configuration());
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java
----------------------------------------------------------------------
diff --git a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java
index 418f749..eae5020 100644
--- a/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java
+++ b/protocols/pop3/src/test/java/org/apache/james/protocols/pop3/AbstractStartTlsPOP3ServerTest.java
@@ -37,14 +37,11 @@ import org.apache.james.protocols.pop3.core.AbstractPassCmdHandler;
import org.apache.james.protocols.pop3.utils.MockMailbox;
import org.apache.james.protocols.pop3.utils.TestPassCmdHandler;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public abstract class AbstractStartTlsPOP3ServerTest {
private static final String LOCALHOST_IP = "127.0.0.1";
private static final int RANDOM_PORT = 0;
- private static final Logger LOGGER = LoggerFactory.getLogger(AbstractStartTlsPOP3ServerTest.class);
private POP3Protocol createProtocol(AbstractPassCmdHandler handler) throws WiringException {
return new POP3Protocol(new POP3ProtocolHandlerChain(handler), new POP3Configuration());
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java
index b29b329..bae1991 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractSMTPServerTest.java
@@ -53,8 +53,6 @@ import org.apache.james.protocols.smtp.hook.RcptHook;
import org.apache.james.protocols.smtp.utils.TestMessageHook;
import org.apache.james.util.concurrency.ConcurrentTestRunner;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Charsets;
import com.google.common.io.CharStreams;
@@ -65,7 +63,6 @@ public abstract class AbstractSMTPServerTest {
protected final static String SENDER = "me@sender";
protected final static String RCPT1 ="rpct1@domain";
protected final static String RCPT2 ="rpct2@domain";
- private static final Logger LOGGER = LoggerFactory.getLogger(AbstractSMTPServerTest.class);
@Test
public void testSimpleDelivery() throws Exception {
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java
index 624b2dc..5c4750e 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java
@@ -53,8 +53,6 @@ import org.apache.james.protocols.smtp.utils.TestMessageHook;
import org.assertj.core.api.AssertDelegateTarget;
import org.junit.After;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Optional;
import com.sun.mail.smtp.SMTPTransport;
@@ -63,7 +61,6 @@ public class NettyStartTlsSMTPServerTest {
private static final String LOCALHOST_IP = "127.0.0.1";
private static final int RANDOM_PORT = 0;
- private static final Logger LOGGER = LoggerFactory.getLogger(NettyStartTlsSMTPServerTest.class);
private SMTPSClient smtpsClient = null;
private ProtocolServer server = null;
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/container/guice/guice-common/src/main/java/org/apache/james/utils/InMemoryMailRepositoryStore.java
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/InMemoryMailRepositoryStore.java b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/InMemoryMailRepositoryStore.java
index 1c11f3b..17b87a2 100644
--- a/server/container/guice/guice-common/src/main/java/org/apache/james/utils/InMemoryMailRepositoryStore.java
+++ b/server/container/guice/guice-common/src/main/java/org/apache/james/utils/InMemoryMailRepositoryStore.java
@@ -31,7 +31,6 @@ import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.lifecycle.api.Configurable;
-import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.mailrepository.api.MailRepository;
import org.apache.james.mailrepository.api.MailRepositoryStore;
import org.apache.james.repository.api.Initializable;
@@ -135,9 +134,6 @@ public class InMemoryMailRepositoryStore implements MailRepositoryStore, Configu
private MailRepository initialiseNewRepository(MailRepository mailRepository, CombinedConfiguration config) throws MailRepositoryStoreException {
try {
- if (mailRepository instanceof LogEnabled) {
- ((LogEnabled) mailRepository).setLog(LOGGER);
- }
if (mailRepository instanceof Configurable) {
((Configurable) mailRepository).configure(config);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java
index 7f2be3d..1761e3a 100644
--- a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java
+++ b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java
@@ -26,8 +26,6 @@ import org.apache.james.domainlist.jpa.JPADomainList;
import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.utils.ConfigurationPerformer;
import org.apache.james.utils.ConfigurationProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
@@ -39,8 +37,6 @@ import com.google.inject.multibindings.Multibinder;
public class JPADomainListModule extends AbstractModule {
- private static final Logger LOGGER = LoggerFactory.getLogger(DomainList.class);
-
@Override
public void configure() {
bind(JPADomainList.class).in(Scopes.SINGLETON);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
----------------------------------------------------------------------
diff --git a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
index 5a19e55..c5f2410 100644
--- a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
+++ b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
@@ -45,14 +45,11 @@ import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Charsets;
public class MailboxManagementTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(MailboxManagementTest.class);
public static final String USER = "user";
public static final int UID_VALIDITY = 10;
public static final int LIMIT = 1;
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
index 4c93944..53a7b7d 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
@@ -32,7 +32,6 @@ import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.container.spring.bean.factory.AbstractBeanFactory;
import org.apache.james.lifecycle.api.Configurable;
-import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.mailrepository.api.MailRepository;
import org.apache.james.mailrepository.api.MailRepositoryStore;
import org.slf4j.Logger;
@@ -194,10 +193,6 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen
Class<MailRepository> clazz = (Class<MailRepository>) getBeanFactory().getBeanClassLoader().loadClass(repClass);
reply = (MailRepository) getBeanFactory().autowire(clazz, ConfigurableListableBeanFactory.AUTOWIRE_AUTODETECT, false);
- if (reply instanceof LogEnabled) {
- ((LogEnabled) reply).setLog(LOGGER);
- }
-
if (reply instanceof Configurable) {
((Configurable) reply).configure(config);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OsgiLifecycleBeanFactoryPostProcessor.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OsgiLifecycleBeanFactoryPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OsgiLifecycleBeanFactoryPostProcessor.java
index 6c33289..7fd8dca 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OsgiLifecycleBeanFactoryPostProcessor.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OsgiLifecycleBeanFactoryPostProcessor.java
@@ -34,6 +34,7 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.osgi.extender.OsgiBeanFactoryPostProcessor;
+@SuppressWarnings("deprecation")
public class OsgiLifecycleBeanFactoryPostProcessor implements OsgiBeanFactoryPostProcessor {
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/container/util-java8/src/test/java/org/apache/james/util/MDCBuilderTest.java
----------------------------------------------------------------------
diff --git a/server/container/util-java8/src/test/java/org/apache/james/util/MDCBuilderTest.java b/server/container/util-java8/src/test/java/org/apache/james/util/MDCBuilderTest.java
index 8e4d4f1..d8ac33c 100644
--- a/server/container/util-java8/src/test/java/org/apache/james/util/MDCBuilderTest.java
+++ b/server/container/util-java8/src/test/java/org/apache/james/util/MDCBuilderTest.java
@@ -87,6 +87,7 @@ public class MDCBuilderTest {
.containsEntry(KEY_2, VALUE_2);
}
+ @SuppressWarnings("resource")
@Test
public void closeablesConstructorShouldThrowOnNullList() {
expectedException.expect(NullPointerException.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/data/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryStore.java
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryStore.java b/server/data/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryStore.java
index 33ac902..d44d669 100644
--- a/server/data/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryStore.java
+++ b/server/data/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepositoryStore.java
@@ -40,7 +40,6 @@ public interface MailRepositoryStore {
*/
List<String> getUrls();
- @SuppressWarnings("serial")
class MailRepositoryStoreException extends Exception {
public MailRepositoryStoreException(String msg, Throwable t) {
super(msg, t);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
index acd16de..1474431 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
@@ -187,7 +187,6 @@ final class MessageInputStream extends InputStream {
}
}
- @SuppressWarnings("serial")
private void throwException() throws IOException {
try {
if (wrapped == null) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/dns-service/dnsservice-api/src/main/java/org/apache/james/dnsservice/api/TemporaryResolutionException.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-api/src/main/java/org/apache/james/dnsservice/api/TemporaryResolutionException.java b/server/dns-service/dnsservice-api/src/main/java/org/apache/james/dnsservice/api/TemporaryResolutionException.java
index 529d6d4..c6f99cd 100644
--- a/server/dns-service/dnsservice-api/src/main/java/org/apache/james/dnsservice/api/TemporaryResolutionException.java
+++ b/server/dns-service/dnsservice-api/src/main/java/org/apache/james/dnsservice/api/TemporaryResolutionException.java
@@ -23,7 +23,6 @@ import java.io.IOException;
/**
* Exception to throw when a temporary DNS resolution problem occurs.
*/
-@SuppressWarnings("serial")
public class TemporaryResolutionException extends IOException {
public TemporaryResolutionException() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java
index 01c9bf0..b1f88ac 100644
--- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java
+++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java
@@ -33,12 +33,8 @@ import org.apache.james.user.memory.MemoryUsersRepository;
import org.apache.mailet.MailAddress;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class JamesMailetContextTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(JamesMailetContextTest.class);
-
public static final String DOMAIN_COM = "domain.com";
public static final String USERNAME = "user";
public static final String USERMAIL = USERNAME + "@" + DOMAIN_COM;
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java b/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java
index 266e3b2..557f101 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java
@@ -38,7 +38,6 @@ import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.Mailet;
import org.apache.mailet.MailetConfig;
-import org.apache.mailet.MailetContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -148,7 +147,6 @@ public class InstrumentationMailet implements Mailet {
}
private void printAddresses(Address[] addresses, String prefix) {
- MailetContext context = config.getMailetContext();
for (Address address1 : addresses) {
if (address1 instanceof InternetAddress) {
InternetAddress address = (InternetAddress) address1;
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java
index c69cdff..b2b325b 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java
@@ -39,13 +39,10 @@ import org.apache.mailet.base.test.FakeMailContext;
import org.apache.mailet.base.test.FakeMailetConfig;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Optional;
public class BouncerTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(BouncerTest.class);
public static final String HELLO_NAME = "hello_name";
public static final String BOUNCE_PROCESSOR = "bounce_processor";
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DeliveryRunnableTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DeliveryRunnableTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DeliveryRunnableTest.java
index 4147bff..daad6e8 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DeliveryRunnableTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DeliveryRunnableTest.java
@@ -42,14 +42,11 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Supplier;
public class DeliveryRunnableTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(DeliveryRunnableTest.class);
public static final Date FIXED_DATE = new Date(1159599194961L);
public static final Supplier<Date> FIXED_DATE_SUPPLIER = () -> FIXED_DATE;
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/protocols/jmap/src/main/java/org/apache/james/jmap/AccessTokenAuthenticationStrategy.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/AccessTokenAuthenticationStrategy.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/AccessTokenAuthenticationStrategy.java
index 17598ca..9227662 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/AccessTokenAuthenticationStrategy.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/AccessTokenAuthenticationStrategy.java
@@ -31,15 +31,11 @@ import org.apache.james.jmap.utils.HeadersAuthenticationExtractor;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.exception.MailboxException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
public class AccessTokenAuthenticationStrategy implements AuthenticationStrategy {
- private static final Logger LOG = LoggerFactory.getLogger(AccessTokenAuthenticationStrategy.class);
-
private final AccessTokenManager accessTokenManager;
private final MailboxManager mailboxManager;
private final HeadersAuthenticationExtractor authenticationExtractor;
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
index 8420693..63646b4 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
@@ -113,7 +113,6 @@ public class NettyImapRequestLineReader extends AbstractNettyImapRequestLineRead
* {@link NettyImapRequestLineReader#read(int, boolean)} if not enough data is
* readable in the underlying {@link ChannelBuffer}
*/
- @SuppressWarnings("serial")
public final class NotEnoughDataException extends RuntimeException {
public final static int UNKNOWN_SIZE = -1;
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
index 422eed8..4631990 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
@@ -73,7 +73,7 @@ public abstract class AbstractCommandHandlerResultJMXMonitor<S extends ProtocolS
* @see
* org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
*/
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({ "unchecked", "rawtypes", "unlikely-arg-type" })
public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException {
if (interfaceName.equals(CommandHandler.class)) {
// add stats for all hooks
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java
index d9551e8..4021606 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java
@@ -85,6 +85,7 @@ public abstract class AbstractConnectHandlerResultJMXMonitor<R extends Response,
* @see
* org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
*/
+ @SuppressWarnings("unlikely-arg-type")
public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException {
if (interfaceName.equals(ConnectHandler.class)) {
// add stats for all hooks
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java
index 5a6cd17..9d93d16 100644
--- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java
+++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java
@@ -70,6 +70,7 @@ public abstract class AbstractLineHandlerResultJMXMonitor<R extends Response, S
* @see
* org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
*/
+ @SuppressWarnings("unlikely-arg-type")
public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException {
if (interfaceName.equals(LineHandler.class)) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java b/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java
index 64c9e39..4128280 100644
--- a/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java
+++ b/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java
@@ -22,7 +22,6 @@ package org.apache.james.pop3server;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.pop3server.core.CoreCmdHandlerLoader;
-@SuppressWarnings("serial")
public class POP3TestConfiguration extends DefaultConfigurationBuilder {
public void init() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java
index 53b976b..0db5feb 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java
@@ -54,9 +54,6 @@ public class TLDLookup {
/** A set of all known three-part TLDs */
static private final HashSet<String> threePartTLDs = initThreePartTLDs();
- /** controls testing/debug output */
- static private final boolean testing = false;
-
/**
* Determines if a two-part domain string (xxx.xxx) is contained in the
* cache of known two-part TLDs.
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
index 6662885..e7124c3 100644
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
+++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
@@ -26,7 +26,6 @@ import org.apache.james.smtpserver.fastfail.ResolvableEhloHeloHandler;
import org.apache.james.smtpserver.fastfail.ReverseEqualsEhloHeloHandler;
import org.apache.james.smtpserver.fastfail.ValidSenderDomainHandler;
-@SuppressWarnings("serial")
public class SMTPTestConfiguration extends DefaultConfigurationBuilder {
private int m_maxMessageSizeKB = 0;
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java b/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java
index db3d0af..981b949 100644
--- a/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java
+++ b/server/queue/queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java
@@ -33,8 +33,6 @@ import org.apache.james.queue.jms.AbstractJMSMailQueueTest;
import org.apache.james.queue.jms.JMSMailQueue;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public abstract class ActiveMQMailQueueTest extends AbstractJMSMailQueueTest {
@@ -75,8 +73,6 @@ public abstract class ActiveMQMailQueueTest extends AbstractJMSMailQueueTest {
@Override
protected JMSMailQueue createQueue(ConnectionFactory factory, MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory, String queueName) {
- Logger log = LoggerFactory.getLogger(ActiveMQMailQueueTest.class);
-
return new ActiveMQMailQueue(factory, mailQueueItemDecoratorFactory, queueName, useBlobMessages(), new NoopMetricFactory());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java b/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java
index ff76968..f78835f 100644
--- a/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java
+++ b/server/queue/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java
@@ -93,7 +93,6 @@ public interface MailQueue {
* Exception which will get thrown if any problems occur while working the
* {@link MailQueue}
*/
- @SuppressWarnings("serial")
class MailQueueException extends MessagingException {
public MailQueueException(String msg, Exception e) {
super(msg, e);
http://git-wip-us.apache.org/repos/asf/james-project/blob/c147f0a0/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java b/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java
index 6ecd43b..1e2af52 100644
--- a/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java
+++ b/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java
@@ -50,8 +50,6 @@ import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Basic JMS test class. Extend this class and start the JMS broker in the super class,
@@ -68,7 +66,6 @@ public abstract class AbstractJMSMailQueueTest {
}
protected JMSMailQueue createQueue(ConnectionFactory factory, MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory, String queueName) {
- Logger log = LoggerFactory.getLogger(AbstractJMSMailQueueTest.class);
return new JMSMailQueue(factory, mailQueueItemDecoratorFactory, queueName, new NoopMetricFactory());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[22/29] james-project git commit: JAMES-2124 Solve more Eclipse
warnings
Posted by bt...@apache.org.
JAMES-2124 Solve more Eclipse warnings
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/bca6e8d5
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/bca6e8d5
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/bca6e8d5
Branch: refs/heads/master
Commit: bca6e8d54d08a3d21942a6fca83136bb4bde2d2d
Parents: 435c5e6
Author: benwa <bt...@linagora.com>
Authored: Thu Aug 24 15:26:43 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Aug 25 18:18:14 2017 +0700
----------------------------------------------------------------------
mailbox/hbase/pom.xml | 3 +--
mailbox/zoo-seq-provider/pom.xml | 3 +--
mailet/icalendar/pom.xml | 2 --
mpt/impl/imap-mailbox/hbase/pom.xml | 2 +-
server/container/guice/cassandra-ldap-guice/pom.xml | 1 -
server/data/data-hbase/pom.xml | 3 +--
6 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/bca6e8d5/mailbox/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/hbase/pom.xml b/mailbox/hbase/pom.xml
index 30c3df4..de494ed 100644
--- a/mailbox/hbase/pom.xml
+++ b/mailbox/hbase/pom.xml
@@ -49,8 +49,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>11.0.2</version>
- <!--$NO-MVN-MAN-VER$-->
+ <version>11.0.2</version><!--$NO-MVN-MAN-VER$-->
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/bca6e8d5/mailbox/zoo-seq-provider/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/zoo-seq-provider/pom.xml b/mailbox/zoo-seq-provider/pom.xml
index 8acfbbb..64f9343 100644
--- a/mailbox/zoo-seq-provider/pom.xml
+++ b/mailbox/zoo-seq-provider/pom.xml
@@ -48,8 +48,7 @@
<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>
http://git-wip-us.apache.org/repos/asf/james-project/blob/bca6e8d5/mailet/icalendar/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/icalendar/pom.xml b/mailet/icalendar/pom.xml
index e8ca072..e28e341 100644
--- a/mailet/icalendar/pom.xml
+++ b/mailet/icalendar/pom.xml
@@ -43,7 +43,6 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.1.6</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -57,7 +56,6 @@
<dependency>
<groupId>com.github.fge</groupId>
<artifactId>throwing-lambdas</artifactId>
- <version>0.5.0</version>
</dependency>
<dependency>
<groupId>com.github.steveash.guavate</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/bca6e8d5/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 fb991bf..68fdb69 100644
--- a/mpt/impl/imap-mailbox/hbase/pom.xml
+++ b/mpt/impl/imap-mailbox/hbase/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>13.0</version>
+ <version>13.0</version><!--$NO-MVN-MAN-VER$-->
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/bca6e8d5/server/container/guice/cassandra-ldap-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-ldap-guice/pom.xml b/server/container/guice/cassandra-ldap-guice/pom.xml
index f434eaf..aa60944 100644
--- a/server/container/guice/cassandra-ldap-guice/pom.xml
+++ b/server/container/guice/cassandra-ldap-guice/pom.xml
@@ -114,7 +114,6 @@
<dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
- <version>${cassandra-unit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/bca6e8d5/server/data/data-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/pom.xml b/server/data/data-hbase/pom.xml
index 027ad55..8b06286 100644
--- a/server/data/data-hbase/pom.xml
+++ b/server/data/data-hbase/pom.xml
@@ -68,8 +68,7 @@
<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>commons-codec</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[13/29] james-project git commit: JAMES-2124 Merge dependency
management in parent POM
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/ab4aec5f/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 2b52a7a..447d851 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -107,1540 +107,8 @@
<properties>
<productName>Apache-James Mail Server</productName>
-
- <activemq.version>5.15.0</activemq.version>
- <apache-mime4j.version>0.8.1</apache-mime4j.version>
- <camel.version>2.19.1</camel.version>
- <derby.version>10.9.1.0</derby.version>
- <hadoop.version>1.1.1</hadoop.version>
- <hbase.version>0.94.27</hbase.version>
- <javax.inject.version>1</javax.inject.version>
- <javax.activation.groupId>javax.activation</javax.activation.groupId>
- <javax.activation.artifactId>activation</javax.activation.artifactId>
- <jackrabbit.version>2.5.2</jackrabbit.version>
- <jsieve.version>0.7</jsieve.version>
- <spring.version>3.2.14.RELEASE</spring.version>
- <geronimo-jms-spec.version>1.1.1</geronimo-jms-spec.version>
- <activmq-artemis.version>2.1.0</activmq-artemis.version>
- <h2.version>1.3.170</h2.version>
- <apache-jspf-resolver.version>1.0.1</apache-jspf-resolver.version>
- <javamail.version>1.5.4</javamail.version>
- <javax-activation.version>1.1.1</javax-activation.version>
- <geronimo-activation-spec.version>1.1</geronimo-activation-spec.version>
- <geronimo-javamail.version>1.8.3</geronimo-javamail.version>
- <slf4j.version>1.7.25</slf4j.version>
- <servlet-api.version>2.4</servlet-api.version>
- <!-- commons -->
- <commons-daemon.version>1.0.10</commons-daemon.version>
- <commons-collections.version>3.2.1</commons-collections.version>
- <commons-lang.version>2.6</commons-lang.version>
- <commons-codec.version>1.7</commons-codec.version>
- <commons-cli.version>1.2</commons-cli.version>
- <commons-pool.version>1.6</commons-pool.version>
- <commons-configuration.version>1.9</commons-configuration.version>
- <commons-dbcp.version>1.4</commons-dbcp.version>
- <commons-net.version>3.2</commons-net.version>
- <commons-beanutils-core.version>1.8.3</commons-beanutils-core.version>
- <commons-io.version>2.5</commons-io.version>
- <commons-logging.version>1.1.1</commons-logging.version>
-
- <dnsjava.version>2.1.1</dnsjava.version>
- <junit.version>4.11</junit.version>
- <jmock.version>2.6.0</jmock.version>
- <concurrent.version>1.3.4</concurrent.version>
- <log4j.version>1.2.17</log4j.version>
- <jcr.version>2.0</jcr.version>
- <xbean-spring.version>3.12</xbean-spring.version>
- <netty.version>3.10.6.Final</netty.version>
- <geronimo-annotation-spec.version>1.0.1</geronimo-annotation-spec.version>
- <spring-osgi-extender.version>1.2.1</spring-osgi-extender.version>
- <org.osgi.core.version>5.0.0</org.osgi.core.version>
- <guava.version>18.0</guava.version>
- <cucumber.version>1.2.4</cucumber.version>
-
- <!-- karaf dependencies -->
- <exam.version>2.6.0</exam.version>
- <url.version>1.4.0</url.version>
- <felix.version>4.0.3</felix.version>
- <pax-swissbox-tinybundles.version>1.3.1</pax-swissbox-tinybundles.version>
- <karaf.version>2.3.0</karaf.version>
- <karaf.tooling.exam.container.version>2.3.0</karaf.tooling.exam.container.version>
- <pax-logging-api.version>1.6.4</pax-logging-api.version>
- <mockito-core.version>1.9.0</mockito-core.version>
- <jackson-data.version>2.6.3</jackson-data.version>
- <jetty.version>9.4.4.v20170414</jetty.version>
- <cassandra-unit.version>2.1.9.2</cassandra-unit.version>
- <assertj-guava.version>3.1.0</assertj-guava.version>
- <guavate.version>1.0.0</guavate.version>
- <metrics.version>3.2.1</metrics.version>
- <joda.version>2.9.4</joda.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-es</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-es</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-jpa</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-jpa</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-cassandra</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-cassandra</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-elasticsearch</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-elasticsearch</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-hbase</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jcr</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jpa</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jpa</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-kafka</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-lucene</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-maildir</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-spring</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-collections</artifactId>
- <groupId>commons-collections</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <exclusions>
- <exclusion>
- <artifactId>commons-collections</artifactId>
- <groupId>commons-collections</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tika</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>pdfbox</artifactId>
- <groupId>org.apache.pdfbox</groupId>
- </exclusion>
- <exclusion>
- <artifactId>poi-ooxml</artifactId>
- <groupId>org.apache.poi</groupId>
- </exclusion>
- <exclusion>
- <artifactId>poi-scratchpad</artifactId>
- <groupId>org.apache.poi</groupId>
- </exclusion>
- <exclusion>
- <artifactId>netcdf</artifactId>
- <groupId>edu.ucar</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tika</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tool</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-jsieve-core</artifactId>
- <version>${jsieve.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-api</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>mail</artifactId>
- <groupId>javax.mail</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>mail</artifactId>
- <groupId>javax.mail</groupId>
- </exclusion>
- <exclusion>
- <artifactId>activation</artifactId>
- <groupId>javax.activation</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>mail</artifactId>
- <groupId>javax.mail</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-standard</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>mail</artifactId>
- <groupId>javax.mail</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-standard</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>mail</artifactId>
- <groupId>javax.mail</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- <version>${apache-mime4j.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mime4j-james-utils</artifactId>
- <version>${apache-mime4j.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-cassandra-guice</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-cassandra-guice</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-cassandra-ldap-guice</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-cli</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-cassandra</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-file</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-hbase</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-jcr</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-jdbc</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-jmap</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-jmap</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-jmap-cassandra</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-jpa</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-ldap</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-ldap-integration-testing</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-memory</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-dnsjava</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-library</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-library</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-fetchmail</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-common</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-jmap</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-jmap</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-mailbox</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-jetty</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-jmap</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-jmap-integration-testing</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-jmap-integration-testing</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-jwt</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
- <version>${project.version}</version>
- </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-mailetcontainer-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailetcontainer-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailetcontainer-camel</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailets</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-memory-guice</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-memory-guice</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-onami</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-imap4</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-library</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-library</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-lmtp</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-managesieve</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-pop3</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-smtp</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-smtp</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-activemq</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-file</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-jms</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-jms</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-spring</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-testing</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-util</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-util</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-util-java8</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>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-webadmin-cassandra</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-webadmin-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-webadmin-data</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-webadmin-mailbox</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-webadmin-swagger</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>metrics-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>metrics-dropwizard</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>metrics-logger</artifactId>
- <version>${project.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-guava</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.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
- <version>2.6.1</version>
- </dependency>
- <dependency>
- <groupId>com.github.fge</groupId>
- <artifactId>throwing-lambdas</artifactId>
- <version>0.5.0</version>
- </dependency>
-
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.1.7</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>${guava.version}</version>
- </dependency>
-
- <!-- Guice dependencies -->
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-multibindings</artifactId>
- <version>4.0</version>
- </dependency>
-
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>${h2.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.jason-goodwin</groupId>
- <artifactId>better-monads</artifactId>
- <version>0.4.0</version>
- </dependency>
- <dependency>
- <groupId>com.jayway.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <version>1.6.5</version>
- </dependency>
- <dependency>
- <groupId>com.jayway.jsonpath</groupId>
- <artifactId>json-path</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>com.jayway.restassured</groupId>
- <artifactId>rest-assured</artifactId>
- <version>2.6.0</version>
- </dependency>
- <dependency>
- <groupId>com.nurkiewicz.asyncretry</groupId>
- <artifactId>asyncretry</artifactId>
- <version>0.0.7</version>
- </dependency>
- <dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
- <version>4.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.sparkjava</groupId>
- <artifactId>spark-core</artifactId>
- <version>2.6.0</version>
- </dependency>
- <dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- <version>1.5.4</version>
- <exclusions>
- <exclusion>
- <artifactId>activation</artifactId>
- <groupId>javax.activation</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- <version>${commons-beanutils-core.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>${commons-cli.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>${commons-configuration.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-digester</artifactId>
- <groupId>commons-digester</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-beanutils-core</artifactId>
- <groupId>commons-beanutils</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-daemon</groupId>
- <artifactId>commons-daemon</artifactId>
- <version>${commons-daemon.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>${commons-dbcp.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>xercesImpl</artifactId>
- <groupId>xerces</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>${commons-net.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>${commons-pool.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>xercesImpl</artifactId>
- <groupId>xerces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xerces</artifactId>
- <groupId>xerces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xml-apis</artifactId>
- <groupId>xml-apis</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>${concurrent.version}</version>
- </dependency>
- <dependency>
- <groupId>dnsjava</groupId>
- <artifactId>dnsjava</artifactId>
- <version>${dnsjava.version}</version>
- </dependency>
- <dependency>
- <groupId>info.cukes</groupId>
- <artifactId>cucumber-guice</artifactId>
- <version>${cucumber.version}</version>
- </dependency>
- <dependency>
- <groupId>info.cukes</groupId>
- <artifactId>cucumber-java</artifactId>
- <version>${cucumber.version}</version>
- </dependency>
- <dependency>
- <groupId>info.cukes</groupId>
- <artifactId>cucumber-junit</artifactId>
- <version>${cucumber.version}</version>
- </dependency>
- <dependency>
- <groupId>info.cukes</groupId>
- <artifactId>cucumber-picocontainer</artifactId>
- <version>${cucumber.version}</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>${metrics.version}</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-jvm</artifactId>
- <version>${metrics.version}</version>
- </dependency>
- <dependency>
- <groupId>io.jsonwebtoken</groupId>
- <artifactId>jjwt</artifactId>
- <version>0.6.0</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>${javax-activation.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>${javax.inject.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>${jcr.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet-api.version}</version>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>${joda.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- <version>${activemq.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>spring-osgi-core</artifactId>
- <groupId>org.springframework.osgi</groupId>
- </exclusion>
- <!-- exlude this, its only used in the authentication plugin which we don't use -->
- <exclusion>
- <artifactId>icu4j</artifactId>
- <groupId>com.ibm.icu</groupId>
- </exclusion>
- <!-- exclude this, we don't use osgi yet -->
- <exclusion>
- <artifactId>org.osgi.core</artifactId>
- <groupId>org.osgi</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-jms-client</artifactId>
- <version>${activmq-artemis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <version>${camel.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <artifactId>spring-web</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${felix.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>${geronimo-activation-spec.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <version>${geronimo-annotation-spec.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${geronimo-jms-spec.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <version>${hadoop.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>${hbase.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>${hbase.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <version>${jackrabbit.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>pdfbox</artifactId>
- <groupId>org.apache.pdfbox</groupId>
- </exclusion>
- <exclusion>
- <artifactId>netcdf</artifactId>
- <groupId>edu.ucar</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
- <version>${jackrabbit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-rmi</artifactId>
- <version>${jackrabbit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-karaf-distribution</artifactId>
- <version>${project.version}</version>
- <type>tar.gz</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>org.apache.karaf.client</artifactId>
- <groupId>org.apache.karaf</groupId>
- </exclusion>
- <exclusion>
- <artifactId>org.eclipse.osgi</artifactId>
- <groupId>org.eclipse.osgi</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-karaf-features</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.apache.james.jspf</groupId>
- <artifactId>apache-jspf-resolver</artifactId>
- <version>${apache-jspf-resolver.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>dnsjava</artifactId>
- <groupId>dnsjava</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-cli</artifactId>
- <groupId>commons-cli</groupId>
- </exclusion>
- <!-- only used for the asynchronous executors -->
- <exclusion>
- <artifactId>dnsjnio</artifactId>
- <groupId>uk.nominet</groupId>
- </exclusion>
- </exclusions>
- </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>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-imap</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </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-managesieve</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-managesieve</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-netty</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-smtp</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-smtp</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.tooling.exam</groupId>
- <artifactId>org.apache.karaf.tooling.exam.container</artifactId>
- <version>${karaf.tooling.exam.container.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <version>${xbean-spring.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <artifactId>spring-web</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- </exclusions>
- </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>${assertj-guava.version}</version>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <version>1.52</version>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>1.52</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-http</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch</groupId>
- <artifactId>metrics-elasticsearch-reporter</artifactId>
- <version>2.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>2.0.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>${jmock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito-core.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam</artifactId>
- <version>${exam.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit4</artifactId>
- <version>${exam.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-link-mvn</artifactId>
- <version>${exam.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-api</artifactId>
- <version>${pax-logging-api.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.swissbox</groupId>
- <artifactId>pax-swissbox-tinybundles</artifactId>
- <version>${pax-swissbox-tinybundles.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-aether</artifactId>
- <version>${url.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${org.osgi.core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jms</artifactId>
- <version>${spring.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- <version>${spring.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <artifactId>toplink</artifactId>
- <groupId>com.oracle.toplink</groupId>
- </exclusion>
- <exclusion>
- <artifactId>toplink-essentials</artifactId>
- <groupId>com.oracle</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hibernate</artifactId>
- <groupId>org.hibernate</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hibernate-entitymanager</artifactId>
- <groupId>org.hibernate</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-web</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-extender</artifactId>
- <version>${spring-osgi-extender.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>org.springframework.core</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>org.springframework.aop</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>org.springframework.context</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>org.springframework.beans</artifactId>
- <groupId>org.springframework</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
- <version>1.4.2</version>
- </dependency>
- <dependency>
- <groupId>org.xenei</groupId>
- <artifactId>junit-contracts</artifactId>
- <version>0.1.5</version>
- </dependency>
- <dependency>
- <groupId>pl.pragmatists</groupId>
- <artifactId>JUnitParams</artifactId>
- <version>1.0.4</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<repositories>
<!-- apache.snapshot is needed for james-project SNAPSHOT, see JAMES-1470 -->
<repository>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[08/29] james-project git commit: JAMES-2124 automatically sort all
dependencies
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/app/pom.xml
----------------------------------------------------------------------
diff --git a/server/app/pom.xml b/server/app/pom.xml
index ba0c491..1a5feba 100644
--- a/server/app/pom.xml
+++ b/server/app/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server</artifactId>
+ <groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -51,8 +51,7 @@
<javamail.system-properties>${javamail.system-property1} ${javamail.system-property2}
${javamail.system-property3} ${javamail.system-property4} ${javamail.system-property5}
${javamail.system-property6} ${javamail.system-property7} ${javamail.system-property8}
- ${javamail.system-property9} ${javamail.system-property10}
- </javamail.system-properties>
+ ${javamail.system-property9} ${javamail.system-property10}</javamail.system-properties>
<!-- JMX system properties -->
<!-- For more details see -->
@@ -74,11 +73,8 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-cli</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-core</artifactId>
+ <artifactId>apache-james-mailbox-jcr</artifactId>
+ <scope>runtime</scope>
<exclusions>
<exclusion>
<artifactId>mail</artifactId>
@@ -88,11 +84,19 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>metrics-logger</artifactId>
+ <artifactId>apache-james-mailbox-jpa</artifactId>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-api</artifactId>
+ <artifactId>apache-james-mailbox-memory</artifactId>
+ <scope>runtime</scope>
<exclusions>
<exclusion>
<artifactId>mail</artifactId>
@@ -102,9 +106,18 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-library</artifactId>
+ <artifactId>apache-james-mailbox-spring</artifactId>
+ <scope>runtime</scope>
<exclusions>
<exclusion>
+ <artifactId>hbase</artifactId>
+ <groupId>org.apache.hbase</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>hadoop-core</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ </exclusion>
+ <exclusion>
<artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
</exclusion>
@@ -112,15 +125,21 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
+ <artifactId>james-server-cli</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>james-server-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailetcontainer-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
<exclusions>
<exclusion>
<artifactId>mail</artifactId>
@@ -128,9 +147,11 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-api</artifactId>
+ <artifactId>james-server-data-file</artifactId>
+ <scope>runtime</scope>
<exclusions>
<exclusion>
<artifactId>mail</artifactId>
@@ -140,15 +161,24 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-spring</artifactId>
+ <artifactId>james-server-data-hbase</artifactId>
+ <scope>runtime</scope>
<exclusions>
<exclusion>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-extender</artifactId>
+ <artifactId>jruby-complete</artifactId>
+ <groupId>org.jruby</groupId>
</exclusion>
<exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>hsqldb</artifactId>
+ <groupId>hsqldb</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>hbase</artifactId>
+ <groupId>org.apache.hbase</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>hadoop-core</artifactId>
+ <groupId>org.apache.hadoop</groupId>
</exclusion>
<exclusion>
<artifactId>mail</artifactId>
@@ -156,77 +186,62 @@
</exclusion>
</exclusions>
</dependency>
- <!-- Runtime dependencies which will get included in the generated binary distribution -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-daemon</groupId>
- <artifactId>commons-daemon</artifactId>
- </dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-jcr</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>tools</artifactId>
- <groupId>com.sun</groupId>
+ <artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-jdbc</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>tools</artifactId>
- <groupId>com.sun</groupId>
+ <artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-jpa</artifactId>
<scope>runtime</scope>
</dependency>
-
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jms</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-ldap</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-data-library</artifactId>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-dnsservice-api</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-dnsservice-dnsjava</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailetcontainer-camel</artifactId>
- <scope>runtime</scope>
+ <artifactId>james-server-dnsservice-library</artifactId>
<exclusions>
<exclusion>
<artifactId>mail</artifactId>
@@ -236,7 +251,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailbox-adapter</artifactId>
+ <artifactId>james-server-fetchmail</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -247,30 +262,15 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-dnsservice-dnsjava</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>metrics-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>metrics-dropwizard</artifactId>
+ <artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-library</artifactId>
- <scope>runtime</scope>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util</artifactId>
+ <artifactId>james-server-mailbox-adapter</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -281,8 +281,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-library</artifactId>
- <scope>runtime</scope>
+ <artifactId>james-server-mailetcontainer-api</artifactId>
<exclusions>
<exclusion>
<artifactId>mail</artifactId>
@@ -292,13 +291,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-ldap</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-smtp</artifactId>
+ <artifactId>james-server-mailetcontainer-camel</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -309,12 +302,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-imap4</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-lmtp</artifactId>
+ <artifactId>james-server-mailets</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -325,12 +313,17 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-managesieve</artifactId>
+ <artifactId>james-server-protocols-imap4</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-pop3</artifactId>
+ <artifactId>james-server-protocols-library</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-protocols-lmtp</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -340,12 +333,13 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-managesieve</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-protocols-managesieve</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-fetchmail</artifactId>
+ <artifactId>james-server-protocols-pop3</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -354,9 +348,10 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-file</artifactId>
+ <artifactId>james-server-protocols-smtp</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -367,7 +362,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-jms</artifactId>
+ <artifactId>james-server-queue-activemq</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -378,8 +373,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-activemq</artifactId>
- <scope>runtime</scope>
+ <artifactId>james-server-queue-api</artifactId>
<exclusions>
<exclusion>
<artifactId>mail</artifactId>
@@ -389,7 +383,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-mailets</artifactId>
+ <artifactId>james-server-queue-file</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -398,27 +392,9 @@
</exclusion>
</exclusions>
</dependency>
- <!-- Comment jackrabbit dependency to avoid lucene version clash with mailbox-lucene (JAMES-1297)
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- -->
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jpa</artifactId>
+ <artifactId>james-server-queue-jms</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -429,16 +405,15 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-spring</artifactId>
- <scope>runtime</scope>
+ <artifactId>james-server-spring</artifactId>
<exclusions>
<exclusion>
- <artifactId>hbase</artifactId>
- <groupId>org.apache.hbase</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ <groupId>org.springframework.osgi</groupId>
</exclusion>
<exclusion>
- <artifactId>hadoop-core</artifactId>
- <groupId>org.apache.hadoop</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <groupId>org.osgi</groupId>
</exclusion>
<exclusion>
<artifactId>mail</artifactId>
@@ -448,7 +423,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-jcr</artifactId>
+ <artifactId>james-server-util</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -459,80 +434,59 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <artifactId>mail</artifactId>
- <groupId>javax.mail</groupId>
- </exclusion>
- </exclusions>
+ <artifactId>metrics-api</artifactId>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-file</artifactId>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <artifactId>mail</artifactId>
- <groupId>javax.mail</groupId>
- </exclusion>
- </exclusions>
+ <artifactId>metrics-dropwizard</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-jpa</artifactId>
- <scope>runtime</scope>
+ <artifactId>metrics-logger</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-jdbc</artifactId>
+ <groupId>commons-daemon</groupId>
+ <artifactId>commons-daemon</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
- <groupId>javax.mail</groupId>
+ <artifactId>tools</artifactId>
+ <groupId>com.sun</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-hbase</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
- <groupId>org.jruby</groupId>
- <artifactId>jruby-complete</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>hsqldb</artifactId>
- <groupId>hsqldb</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hbase</artifactId>
- <groupId>org.apache.hbase</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hadoop-core</artifactId>
- <groupId>org.apache.hadoop</groupId>
- </exclusion>
- <exclusion>
- <artifactId>mail</artifactId>
- <groupId>javax.mail</groupId>
+ <artifactId>tools</artifactId>
+ <groupId>com.sun</groupId>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-data-jcr</artifactId>
+ <!-- Comment jackrabbit dependency to avoid lucene version clash with mailbox-lucene (JAMES-1297)
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
<scope>runtime</scope>
<exclusions>
- <exclusion>
- <artifactId>mail</artifactId>
- <groupId>javax.mail</groupId>
- </exclusion>
+ <exclusion>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ </exclusion>
</exclusions>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
@@ -540,6 +494,51 @@
<artifactId>protocols-imap</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-managesieve</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <!-- Runtime dependencies which will get included in the generated binary distribution -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jms</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
@@ -553,35 +552,35 @@
</build>
<profiles>
- <profile>
+ <profile>
<id>build-for-jdk-8</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-elasticsearch</artifactId>
- <scope>runtime</scope>
- <exclusions>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-elasticsearch</artifactId>
+ <scope>runtime</scope>
+ <exclusions>
<exclusion>
- <artifactId>mail</artifactId>
- <groupId>javax.mail</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tika</artifactId>
- <scope>runtime</scope>
- <exclusions>
+ <artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-mailbox-tika</artifactId>
+ <scope>runtime</scope>
+ <exclusions>
<exclusion>
- <artifactId>mail</artifactId>
- <groupId>javax.mail</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
+ <artifactId>mail</artifactId>
+ <groupId>javax.mail</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
</profile>
<profile>
<id>cassandra</id>
@@ -592,6 +591,11 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>apache-james-backends-cassandra</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-cassandra</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -606,11 +610,6 @@
<artifactId>james-server-data-cassandra</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-james-backends-cassandra</artifactId>
- <scope>runtime</scope>
- </dependency>
</dependencies>
</profile>
<profile>
@@ -626,7 +625,7 @@
<profile>
<id>lucene</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
@@ -655,16 +654,16 @@
<groupId>javax.mail</groupId>
</exclusion>
<exclusion>
- <groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
+ <groupId>org.apache.lucene</groupId>
</exclusion>
<exclusion>
- <groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers</artifactId>
+ <groupId>org.apache.lucene</groupId>
</exclusion>
<exclusion>
- <groupId>org.apache.lucene</groupId>
<artifactId>lucene-smartcn</artifactId>
+ <groupId>org.apache.lucene</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -673,7 +672,7 @@
<profile>
<id>with-assembly</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
@@ -681,6 +680,16 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
<version>1.10</version>
+ <executions>
+ <execution>
+ <id>make-appassemble</id>
+ <phase>package</phase>
+ <goals>
+ <goal>assemble</goal>
+ <goal>generate-daemons</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<!-- Include etc/ in the beginning of the classpath declaration in the bin scripts -->
<includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
@@ -692,8 +701,7 @@
<environmentSetupFileName>setenv</environmentSetupFileName>
<!-- set some sane defaults for memory -->
<extraJvmArguments>${jvm.system-property1} -Xms128m -Xmx512m ${jmx.system-properties}
- ${javamail.system-properties} ${james.system-properties}
- </extraJvmArguments>
+ ${javamail.system-properties} ${james.system-properties}</extraJvmArguments>
<!-- Generate bin scripts for windows and unix per default -->
<platforms>
<platform>windows</platform>
@@ -920,16 +928,6 @@
</daemon>
</daemons>
</configuration>
- <executions>
- <execution>
- <id>make-appassemble</id>
- <phase>package</phase>
- <goals>
- <goal>assemble</goal>
- <goal>generate-daemons</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -938,41 +936,37 @@
<executions>
<execution>
<phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
<configuration>
<tasks>
<!-- this is only needed because windows freak out on long cmd lines, so we strip of the absolute path
from the lib dir to make windows happy again
-->
- <replace file="${project.build.directory}/appassembler/bin/run.bat" token="%BASEDIR%\lib" value="..\lib" />
- <replace file="${project.build.directory}/appassembler/bin/run.sh" token="setenv" value="setenv.sh" />
+ <replace file="${project.build.directory}/appassembler/bin/run.bat" token="%BASEDIR%\lib" value="..\lib"></replace>
+ <replace file="${project.build.directory}/appassembler/bin/run.sh" token="setenv" value="setenv.sh"></replace>
<!-- this is needed because appassembler is not really smart on some settings -->
- <replace file="${project.build.directory}/appassembler/jsw/james/conf/wrapper.conf" token="lib/wrapper.jar" value="%REPO_DIR%/wrapper.jar" />
- <replace file="${project.build.directory}/appassembler/jsw/james/bin/james" token="logs" value="var" />
+ <replace file="${project.build.directory}/appassembler/jsw/james/conf/wrapper.conf" token="lib/wrapper.jar" value="%REPO_DIR%/wrapper.jar"></replace>
+ <replace file="${project.build.directory}/appassembler/jsw/james/bin/james" token="logs" value="var"></replace>
<!-- copy the linux wrapper-linux-x86-32 to wrapper, so use it as default if no matching wrapper was found -->
- <copy file="${project.build.directory}/appassembler/jsw/james/bin/wrapper-linux-x86-32" tofile="${project.build.directory}/appassembler/jsw/james/bin/wrapper" />
+ <copy file="${project.build.directory}/appassembler/jsw/james/bin/wrapper-linux-x86-32" tofile="${project.build.directory}/appassembler/jsw/james/bin/wrapper"></copy>
<!-- this is only needed because windows freak out on long cmd lines, so we strip of the absolute path
from the lib dir to make windows happy again
-->
- <replace file="${project.build.directory}/appassembler/bin/james-cli.bat" token="%BASEDIR%\lib" value="..\lib" />
- <replace file="${project.build.directory}/appassembler/bin/james-cli.sh" token="setenv" value="setenv.sh" />
+ <replace file="${project.build.directory}/appassembler/bin/james-cli.bat" token="%BASEDIR%\lib" value="..\lib"></replace>
+ <replace file="${project.build.directory}/appassembler/bin/james-cli.sh" token="setenv" value="setenv.sh"></replace>
</tasks>
</configuration>
- <goals>
- <goal>run</goal>
- </goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
<executions>
<execution>
<id>make-assembly</id>
@@ -982,6 +976,10 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
</plugin>
<!--
The signing process excludes the artifact created by this plugin.
@@ -992,6 +990,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-war</id>
+ <phase>package</phase>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<webResources>
<resource>
@@ -1040,15 +1047,6 @@
</resource>
</webResources>
</configuration>
- <executions>
- <execution>
- <id>make-war</id>
- <phase>package</phase>
- <goals>
- <goal>war</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/cli-integration/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/cli-integration/pom.xml b/server/container/cli-integration/pom.xml
index 3bf5d72..394b7c2 100644
--- a/server/container/cli-integration/pom.xml
+++ b/server/container/cli-integration/pom.xml
@@ -70,15 +70,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- </dependency>
- <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/cli/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/cli/pom.xml b/server/container/cli/pom.xml
index 536712b..fb94d41 100644
--- a/server/container/cli/pom.xml
+++ b/server/container/cli/pom.xml
@@ -54,9 +54,9 @@
<artifactId>commons-cli</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>compile</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
@@ -64,16 +64,16 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.3.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/core/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml
index 8fc7b19..7f5c4d2 100644
--- a/server/container/core/pom.xml
+++ b/server/container/core/pom.xml
@@ -34,32 +34,45 @@
<dependencies>
<dependency>
+ <groupId>${javax.activation.groupId}</groupId>
+ <artifactId>${javax.activation.artifactId}</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
+ <artifactId>apache-mailet-api</artifactId>
</dependency>
+
+ <!-- RFC2822Headers constants imported from mailet-base (undetected by bytecode analyzers because constants are inlined) -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
+ <artifactId>apache-mailet-base</artifactId>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-mailet-base</artifactId>
+ <classifier>tests</classifier>
<scope>test</scope>
- <type>test-jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
+ <artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util</artifactId>
+ <artifactId>james-server-filesystem-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-api</artifactId>
+ <artifactId>james-server-lifecycle-api</artifactId>
</dependency>
-
- <!-- RFC2822Headers constants imported from mailet-base (undetected by bytecode analyzers because constants are inlined) -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-base</artifactId>
+ <artifactId>james-server-util</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -71,29 +84,16 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </dependency>
- <dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>${javax.activation.groupId}</groupId>
- <artifactId>${javax.activation.artifactId}</artifactId>
- <scope>provided</scope>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
</dependency>
-
- <!-- Test dependencies -->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/filesystem-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/filesystem-api/pom.xml b/server/container/filesystem-api/pom.xml
index 528d51c..deb9258 100644
--- a/server/container/filesystem-api/pom.xml
+++ b/server/container/filesystem-api/pom.xml
@@ -43,8 +43,8 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/cassandra-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml
index 7961e40..305b480 100644
--- a/server/container/guice/cassandra-guice/pom.xml
+++ b/server/container/guice/cassandra-guice/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-guice</artifactId>
+ <groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -38,14 +38,8 @@
<cassandra.includes>empty</cassandra.includes>
</properties>
-
<dependencies>
<dependency>
- <groupId>org.hdrhistogram</groupId>
- <artifactId>HdrHistogram</artifactId>
- <version>2.1.4</version>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<type>test-jar</type>
@@ -63,8 +57,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-cassandra</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -84,12 +78,12 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-icalendar</artifactId>
- <version>${project.version}</version>
+ <artifactId>apache-james-mailbox-tika</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mailbox-tika</artifactId>
+ <artifactId>apache-mailet-icalendar</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -101,11 +95,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>metrics-es-reporter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
</dependency>
<dependency>
@@ -128,6 +117,12 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>james-server-guice-jmap</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-guice-jmx</artifactId>
</dependency>
<dependency>
@@ -136,11 +131,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-pop</artifactId>
+ <artifactId>james-server-guice-managedsieve</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-managedsieve</artifactId>
+ <artifactId>james-server-guice-pop</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -174,15 +169,14 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-jmap</artifactId>
+ <artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-util-java8</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
+ <artifactId>metrics-es-reporter</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -217,6 +211,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.hdrhistogram</groupId>
+ <artifactId>HdrHistogram</artifactId>
+ <version>2.1.4</version>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
@@ -228,15 +227,6 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>cassandra</id>
- <properties>
- <cassandra.includes>**/*.java</cassandra.includes>
- </properties>
- </profile>
- </profiles>
-
<build>
<plugins>
<plugin>
@@ -248,13 +238,13 @@
<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>
+ <excludes>
+ <exclude>**/suite/*.java</exclude>
+ <exclude>**/suite/**/*.java</exclude>
+ </excludes>
+ <includes>
+ <include>${cassandra.includes}</include>
+ </includes>
</configuration>
</plugin>
<plugin>
@@ -304,4 +294,13 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>cassandra</id>
+ <properties>
+ <cassandra.includes>**/*.java</cassandra.includes>
+ </properties>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/cassandra-ldap-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-ldap-guice/pom.xml b/server/container/guice/cassandra-ldap-guice/pom.xml
index 38ea7f5..6510d26 100644
--- a/server/container/guice/cassandra-ldap-guice/pom.xml
+++ b/server/container/guice/cassandra-ldap-guice/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-guice</artifactId>
+ <groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -70,9 +70,9 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>james-server-data-ldap-integration-testing</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -93,8 +93,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>com.jayway.awaitility</groupId>
@@ -124,16 +124,6 @@
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>cassandra</id>
- <properties>
- <cassandra.includes>**/*.java</cassandra.includes>
- </properties>
- </profile>
- </profiles>
-
<build>
<plugins>
<plugin>
@@ -190,15 +180,24 @@
<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>
+ <excludes>
+ <exclude>**/suite/*.java</exclude>
+ <exclude>**/suite/**/*.java</exclude>
+ </excludes>
+ <includes>
+ <include>${cassandra.includes}</include>
+ </includes>
</configuration>
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>cassandra</id>
+ <properties>
+ <cassandra.includes>**/*.java</cassandra.includes>
+ </properties>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/configuration/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/configuration/pom.xml b/server/container/guice/configuration/pom.xml
index a45ec48..4cb99d3 100644
--- a/server/container/guice/configuration/pom.xml
+++ b/server/container/guice/configuration/pom.xml
@@ -18,13 +18,13 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-guice-configuration</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/custom-mailets/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/custom-mailets/pom.xml b/server/container/guice/custom-mailets/pom.xml
index 5acc265..e6d596e 100644
--- a/server/container/guice/custom-mailets/pom.xml
+++ b/server/container/guice/custom-mailets/pom.xml
@@ -18,13 +18,13 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-guice-custom-mailets</artifactId>
@@ -41,4 +41,4 @@
<artifactId>apache-mailet-base</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/guice-common/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml
index 237db49..fdff922 100644
--- a/server/container/guice/guice-common/pom.xml
+++ b/server/container/guice/guice-common/pom.xml
@@ -18,32 +18,28 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-guice-common</artifactId>
<name>Apache James :: Server :: Guice Common</name>
<description>Common modules for Guice implementation of James server</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>apache-mailet-base</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
@@ -90,12 +86,12 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-pop</artifactId>
- <scope>test</scope>
+ <artifactId>james-server-guice-mailet</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-mailet</artifactId>
+ <artifactId>james-server-guice-pop</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -113,35 +109,35 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>metrics-api</artifactId>
+ <artifactId>james-server-onami</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>metrics-logger</artifactId>
+ <artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>metrics-dropwizard</artifactId>
+ <artifactId>james-server-protocols-smtp</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-library</artifactId>
+ <artifactId>james-server-queue-activemq</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-protocols-smtp</artifactId>
+ <artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-api</artifactId>
+ <artifactId>metrics-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-queue-activemq</artifactId>
+ <artifactId>metrics-dropwizard</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-onami</artifactId>
+ <artifactId>metrics-logger</artifactId>
</dependency>
<dependency>
<groupId>com.github.steveash.guavate</groupId>
@@ -174,12 +170,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
@@ -195,4 +185,14 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/jmx/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jmx/pom.xml b/server/container/guice/jmx/pom.xml
index 4eae0ac..59cfeaf 100644
--- a/server/container/guice/jmx/pom.xml
+++ b/server/container/guice/jmx/pom.xml
@@ -18,29 +18,19 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-guice-jmx</artifactId>
- <name>Apache James :: Server :: Guice :: JMX </name>
+ <name>Apache James :: Server :: Guice :: JMX</name>
<description>JMX for Guice implementation of James server</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -52,11 +42,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-configuration</artifactId>
+ <artifactId>james-server-guice-common</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-common</artifactId>
+ <artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -75,6 +65,10 @@
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
+ <groupId>com.github.fge</groupId>
+ <artifactId>throwing-lambdas</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
@@ -83,13 +77,19 @@
<artifactId>guice-multibindings</artifactId>
</dependency>
<dependency>
- <groupId>com.github.fge</groupId>
- <artifactId>throwing-lambdas</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/jpa-common-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-common-guice/pom.xml b/server/container/guice/jpa-common-guice/pom.xml
index 2bdb3db..7680b06 100644
--- a/server/container/guice/jpa-common-guice/pom.xml
+++ b/server/container/guice/jpa-common-guice/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-guice</artifactId>
+ <groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -48,15 +48,6 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jpa</id>
- <properties>
- <jpa.includes>**/*.java</jpa.includes>
- </properties>
- </profile>
- </profiles>
-
<build>
<plugins>
<plugin>
@@ -68,15 +59,24 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
- <includes>
- <include>${jpa.includes}</include>
- </includes>
+ <excludes>
+ <exclude>**/suite/*.java</exclude>
+ <exclude>**/suite/**/*.java</exclude>
+ </excludes>
+ <includes>
+ <include>${jpa.includes}</include>
+ </includes>
</configuration>
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>jpa</id>
+ <properties>
+ <jpa.includes>**/*.java</jpa.includes>
+ </properties>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/jpa-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-guice/pom.xml b/server/container/guice/jpa-guice/pom.xml
index 4230338..6554fc7 100644
--- a/server/container/guice/jpa-guice/pom.xml
+++ b/server/container/guice/jpa-guice/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-guice</artifactId>
+ <groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -40,19 +40,14 @@
<dependencies>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -94,11 +89,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-pop</artifactId>
+ <artifactId>james-server-guice-managedsieve</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-managedsieve</artifactId>
+ <artifactId>james-server-guice-pop</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -142,6 +137,11 @@
<artifactId>asyncretry</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
@@ -153,15 +153,6 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jpa</id>
- <properties>
- <jpa.includes>**/*.java</jpa.includes>
- </properties>
- </profile>
- </profiles>
-
<build>
<plugins>
<plugin>
@@ -218,15 +209,24 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
- <includes>
- <include>${jpa.includes}</include>
- </includes>
+ <excludes>
+ <exclude>**/suite/*.java</exclude>
+ <exclude>**/suite/**/*.java</exclude>
+ </excludes>
+ <includes>
+ <include>${jpa.includes}</include>
+ </includes>
</configuration>
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>jpa</id>
+ <properties>
+ <jpa.includes>**/*.java</jpa.includes>
+ </properties>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/jpa-smtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/container/guice/jpa-smtp/pom.xml
index e716fa2..7e6034f 100644
--- a/server/container/guice/jpa-smtp/pom.xml
+++ b/server/container/guice/jpa-smtp/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-guice</artifactId>
+ <groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -38,15 +38,6 @@
<jpa.includes>empty</jpa.includes>
</properties>
- <profiles>
- <profile>
- <id>jpa</id>
- <properties>
- <jpa.includes>**/*.java</jpa.includes>
- </properties>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -79,15 +70,15 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-jpa-common-guice</artifactId>
+ <artifactId>james-server-guice-webadmin</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-webadmin</artifactId>
+ <artifactId>james-server-guice-webadmin-data</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-webadmin-data</artifactId>
+ <artifactId>james-server-jpa-common-guice</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -112,8 +103,8 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -194,15 +185,24 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
- <includes>
- <include>${jpa.includes}</include>
- </includes>
+ <excludes>
+ <exclude>**/suite/*.java</exclude>
+ <exclude>**/suite/**/*.java</exclude>
+ </excludes>
+ <includes>
+ <include>${jpa.includes}</include>
+ </includes>
</configuration>
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>jpa</id>
+ <properties>
+ <jpa.includes>**/*.java</jpa.includes>
+ </properties>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/mailbox/pom.xml b/server/container/guice/mailbox/pom.xml
index 7ef8c7c..4ec9b92 100644
--- a/server/container/guice/mailbox/pom.xml
+++ b/server/container/guice/mailbox/pom.xml
@@ -18,13 +18,13 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-guice-mailbox</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/mailet/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/mailet/pom.xml b/server/container/guice/mailet/pom.xml
index 20ea6fd..e3d7796 100644
--- a/server/container/guice/mailet/pom.xml
+++ b/server/container/guice/mailet/pom.xml
@@ -18,13 +18,13 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-guice-mailet</artifactId>
@@ -34,6 +34,12 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>apache-mailet-base</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>apache-mailet-standard</artifactId>
</dependency>
<dependency>
@@ -70,12 +76,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/memory-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/pom.xml b/server/container/guice/memory-guice/pom.xml
index 94610bb..7f6a4d1 100644
--- a/server/container/guice/memory-guice/pom.xml
+++ b/server/container/guice/memory-guice/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-guice</artifactId>
+ <groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -34,61 +34,6 @@
<name>Apache James :: Server :: Memory - guice injection</name>
<description>An advanced email server - Memory backend with guice injection</description>
- <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-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/${project.build.finalName}.lib</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>${project.build.finalName}.lib/</classpathPrefix>
- <mainClass>org.apache.james.MemoryJamesServerMain</mainClass>
- <useUniqueVersions>false</useUniqueVersions>
- </manifest>
- </archive>
- </configuration>
- </execution>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -96,6 +41,12 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>apache-mailet-base</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
</dependency>
<dependency>
@@ -132,11 +83,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-pop</artifactId>
+ <artifactId>james-server-guice-managedsieve</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>james-server-guice-managedsieve</artifactId>
+ <artifactId>james-server-guice-pop</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -155,9 +106,8 @@
<artifactId>james-server-guice-webadmin-mailbox</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <type>test-jar</type>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -170,11 +120,61 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <scope>test</scope>
- </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-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}.lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>${project.build.finalName}.lib/</classpathPrefix>
+ <mainClass>org.apache.james.MemoryJamesServerMain</mainClass>
+ <useUniqueVersions>false</useUniqueVersions>
+ </manifest>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml
index 6638a24..50a99be 100644
--- a/server/container/guice/pom.xml
+++ b/server/container/guice/pom.xml
@@ -29,8 +29,36 @@
</parent>
<artifactId>james-server-guice</artifactId>
- <name>Apache James :: Server :: Guice</name>
<packaging>pom</packaging>
+ <name>Apache James :: Server :: Guice</name>
+
+ <modules>
+ <module>cassandra-guice</module>
+ <module>cassandra-ldap-guice</module>
+ <module>configuration</module>
+ <module>custom-mailets</module>
+ <module>es-metric-reporter</module>
+ <module>guice-common</module>
+ <module>jmx</module>
+ <module>jpa-common-guice</module>
+ <module>jpa-guice</module>
+ <module>jpa-smtp</module>
+ <module>mailbox</module>
+ <module>mailet</module>
+ <module>memory-guice</module>
+ <module>onami</module>
+ <module>protocols/imap</module>
+ <module>protocols/jmap</module>
+ <module>protocols/lmtp</module>
+ <module>protocols/managedsieve</module>
+ <module>protocols/pop</module>
+ <module>protocols/smtp</module>
+ <module>protocols/webadmin</module>
+ <module>protocols/webadmin-cassandra</module>
+ <module>protocols/webadmin-data</module>
+ <module>protocols/webadmin-mailbox</module>
+ <module>protocols/webadmin-swagger</module>
+ </modules>
<dependencyManagement>
<dependencies>
@@ -139,32 +167,4 @@
</dependencies>
</dependencyManagement>
- <modules>
- <module>configuration</module>
- <module>guice-common</module>
- <module>cassandra-guice</module>
- <module>cassandra-ldap-guice</module>
- <module>custom-mailets</module>
- <module>es-metric-reporter</module>
- <module>mailbox</module>
- <module>mailet</module>
- <module>memory-guice</module>
- <module>jpa-common-guice</module>
- <module>jpa-guice</module>
- <module>jpa-smtp</module>
- <module>jmx</module>
- <module>onami</module>
- <module>protocols/imap</module>
- <module>protocols/jmap</module>
- <module>protocols/lmtp</module>
- <module>protocols/managedsieve</module>
- <module>protocols/pop</module>
- <module>protocols/smtp</module>
- <module>protocols/webadmin</module>
- <module>protocols/webadmin-cassandra</module>
- <module>protocols/webadmin-data</module>
- <module>protocols/webadmin-mailbox</module>
- <module>protocols/webadmin-swagger</module>
- </modules>
-</project>
-
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/imap/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/imap/pom.xml b/server/container/guice/protocols/imap/pom.xml
index 7a6a50a..d895c84 100644
--- a/server/container/guice/protocols/imap/pom.xml
+++ b/server/container/guice/protocols/imap/pom.xml
@@ -18,13 +18,13 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>james-server-guice-imap</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org