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 <[email protected]> Authored: Fri Aug 18 17:03:32 2017 +0700 Committer: benwa <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
