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:52 UTC
[27/29] james-project git commit: JAMES-2124 Respect maven sorting
order conventions
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