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 2018/07/25 02:58:42 UTC
[01/29] james-project git commit: JAMES-2304 JDBC Mail repository do
not allow content update.
Repository: james-project
Updated Branches:
refs/heads/master 42536465e -> 2da051c65
JAMES-2304 JDBC Mail repository do not allow content update.
Just removed disabled test that actually passes.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/69b57320
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/69b57320
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/69b57320
Branch: refs/heads/master
Commit: 69b57320216e1a01ad3279e045945001caa3af65
Parents: 4253646
Author: Edgar Asatryan <ns...@gmail.com>
Authored: Tue Jul 24 15:31:29 2018 +0400
Committer: Edgar Asatryan <ns...@gmail.com>
Committed: Tue Jul 24 15:31:29 2018 +0400
----------------------------------------------------------------------
.../james/mailrepository/jdbc/JDBCMailRepositoryTest.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/69b57320/server/data/data-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java b/server/data/data-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
index 30b007f..08f03fd 100644
--- a/server/data/data-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
+++ b/server/data/data-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
@@ -79,12 +79,6 @@ public class JDBCMailRepositoryTest implements MailRepositoryContract {
return ds;
}
- @Test
- @Disabled("JAMES-2304 JDBC doesn't update the message Content")
- @Override
- public void storingMessageWithSameKeyTwiceShouldUpdateMessageContent() {
- }
-
/**
* JAMES-2303 JDBC doesn't store PerRecipientSpecificHeaders
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[20/29] james-project git commit: JAMES-2469 MAILBOX provisioning is
no more needed in SetMessagesMethodTest
Posted by bt...@apache.org.
JAMES-2469 MAILBOX provisioning is no more needed in SetMessagesMethodTest
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fe846d55
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fe846d55
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fe846d55
Branch: refs/heads/master
Commit: fe846d55419c4bb545c92f173576ab7bda3df477
Parents: a35e4b2
Author: benwa <bt...@linagora.com>
Authored: Sat Jul 14 09:59:29 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:37 2018 +0700
----------------------------------------------------------------------
.../methods/integration/SetMessagesMethodTest.java | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe846d55/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
index 22ca5f8..faf69fd 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
@@ -176,10 +176,6 @@ public abstract class SetMessagesMethodTest {
accessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), USERNAME, PASSWORD);
bobAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), BOB, BOB_PASSWORD);
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.OUTBOX);
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.TRASH);
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.DRAFTS);
- mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.SENT);
await();
}
@@ -1986,8 +1982,8 @@ public abstract class SetMessagesMethodTest {
public void setMessagesShouldNotAllowDraftCreationInADelegatedMailbox() throws Exception {
String messageCreationId = "creationId1337";
- jmapServer.getProbe(ACLProbeImpl.class)
- .addRights(
+ mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.DRAFTS);
+ aclProbe.addRights(
MailboxPath.forUser(USERNAME, DefaultMailboxes.DRAFTS),
BOB,
MailboxACL.FULL_RIGHTS);
@@ -3210,7 +3206,6 @@ public abstract class SetMessagesMethodTest {
@Test
public void mailboxIdsShouldBeInDestinationWhenUsingForMoveWithoutTrashFolder() throws Exception {
- mailboxProbe.deleteMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.TRASH);
String newMailboxName = "heartFolder";
String heartFolderId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, newMailboxName).serialize();
@@ -3530,7 +3525,7 @@ public abstract class SetMessagesMethodTest {
@Test
public void setMessagesShouldWorkForMoveToTrash() throws Exception {
- String trashId = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.TRASH).getMailboxId().serialize();
+ String trashId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.TRASH).serialize();
ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, MailboxPath.forUser(USERNAME, MailboxConstants.INBOX),
@@ -3566,7 +3561,7 @@ public abstract class SetMessagesMethodTest {
public void copyToTrashShouldWork() throws Exception {
String newMailboxName = "heartFolder";
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, newMailboxName);
- String trashId = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.TRASH).getMailboxId().serialize();
+ String trashId = mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, DefaultMailboxes.TRASH).serialize();
ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, MailboxPath.forUser(USERNAME, MailboxConstants.INBOX),
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[27/29] james-project git commit: JAMES-2469 Remove unused spam
processor from configurations
Posted by bt...@apache.org.
JAMES-2469 Remove unused spam processor from configurations
This implied a penalty in James boot time
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/faf21d93
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/faf21d93
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/faf21d93
Branch: refs/heads/master
Commit: faf21d93cc056243969790c31332735512ae01aa
Parents: aaf1299
Author: benwa <bt...@linagora.com>
Authored: Tue Jul 17 10:32:37 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:49 2018 +0700
----------------------------------------------------------------------
.../destination/conf/mailetcontainer.xml | 9 ------
.../destination/conf/mailetcontainer.xml | 9 ------
.../jpa/destination/conf/mailetcontainer.xml | 9 ------
.../spring/destination/conf/mailetcontainer.xml | 9 ------
.../src/test/resources/mailetcontainer.xml | 6 ----
.../src/test/resources/mailetcontainer.xml | 6 ----
.../src/test/resources/mailetcontainer.xml | 6 ----
.../src/test/resources/mailetcontainer.xml | 6 ----
.../sample-configuration/mailetcontainer.xml | 31 --------------------
.../sample-configuration/mailetcontainer.xml | 31 --------------------
.../sample-configuration/mailetcontainer.xml | 6 ----
.../src/test/resources/mailetcontainer.xml | 6 ----
.../src/test/resources/mailetcontainer.xml | 6 ----
.../WebAdminServerIntegrationTest.java | 2 --
.../src/test/resources/mailetcontainer.xml | 6 ----
15 files changed, 148 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
index 353dea9..d00a4a5 100644
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
@@ -103,15 +103,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="true">
- <mailet match="All" class="MetricsMailet">
- <metricName>mailetContainerSpam</metricName>
- </mailet>
- <mailet match="All" class="ToRepository">
- <repositoryPath>cassandra://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="true">
<mailet match="All" class="MetricsMailet">
<metricName>mailetContainerLocalAddressError</metricName>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
index a8de354..8a154e9 100644
--- a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
@@ -102,15 +102,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="true">
- <mailet match="All" class="MetricsMailet">
- <metricName>mailetContainerSpam</metricName>
- </mailet>
- <mailet match="All" class="ToRepository">
- <repositoryPath>cassandra://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="true">
<mailet match="All" class="MetricsMailet">
<metricName>mailetContainerLocalAddressError</metricName>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
index 27bbd4b..e7df363 100644
--- a/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
@@ -97,15 +97,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="true">
- <mailet match="All" class="MetricsMailet">
- <metricName>mailetContainerSpam</metricName>
- </mailet>
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="true">
<mailet match="All" class="MetricsMailet">
<metricName>mailetContainerLocalAddressError</metricName>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/spring/destination/conf/mailetcontainer.xml b/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
index 9e404be..d1f51c1 100644
--- a/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
@@ -101,15 +101,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="true">
- <mailet match="All" class="MetricsMailet">
- <metricName>mailetContainerSpam</metricName>
- </mailet>
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="true">
<mailet match="All" class="MetricsMailet">
<metricName>mailetContainerLocalAddressError</metricName>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/container/cli-integration/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/cli-integration/src/test/resources/mailetcontainer.xml b/server/container/cli-integration/src/test/resources/mailetcontainer.xml
index fce9722..417b9e4 100644
--- a/server/container/cli-integration/src/test/resources/mailetcontainer.xml
+++ b/server/container/cli-integration/src/test/resources/mailetcontainer.xml
@@ -82,12 +82,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="false">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="false">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml
index 7605951..2365c7c 100644
--- a/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml
+++ b/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml
@@ -93,12 +93,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="false">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="false">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
index 2c8ea18..298fd52 100644
--- a/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
+++ b/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
@@ -81,12 +81,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="false">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="false">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml
index cdf3ef8..f68b1a2 100644
--- a/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml
+++ b/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml
@@ -82,12 +82,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="false">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="false">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml b/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml
index 8ad6c2c..d3a81be 100644
--- a/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml
+++ b/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml
@@ -33,31 +33,6 @@
<processor state="root" enableJmx="true">
<mailet match="All" class="PostmasterAlias"/>
<mailet match="RelayLimit=30" class="Null"/>
- <!-- Hook on sievemanager@james.linagora.com
- Mail send to this address will get interpreted with SIEVE Manage -->
- <mailet match="RecipientIs=sievemanager@james.linagora.com" class="ToProcessor">
- <processor>sieve-manager-check</processor>
- </mailet>
- <mailet match="HasMailAttribute=spamChecked" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="All" class="SetMailAttribute">
- <spamChecked>true</spamChecked>
- </mailet>
- <mailet match="SMTPAuthSuccessful" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="InSpammerBlacklist=query.bondedsender.org." class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <!-- Check for delivery from a known spam server -->
- <!-- This set of matchers/mailets redirect all emails from known -->
- <!-- black holes, open relays, and spam servers to the spam processor -->
- <!-- For this set to function properly, the spam processor must be configured. -->
- <mailet match="InSpammerBlacklist=dnsbl.njabl.org." class="ToProcessor">
- <processor>spam</processor>
- <notice>550 Requested action not taken: rejected - see http://njabl.org/</notice>
- </mailet>
<mailet match="All" class="ToProcessor">
<processor>transport</processor>
</mailet>
@@ -107,12 +82,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="true">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="true">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml b/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml
index 8ad6c2c..d3a81be 100644
--- a/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml
+++ b/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml
@@ -33,31 +33,6 @@
<processor state="root" enableJmx="true">
<mailet match="All" class="PostmasterAlias"/>
<mailet match="RelayLimit=30" class="Null"/>
- <!-- Hook on sievemanager@james.linagora.com
- Mail send to this address will get interpreted with SIEVE Manage -->
- <mailet match="RecipientIs=sievemanager@james.linagora.com" class="ToProcessor">
- <processor>sieve-manager-check</processor>
- </mailet>
- <mailet match="HasMailAttribute=spamChecked" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="All" class="SetMailAttribute">
- <spamChecked>true</spamChecked>
- </mailet>
- <mailet match="SMTPAuthSuccessful" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <mailet match="InSpammerBlacklist=query.bondedsender.org." class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <!-- Check for delivery from a known spam server -->
- <!-- This set of matchers/mailets redirect all emails from known -->
- <!-- black holes, open relays, and spam servers to the spam processor -->
- <!-- For this set to function properly, the spam processor must be configured. -->
- <mailet match="InSpammerBlacklist=dnsbl.njabl.org." class="ToProcessor">
- <processor>spam</processor>
- <notice>550 Requested action not taken: rejected - see http://njabl.org/</notice>
- </mailet>
<mailet match="All" class="ToProcessor">
<processor>transport</processor>
</mailet>
@@ -107,12 +82,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="true">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="true">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
index efeca5d..ae32aa6 100644
--- a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
+++ b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
@@ -83,12 +83,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="true">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="true">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
index aae7b8b..6aef809 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
@@ -97,12 +97,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="false">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="false">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
index e1f7f43..5cdc6b5 100644
--- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
@@ -98,12 +98,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="false">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="false">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
index b706323..07c63d0 100644
--- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
@@ -121,7 +121,6 @@ public class WebAdminServerIntegrationTest {
.body("repository", containsInAnyOrder(
"var/mail/error/",
"var/mail/relay-denied/",
- "var/mail/spam/",
"var/mail/address-error/"));
}
@@ -137,7 +136,6 @@ public class WebAdminServerIntegrationTest {
.body("repository", containsInAnyOrder(
"var/mail/error/",
"var/mail/relay-denied/",
- "var/mail/spam/",
"var/mail/address-error/"));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/faf21d93/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml b/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml
index 15f351d..a16cf3c 100644
--- a/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml
+++ b/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml
@@ -84,12 +84,6 @@
</mailet>
</processor>
- <processor state="spam" enableJmx="false">
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
- </mailet>
- </processor>
-
<processor state="local-address-error" enableJmx="false">
<mailet match="All" class="Bounce">
<attachment>none</attachment>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[05/29] james-project git commit: JAMES-2496 don't use
project.groupId for dep mgnt as it's resolved in children pom
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/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 501a96e..83d17d4 100644
--- a/mpt/impl/imap-mailbox/core/pom.xml
+++ b/mpt/impl/imap-mailbox/core/pom.xml
@@ -32,28 +32,28 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailbox-adapter</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
</dependency>
<dependency>
@@ -81,11 +81,11 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-imap</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-imap</artifactId>
<type>test-jar</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/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 1b7b5c9..f189fb4 100644
--- a/mpt/impl/imap-mailbox/cyrus/pom.xml
+++ b/mpt/impl/imap-mailbox/cyrus/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/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 95b70a0..f0ed6b9 100644
--- a/mpt/impl/imap-mailbox/elasticsearch/pom.xml
+++ b/mpt/impl/imap-mailbox/elasticsearch/pom.xml
@@ -32,43 +32,43 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/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 b574353..95132ec 100644
--- a/mpt/impl/imap-mailbox/external-james/pom.xml
+++ b/mpt/impl/imap-mailbox/external-james/pom.xml
@@ -32,15 +32,15 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/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 56ee25e..fde1fc0 100644
--- a/mpt/impl/imap-mailbox/hbase/pom.xml
+++ b/mpt/impl/imap-mailbox/hbase/pom.xml
@@ -32,11 +32,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-hbase</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
<dependency>
@@ -61,7 +61,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-imap</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/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 6db46b5..4723d55 100644
--- a/mpt/impl/imap-mailbox/inmemory/pom.xml
+++ b/mpt/impl/imap-mailbox/inmemory/pom.xml
@@ -32,24 +32,24 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/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 3ff862d..7314dc6 100644
--- a/mpt/impl/imap-mailbox/jcr/pom.xml
+++ b/mpt/impl/imap-mailbox/jcr/pom.xml
@@ -32,12 +32,12 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-jcr</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/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 9467367..e7b90b1 100644
--- a/mpt/impl/imap-mailbox/jpa/pom.xml
+++ b/mpt/impl/imap-mailbox/jpa/pom.xml
@@ -32,29 +32,29 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/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 431bf55..0897a95 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/pom.xml
+++ b/mpt/impl/imap-mailbox/lucenesearch/pom.xml
@@ -32,39 +32,39 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/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 7f57163..236edeb 100644
--- a/mpt/impl/imap-mailbox/maildir/pom.xml
+++ b/mpt/impl/imap-mailbox/maildir/pom.xml
@@ -32,12 +32,12 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-maildir</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mpt/impl/imap-mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/pom.xml b/mpt/impl/imap-mailbox/pom.xml
index f5a28eb..288c86b 100644
--- a/mpt/impl/imap-mailbox/pom.xml
+++ b/mpt/impl/imap-mailbox/pom.xml
@@ -49,61 +49,61 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-cassandra</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-cyrus</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-elasticsearch</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-hbase</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-inmemory</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-jcr</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-jpa</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-jpa-lucene</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-maildir</artifactId>
<version>${project.version}</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mpt/impl/managesieve/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/cassandra/pom.xml b/mpt/impl/managesieve/cassandra/pom.xml
index 1682366..5ce4426 100644
--- a/mpt/impl/managesieve/cassandra/pom.xml
+++ b/mpt/impl/managesieve/cassandra/pom.xml
@@ -33,20 +33,20 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-managesieve-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-cassandra</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mpt/impl/managesieve/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/core/pom.xml b/mpt/impl/managesieve/core/pom.xml
index 2dffd72..8e115ea 100644
--- a/mpt/impl/managesieve/core/pom.xml
+++ b/mpt/impl/managesieve/core/pom.xml
@@ -31,11 +31,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
@@ -48,7 +48,7 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-managesieve</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mpt/impl/managesieve/file/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/file/pom.xml b/mpt/impl/managesieve/file/pom.xml
index b671354..7ffe36e 100644
--- a/mpt/impl/managesieve/file/pom.xml
+++ b/mpt/impl/managesieve/file/pom.xml
@@ -32,15 +32,15 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-managesieve-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-file</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mpt/impl/managesieve/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/pom.xml b/mpt/impl/managesieve/pom.xml
index a2341bf..82b39d1 100644
--- a/mpt/impl/managesieve/pom.xml
+++ b/mpt/impl/managesieve/pom.xml
@@ -40,18 +40,18 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-managesieve-cassandra</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-managesieve-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-managesieve-file</artifactId>
<version>${project.version}</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mpt/impl/smtp/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/pom.xml b/mpt/impl/smtp/cassandra/pom.xml
index dd850fb..232117e 100644
--- a/mpt/impl/smtp/cassandra/pom.xml
+++ b/mpt/impl/smtp/cassandra/pom.xml
@@ -32,43 +32,43 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-smtp-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mpt/impl/smtp/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/pom.xml b/mpt/impl/smtp/core/pom.xml
index 2dcad7b..d0f43bc 100644
--- a/mpt/impl/smtp/core/pom.xml
+++ b/mpt/impl/smtp/core/pom.xml
@@ -32,28 +32,28 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mpt/impl/smtp/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/pom.xml b/mpt/impl/smtp/pom.xml
index b5399e9..c8f91a4 100644
--- a/mpt/impl/smtp/pom.xml
+++ b/mpt/impl/smtp/pom.xml
@@ -38,13 +38,13 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-smtp-cassandra</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-smtp-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mpt/mavenplugin/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/mavenplugin/pom.xml b/mpt/mavenplugin/pom.xml
index a7e356e..df27a62 100644
--- a/mpt/mavenplugin/pom.xml
+++ b/mpt/mavenplugin/pom.xml
@@ -38,11 +38,11 @@ to the library requiring no extra coding.</description>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6455434..702e2fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -581,6 +581,8 @@
-->
<deployTechnicalSiteDirectory />
+ <james.groupId>org.apache.james</james.groupId>
+ <james.protocols.groupId>${james.groupId}.protocols</james.protocols.groupId>
<activemq.version>5.15.4</activemq.version>
<apache-mime4j.version>0.8.2</apache-mime4j.version>
<camel.version>2.22.0</camel.version>
@@ -671,278 +673,278 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-cassandra</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-hbase</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-hbase</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-jcr</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-kafka</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-maildir</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-search</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-search</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-search-scanning</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-search-elasticsearch</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-scanning-search</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-scanning-search</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-spamassassin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-mailing</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-mailing</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-mailing</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-spring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-tool</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-antlib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-antlib</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-app</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-app</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-core</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-jsieve-core</artifactId>
<version>${jsieve.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -954,7 +956,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-standard</artifactId>
<version>${project.version}</version>
<exclusions>
@@ -965,7 +967,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-standard</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -977,614 +979,614 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-core</artifactId>
<version>${apache-mime4j.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
<version>${apache-mime4j.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-james-utils</artifactId>
<version>${apache-mime4j.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-core</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-mdn</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>blob-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>blob-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>blob-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-cassandra</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-memory</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-pojo</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-pojo</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-cassandra-ldap-guice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-cli</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-file</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-hbase</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-jcr</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-jdbc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-jmap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-jmap</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-jmap-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-ldap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-ldap-integration-testing</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-dnsjava</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-library</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-library</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-fetchmail</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-utils</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-mailbox</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-netty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jetty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jmap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jmap-integration-testing</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jmap-integration-testing</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jwt</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailbox-adapter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailetcontainer-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailetcontainer-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailetcontainer-camel</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailrepository-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailrepository-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailrepository-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailrepository-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailets</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-memory-guice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-memory-guice</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-onami</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-imap4</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-lmtp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-managesieve</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-managesieve</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-pop3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-smtp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-smtp</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-activemq</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-rabbitmq</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-file</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-jms</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-jms</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-memory</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-memory</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-spring</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-task</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-data</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-mailbox</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-mailqueue</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-mailrepository</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-swagger</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-dropwizard</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>quota-mailing-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2075,7 +2077,7 @@
<version>${jackrabbit.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-karaf-distribution</artifactId>
<version>${project.version}</version>
<type>tar.gz</type>
@@ -2091,7 +2093,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-karaf-features</artifactId>
<version>${project.version}</version>
<type>pom</type>
@@ -2121,60 +2123,60 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-imap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-imap</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-lmtp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-managesieve</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-managesieve</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-netty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-pop3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-smtp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-smtp</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/protocols/api/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/api/pom.xml b/protocols/api/pom.xml
index 5bdbd02..5b5a7aa 100644
--- a/protocols/api/pom.xml
+++ b/protocols/api/pom.xml
@@ -21,13 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
+ <groupId>org.apache.james.protocols</groupId>
<artifactId>protocols</artifactId>
<version>3.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-api</artifactId>
<packaging>bundle</packaging>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[11/29] james-project git commit: JAMES-2487 Upgrade info.cukes to
io.cucumber-2.2.0
Posted by bt...@apache.org.
JAMES-2487 Upgrade info.cukes to io.cucumber-2.2.0
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8ccdad30
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8ccdad30
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8ccdad30
Branch: refs/heads/master
Commit: 8ccdad30442d5a5d920db3e58907ed2e6371d291
Parents: f75b6e1
Author: Gautier DI FOLCO <gd...@linagora.com>
Authored: Fri Jul 20 12:04:44 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:34:52 2018 +0700
----------------------------------------------------------------------
pom.xml | 10 +++++-----
server/data/data-cassandra/pom.xml | 6 +++---
server/data/data-file/pom.xml | 6 +++---
server/data/data-hbase/pom.xml | 6 +++---
server/data/data-jdbc/pom.xml | 6 +++---
server/data/data-jpa/pom.xml | 6 +++---
server/data/data-library/pom.xml | 4 ++--
server/data/data-memory/pom.xml | 6 +++---
.../cassandra-jmap-integration-testing/pom.xml | 6 +++---
.../jmap-integration-testing-common/pom.xml | 6 +++---
.../memory-jmap-integration-testing/pom.xml | 6 +++---
11 files changed, 34 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/8ccdad30/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ecb4387..775a105 100644
--- a/pom.xml
+++ b/pom.xml
@@ -621,7 +621,7 @@
<geronimo-annotation-spec.version>1.0.1</geronimo-annotation-spec.version>
<spring-osgi-extender.version>1.2.1</spring-osgi-extender.version>
<org.osgi.core.version>5.0.0</org.osgi.core.version>
- <cucumber.version>1.2.5</cucumber.version>
+ <cucumber.version>2.2.0</cucumber.version>
<exam.version>2.6.0</exam.version>
<url.version>1.4.0</url.version>
@@ -1818,22 +1818,22 @@
<version>${dnsjava.version}</version>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-guice</artifactId>
<version>${cucumber.version}</version>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<version>${cucumber.version}</version>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
<version>${cucumber.version}</version>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-picocontainer</artifactId>
<version>${cucumber.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8ccdad30/server/data/data-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/pom.xml b/server/data/data-cassandra/pom.xml
index 30a46a3..5952582 100644
--- a/server/data/data-cassandra/pom.xml
+++ b/server/data/data-cassandra/pom.xml
@@ -94,17 +94,17 @@
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-picocontainer</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8ccdad30/server/data/data-file/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-file/pom.xml b/server/data/data-file/pom.xml
index 43d3c86..6c8beab 100644
--- a/server/data/data-file/pom.xml
+++ b/server/data/data-file/pom.xml
@@ -103,17 +103,17 @@
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-picocontainer</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8ccdad30/server/data/data-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/pom.xml b/server/data/data-hbase/pom.xml
index 887e1d3..f4d1d8e 100644
--- a/server/data/data-hbase/pom.xml
+++ b/server/data/data-hbase/pom.xml
@@ -79,17 +79,17 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-picocontainer</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8ccdad30/server/data/data-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/pom.xml b/server/data/data-jdbc/pom.xml
index 351378f..3a1f08e 100644
--- a/server/data/data-jdbc/pom.xml
+++ b/server/data/data-jdbc/pom.xml
@@ -102,17 +102,17 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-picocontainer</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8ccdad30/server/data/data-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml
index e1282ba..2f828c2 100644
--- a/server/data/data-jpa/pom.xml
+++ b/server/data/data-jpa/pom.xml
@@ -96,17 +96,17 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-picocontainer</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8ccdad30/server/data/data-library/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-library/pom.xml b/server/data/data-library/pom.xml
index de10694..06501ec 100644
--- a/server/data/data-library/pom.xml
+++ b/server/data/data-library/pom.xml
@@ -91,12 +91,12 @@
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8ccdad30/server/data/data-memory/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-memory/pom.xml b/server/data/data-memory/pom.xml
index 0c06813..25a158b 100644
--- a/server/data/data-memory/pom.xml
+++ b/server/data/data-memory/pom.xml
@@ -71,17 +71,17 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-picocontainer</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8ccdad30/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
index 6fd5f0d..d0ad077 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
@@ -143,17 +143,17 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-guice</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8ccdad30/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
index 1e3bc40..5bd752b 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
@@ -123,17 +123,17 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-guice</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8ccdad30/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
index e06cb75..aab80ae 100644
--- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
@@ -112,17 +112,17 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-guice</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>info.cukes</groupId>
+ <groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
<scope>test</scope>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[26/29] james-project git commit: JAMES-2469 Decrease processor
threads in JMAP integration tests
Posted by bt...@apache.org.
JAMES-2469 Decrease processor threads in JMAP integration tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2da051c6
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2da051c6
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2da051c6
Branch: refs/heads/master
Commit: 2da051c65449bfee31f95040c1d06784871d1b32
Parents: f46313d
Author: benwa <bt...@linagora.com>
Authored: Tue Jul 17 11:03:17 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:49 2018 +0700
----------------------------------------------------------------------
.../src/test/resources/mailetcontainer.xml | 2 +-
.../src/test/resources/mailetcontainer.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da051c6/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
index 2bb4a95..887c947 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
@@ -26,7 +26,7 @@
</context>
<spooler>
- <threads>20</threads>
+ <threads>2</threads>
</spooler>
<processors>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2da051c6/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
index 2eacd5c..c783fd3 100644
--- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
@@ -26,7 +26,7 @@
</context>
<spooler>
- <threads>20</threads>
+ <threads>2</threads>
</spooler>
<processors>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[08/29] james-project git commit: JAMES-2494 Remove Kafka
Posted by bt...@apache.org.
JAMES-2494 Remove Kafka
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f9e478fc
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f9e478fc
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f9e478fc
Branch: refs/heads/master
Commit: f9e478fce6d116ac10cb31e26bec89dc770fa240
Parents: 44583eb
Author: Gautier DI FOLCO <gd...@linagora.com>
Authored: Mon Jul 23 15:30:06 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:34:51 2018 +0700
----------------------------------------------------------------------
.../spring/destination/conf/events.properties | 42 ------
.../run/spring/destination/conf/events.xml | 48 +------
mailbox/kafka/pom.xml | 85 ------------
.../mailbox/kafka/KafkaMessageConsumer.java | 136 -------------------
.../james/mailbox/kafka/KafkaPublisher.java | 79 -----------
mailbox/pom.xml | 1 -
.../james/mailbox/spring/SpringMailbox.java | 76 +++++------
.../resources/META-INF/spring/event-system.xml | 5 -
.../META-INF/spring/spring-mailbox.xml | 6 +
.../resources/META-INF/spring/event-alias.xml | 34 -----
.../test/resources/META-INF/spring/metrics.xml | 27 ++++
.../spring/src/test/resources/events.properties | 38 ------
.../mailbox/store/publisher/Publisher.java | 4 +-
pom.xml | 5 -
server/app/src/main/resources/events.properties | 42 ------
server/app/src/main/resources/events.xml | 48 +------
server/app/src/test/resources/events.xml | 48 +------
...tsConfigurationBeanFactoryPostProcessor.java | 120 ----------------
.../META-INF/org/apache/james/spring-server.xml | 1 -
src/site/xdoc/server/config-events.xml | 27 +---
20 files changed, 77 insertions(+), 795 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/dockerfiles/run/spring/destination/conf/events.properties
----------------------------------------------------------------------
diff --git a/dockerfiles/run/spring/destination/conf/events.properties b/dockerfiles/run/spring/destination/conf/events.properties
deleted file mode 100644
index 3b49533..0000000
--- a/dockerfiles/run/spring/destination/conf/events.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# This template file can be used as example for James Server configuration
-# DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-
-# The following properties needs to be set
-# if you want to use Kafka for inter node messaging for your event system.
-#
-# This needs to be done if you used <publisher>kafka</publisher> in event.xml
-
-kafka.ip=127.0.0.1
-kafka.port=9092
-zookeeper.connection.string=localhost
-group.id=azerty
-event.thread.count=4
-
-# This property needs to be set if you want to use the Broadcast Mailbox Delegating Listener
-
-global.topic=JAMES_TOPIC
-
-distant.mailbox.path.register.max.retries=100
-distant.mailbox.path.register.refresh=900
-
-# Worker threads count for asynchronous event delivery
-
-event.delivery.thread.count=10
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/dockerfiles/run/spring/destination/conf/events.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/spring/destination/conf/events.xml b/dockerfiles/run/spring/destination/conf/events.xml
index 536278a..5555280 100644
--- a/dockerfiles/run/spring/destination/conf/events.xml
+++ b/dockerfiles/run/spring/destination/conf/events.xml
@@ -36,55 +36,9 @@
-->
<delivery>synchronous</delivery>
- <!-- Broadcast event system will send messages to all your James servers.
-
- It is the only viable options if you rely on Mailbox Listeners that do not perform well in a distributed system.
-
- Here follows a non exhaustive list of such Mailbox Listeners :
- - Memory quota based system
- - Lucene based search system
-
- Workload is higher because event needs to be serialized and de serialized.
-
- Also note that depending on the publisher you use, messages might be either lost or duplicated, implying wrong
- indexing or wrong quota count on network partitions.
-
- Here follows a sample configuration :
- -->
- <!--
- <type>broadcast</type>
- <serialization>json</serialization>
- <publisher>kafka</publisher>
- -->
-
- <!--
- Further notes on the choice you had here :
-
- serialization : you have to choices : either json or message-pack
-
- message-pack is a binary representation for json, and is 2 times lighter by average, but is 2 time slower to serialize and de serialize.
- This choice allows you to trade compute against network.
-
- publisher : Publish - subscribe used. The only current implementation is Kafka.
- -->
-
- <!-- Registered event system
-
- Scalable event system based on registration : each James server listen on his own topic and manage registrations on
- mailbox paths in order to receive events interesting him.
-
- This configuration does not support distributed unfriendly Mailbox Listeners (see the non exhaustive list above) for obvious reasons.
- -->
- <!--
- <type>registered</type>
- <serialization>json</serialization>
- <registration>cassandra</registration>
- <publisher>kafka</publisher>
- -->
-
<!--
The only registration system available is Cassandra, used in an available fashion. This means there is no warranties,
either at least one delivery nor at most one delivery. But you get the certitude that the system will always be available.
-->
-</events>
\ No newline at end of file
+</events>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/mailbox/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/kafka/pom.xml b/mailbox/kafka/pom.xml
deleted file mode 100644
index 9e035ee..0000000
--- a/mailbox/kafka/pom.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?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
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- 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>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox</artifactId>
- <version>3.2.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>apache-james-mailbox-kafka</artifactId>
-
- <name>Apache James :: Mailbox :: Kafka</name>
-
- <dependencies>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka_2.10</artifactId>
- <version>0.8.2.2</version>
- </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>
- </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/f9e478fc/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java
----------------------------------------------------------------------
diff --git a/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java b/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java
deleted file mode 100644
index 74ce42f..0000000
--- a/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaMessageConsumer.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-
-package org.apache.james.mailbox.kafka;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
-import org.apache.james.mailbox.store.publisher.MessageConsumer;
-import org.apache.james.mailbox.store.publisher.MessageReceiver;
-import org.apache.james.mailbox.store.publisher.Topic;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import kafka.consumer.ConsumerConfig;
-import kafka.consumer.KafkaStream;
-import kafka.javaapi.consumer.ConsumerConnector;
-import kafka.message.MessageAndMetadata;
-
-public class KafkaMessageConsumer implements MessageConsumer {
-
- private class Consumer implements Runnable {
-
- private final KafkaStream<byte[], byte[]> stream;
-
- public Consumer(KafkaStream<byte[], byte[]> stream) {
- this.stream = stream;
- }
-
- @Override
- public void run() {
- for (MessageAndMetadata<byte[], byte[]> message : stream) {
- messageReceiver.receiveSerializedEvent(message.message());
- }
- }
- }
-
- private static final String ZK_SESSION_TIMEOUT = "400";
- private static final String ZK_SYNC_TIME = "200";
- private static final String AUTO_COMMIT8INTERVAL_MS = "1000";
- private static final Logger LOG = LoggerFactory.getLogger(KafkaMessageConsumer.class);
-
- private final ConsumerConnector consumer;
- private final int numberOfTread;
- private MessageReceiver messageReceiver;
- private ExecutorService executor;
- private boolean isInitialized;
-
-
- public KafkaMessageConsumer(String zookeeperConnectionString,
- String groupId,
- int numberOfThread) {
- this.consumer = kafka.consumer.Consumer.createJavaConsumerConnector(createConsumerConfig(zookeeperConnectionString, groupId));
- this.numberOfTread = numberOfThread;
- this.isInitialized = false;
- }
-
- @Override
- public void setMessageReceiver(MessageReceiver messageReceiver) {
- if (!isInitialized) {
- this.messageReceiver = messageReceiver;
- } else {
- throw new RuntimeException("Can not change the MessageReceiver of a running KafkaMessageConsumer");
- }
- }
-
- @Override
- @PreDestroy
- public void destroy() {
- if (consumer != null) {
- consumer.shutdown();
- }
- if (executor != null) {
- executor.shutdown();
- }
- this.isInitialized = false;
- }
-
- @Override
- @PostConstruct
- public void init(Topic topic) {
- if (!isInitialized) {
- this.isInitialized = true;
- List<KafkaStream<byte[], byte[]>> streams = getKafkaStreams(topic.getValue());
- executor = Executors.newFixedThreadPool(numberOfTread);
- startConsuming(streams);
- } else {
- LOG.warn("This Kafka MailboxMessage Receiver was already launched.");
- }
- }
-
- private List<KafkaStream<byte[], byte[]>> getKafkaStreams(String topic) {
- Map<String, Integer> topicCountMap = new HashMap<>();
- topicCountMap.put(topic, numberOfTread);
- Map<String, List<KafkaStream<byte[], byte[]>>> consumerMap = consumer.createMessageStreams(topicCountMap);
- return consumerMap.get(topic);
- }
-
- private void startConsuming(List<KafkaStream<byte[], byte[]>> streams) {
- streams.forEach(stream -> executor.submit(new Consumer(stream)));
- }
-
- private ConsumerConfig createConsumerConfig(String zookeeperConnectionString, String groupId) {
- Properties props = new Properties();
- props.put("zookeeper.connect", zookeeperConnectionString);
- props.put("group.id", groupId);
- props.put("zookeeper.session.timeout.ms", ZK_SESSION_TIMEOUT);
- props.put("zookeeper.sync.time.ms", ZK_SYNC_TIME);
- props.put("auto.commit.interval.ms", AUTO_COMMIT8INTERVAL_MS);
- return new ConsumerConfig(props);
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaPublisher.java
----------------------------------------------------------------------
diff --git a/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaPublisher.java b/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaPublisher.java
deleted file mode 100644
index f304705..0000000
--- a/mailbox/kafka/src/main/java/org/apache/james/mailbox/kafka/KafkaPublisher.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-
-package org.apache.james.mailbox.kafka;
-
-import java.util.Properties;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
-import org.apache.james.mailbox.store.publisher.Publisher;
-import org.apache.james.mailbox.store.publisher.Topic;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import kafka.javaapi.producer.Producer;
-import kafka.producer.KeyedMessage;
-import kafka.producer.ProducerConfig;
-
-public class KafkaPublisher implements Publisher {
-
- private static final Logger LOG = LoggerFactory.getLogger(KafkaPublisher.class);
-
- private Producer<String, byte[]> producer;
- private final int kafkaPort;
- private final String kafkaIp;
- private boolean producerLaunched;
-
- public KafkaPublisher(String kafkaHostIpString, int kafkaPort) {
- this.kafkaIp = kafkaHostIpString;
- this.kafkaPort = kafkaPort;
- producerLaunched = false;
- }
-
- @PostConstruct
- @Override
- public void init() {
- if (!producerLaunched) {
- Properties props = new Properties();
- props.put("metadata.broker.list", kafkaIp + ":" + kafkaPort);
- props.put("serializer.class", "kafka.serializer.DefaultEncoder");
- props.put("request.required.acks", "1");
- ProducerConfig config = new ProducerConfig(props);
- producer = new Producer<>(config);
- producerLaunched = true;
- } else {
- LOG.warn("Kafka producer was already instantiated");
- }
- }
-
-
- @Override
- public void publish(Topic topic, byte[] message) {
- producer.send(new KeyedMessage<>(topic.getValue(), message));
- }
-
- @PreDestroy
- @Override
- public void close() {
- producer.close();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index 6479ba4..974ef85 100644
--- a/mailbox/pom.xml
+++ b/mailbox/pom.xml
@@ -43,7 +43,6 @@
<module>hbase</module>
<module>jcr</module>
<module>jpa</module>
- <module>kafka</module>
<module>lucene</module>
<module>maildir</module>
<module>memory</module>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/mailbox/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java
----------------------------------------------------------------------
diff --git a/mailbox/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java b/mailbox/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java
index db85ad8..f68871a 100644
--- a/mailbox/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java
+++ b/mailbox/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java
@@ -1,38 +1,38 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-package org.apache.james.mailbox.spring;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class SpringMailbox {
-
- private final ApplicationContext applicationContext;
-
- public SpringMailbox() {
- applicationContext = new ClassPathXmlApplicationContext("META-INF/spring/spring-mailbox.xml",
- "META-INF/spring/mailbox-authenticator-anonymous.xml", "META-INF/spring/mailbox-no-authorizator.xml", "META-INF/spring/quota.xml",
- "META-INF/spring/quota-alias.xml", "META-INF/spring/event-system.xml", "META-INF/spring/event-alias.xml");
- }
-
- public Object getBean(String beanName) {
- return applicationContext.getBean(beanName);
- }
-
-}
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.james.mailbox.spring;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class SpringMailbox {
+
+ private final ApplicationContext applicationContext;
+
+ public SpringMailbox() {
+ applicationContext = new ClassPathXmlApplicationContext("META-INF/spring/spring-mailbox.xml",
+ "META-INF/spring/mailbox-authenticator-anonymous.xml", "META-INF/spring/mailbox-no-authorizator.xml", "META-INF/spring/quota.xml",
+ "META-INF/spring/quota-alias.xml", "META-INF/spring/event-system.xml", "META-INF/spring/metrics.xml");
+ }
+
+ public Object getBean(String beanName) {
+ return applicationContext.getBean(beanName);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/mailbox/spring/src/main/resources/META-INF/spring/event-system.xml
----------------------------------------------------------------------
diff --git a/mailbox/spring/src/main/resources/META-INF/spring/event-system.xml b/mailbox/spring/src/main/resources/META-INF/spring/event-system.xml
index 4e04252..2647d0c 100644
--- a/mailbox/spring/src/main/resources/META-INF/spring/event-system.xml
+++ b/mailbox/spring/src/main/resources/META-INF/spring/event-system.xml
@@ -23,11 +23,6 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="ignoreUnresolvablePlaceholders" value="true"/>
- <property name ="location" value="classpath:events.properties"/>
- </bean>
-
<bean id="default-delegating-listener" class="org.apache.james.mailbox.store.event.DefaultDelegatingMailboxListener" lazy-init="true">
<constructor-arg index="0" ref="event-delivery"/>
<constructor-arg index="1" ref="event-registry"/>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
----------------------------------------------------------------------
diff --git a/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml b/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
index 0b50ccb..353cdfd 100644
--- a/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
+++ b/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
@@ -72,5 +72,11 @@
<constructor-arg index="3" ref="dispatcher" />
</bean>
+ <alias name="default-delegating-listener" alias="delegating-listener"/>
+ <alias name="synchronous-event-delivery" alias="event-delivery"/>
+
+ <bean id="dispatcher" class="org.apache.james.mailbox.store.event.MailboxEventDispatcher">
+ <constructor-arg index="0" ref="delegating-listener"/>
+ </bean>
</beans>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/mailbox/spring/src/test/resources/META-INF/spring/event-alias.xml
----------------------------------------------------------------------
diff --git a/mailbox/spring/src/test/resources/META-INF/spring/event-alias.xml b/mailbox/spring/src/test/resources/META-INF/spring/event-alias.xml
deleted file mode 100644
index 7406b84..0000000
--- a/mailbox/spring/src/test/resources/META-INF/spring/event-alias.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <alias name="default-delegating-listener" alias="delegating-listener"/>
- <alias name="synchronous-event-delivery" alias="event-delivery"/>
-
- <bean id="dispatcher" class="org.apache.james.mailbox.store.event.MailboxEventDispatcher">
- <constructor-arg index="0" ref="delegating-listener"/>
- </bean>
-
- <bean id="metricFactory" class="org.apache.james.metrics.api.NoopMetricFactory"/>
-
-</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/mailbox/spring/src/test/resources/META-INF/spring/metrics.xml
----------------------------------------------------------------------
diff --git a/mailbox/spring/src/test/resources/META-INF/spring/metrics.xml b/mailbox/spring/src/test/resources/META-INF/spring/metrics.xml
new file mode 100644
index 0000000..83c8d78
--- /dev/null
+++ b/mailbox/spring/src/test/resources/META-INF/spring/metrics.xml
@@ -0,0 +1,27 @@
+<?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
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean id="metricFactory" class="org.apache.james.metrics.api.NoopMetricFactory"/>
+
+</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/mailbox/spring/src/test/resources/events.properties
----------------------------------------------------------------------
diff --git a/mailbox/spring/src/test/resources/events.properties b/mailbox/spring/src/test/resources/events.properties
deleted file mode 100644
index 696bc26..0000000
--- a/mailbox/spring/src/test/resources/events.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# This template file can be used as example for James Server configuration
-# DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-
-# The following properties needs to be set
-# if you want to use Kafka for inter node messaging for your event system.
-#
-# This needs to be done if you used <publisher>kafka</publisher> in event.xml
-
-kafka.ip=127.0.0.1
-kafka.port=9092
-zookeeper.connection.string=localhost
-group.id=azerty
-event.thread.count=4
-
-# This property needs to be set if you want to use the Broadcast Mailbox Delegating Listener
-
-global.topic=JAMES_TOPIC
-
-distant.mailbox.path.register.max.retries=100
-distant.mailbox.path.register.refresh=900
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/mailbox/store/src/main/java/org/apache/james/mailbox/store/publisher/Publisher.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/publisher/Publisher.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/publisher/Publisher.java
index 56e1e0f..1ee8bf7 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/publisher/Publisher.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/publisher/Publisher.java
@@ -24,7 +24,7 @@ import java.io.Closeable;
/**
* The Publisher can be used to send information outside James.
*
- * For instance you can send information to a message queue like Kafka or perform a POST on a restful API
+ * For instance you can send information to a message queue or perform a POST on a restful API
*/
public interface Publisher extends Closeable {
@@ -32,4 +32,4 @@ public interface Publisher extends Closeable {
void init();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 702e2fa..ee24151 100644
--- a/pom.xml
+++ b/pom.xml
@@ -767,11 +767,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-james-mailbox-kafka</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/server/app/src/main/resources/events.properties
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/events.properties b/server/app/src/main/resources/events.properties
deleted file mode 100644
index 3b49533..0000000
--- a/server/app/src/main/resources/events.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# This template file can be used as example for James Server configuration
-# DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS
-
-# The following properties needs to be set
-# if you want to use Kafka for inter node messaging for your event system.
-#
-# This needs to be done if you used <publisher>kafka</publisher> in event.xml
-
-kafka.ip=127.0.0.1
-kafka.port=9092
-zookeeper.connection.string=localhost
-group.id=azerty
-event.thread.count=4
-
-# This property needs to be set if you want to use the Broadcast Mailbox Delegating Listener
-
-global.topic=JAMES_TOPIC
-
-distant.mailbox.path.register.max.retries=100
-distant.mailbox.path.register.refresh=900
-
-# Worker threads count for asynchronous event delivery
-
-event.delivery.thread.count=10
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/server/app/src/main/resources/events.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/events.xml b/server/app/src/main/resources/events.xml
index 536278a..5555280 100644
--- a/server/app/src/main/resources/events.xml
+++ b/server/app/src/main/resources/events.xml
@@ -36,55 +36,9 @@
-->
<delivery>synchronous</delivery>
- <!-- Broadcast event system will send messages to all your James servers.
-
- It is the only viable options if you rely on Mailbox Listeners that do not perform well in a distributed system.
-
- Here follows a non exhaustive list of such Mailbox Listeners :
- - Memory quota based system
- - Lucene based search system
-
- Workload is higher because event needs to be serialized and de serialized.
-
- Also note that depending on the publisher you use, messages might be either lost or duplicated, implying wrong
- indexing or wrong quota count on network partitions.
-
- Here follows a sample configuration :
- -->
- <!--
- <type>broadcast</type>
- <serialization>json</serialization>
- <publisher>kafka</publisher>
- -->
-
- <!--
- Further notes on the choice you had here :
-
- serialization : you have to choices : either json or message-pack
-
- message-pack is a binary representation for json, and is 2 times lighter by average, but is 2 time slower to serialize and de serialize.
- This choice allows you to trade compute against network.
-
- publisher : Publish - subscribe used. The only current implementation is Kafka.
- -->
-
- <!-- Registered event system
-
- Scalable event system based on registration : each James server listen on his own topic and manage registrations on
- mailbox paths in order to receive events interesting him.
-
- This configuration does not support distributed unfriendly Mailbox Listeners (see the non exhaustive list above) for obvious reasons.
- -->
- <!--
- <type>registered</type>
- <serialization>json</serialization>
- <registration>cassandra</registration>
- <publisher>kafka</publisher>
- -->
-
<!--
The only registration system available is Cassandra, used in an available fashion. This means there is no warranties,
either at least one delivery nor at most one delivery. But you get the certitude that the system will always be available.
-->
-</events>
\ No newline at end of file
+</events>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/server/app/src/test/resources/events.xml
----------------------------------------------------------------------
diff --git a/server/app/src/test/resources/events.xml b/server/app/src/test/resources/events.xml
index 536278a..5555280 100644
--- a/server/app/src/test/resources/events.xml
+++ b/server/app/src/test/resources/events.xml
@@ -36,55 +36,9 @@
-->
<delivery>synchronous</delivery>
- <!-- Broadcast event system will send messages to all your James servers.
-
- It is the only viable options if you rely on Mailbox Listeners that do not perform well in a distributed system.
-
- Here follows a non exhaustive list of such Mailbox Listeners :
- - Memory quota based system
- - Lucene based search system
-
- Workload is higher because event needs to be serialized and de serialized.
-
- Also note that depending on the publisher you use, messages might be either lost or duplicated, implying wrong
- indexing or wrong quota count on network partitions.
-
- Here follows a sample configuration :
- -->
- <!--
- <type>broadcast</type>
- <serialization>json</serialization>
- <publisher>kafka</publisher>
- -->
-
- <!--
- Further notes on the choice you had here :
-
- serialization : you have to choices : either json or message-pack
-
- message-pack is a binary representation for json, and is 2 times lighter by average, but is 2 time slower to serialize and de serialize.
- This choice allows you to trade compute against network.
-
- publisher : Publish - subscribe used. The only current implementation is Kafka.
- -->
-
- <!-- Registered event system
-
- Scalable event system based on registration : each James server listen on his own topic and manage registrations on
- mailbox paths in order to receive events interesting him.
-
- This configuration does not support distributed unfriendly Mailbox Listeners (see the non exhaustive list above) for obvious reasons.
- -->
- <!--
- <type>registered</type>
- <serialization>json</serialization>
- <registration>cassandra</registration>
- <publisher>kafka</publisher>
- -->
-
<!--
The only registration system available is Cassandra, used in an available fashion. This means there is no warranties,
either at least one delivery nor at most one delivery. But you get the certitude that the system will always be available.
-->
-</events>
\ No newline at end of file
+</events>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/EventsConfigurationBeanFactoryPostProcessor.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/EventsConfigurationBeanFactoryPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/EventsConfigurationBeanFactoryPostProcessor.java
deleted file mode 100644
index 8f25443..0000000
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/EventsConfigurationBeanFactoryPostProcessor.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-
-package org.apache.james.container.spring.bean.factorypostprocessor;
-
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.container.spring.lifecycle.ConfigurationProvider;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.FatalBeanException;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-
-import com.google.common.base.Strings;
-
-public class EventsConfigurationBeanFactoryPostProcessor implements BeanFactoryPostProcessor {
-
- @Override
- public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
- ConfigurationProvider confProvider = beanFactory.getBean(ConfigurationProvider.class);
- try {
- HierarchicalConfiguration config = confProvider.getConfiguration("events");
- String type = config.getString("type", "default");
- String serialization = config.getString("serialization", "json");
- String publisher = config.getString("publisher", "kafka");
- String registration = config.getString("registration", "cassandra");
- String delivery = config.getString("delivery", "synchronous");
- String delegatingListenerAlias = getDelegatingListenerAlias(type);
- String serializationAlias = getSerializationAlias(serialization);
- String registrationAlias = getRegistrationAlias(registration);
- String deliveryAlias = getDeliveryString(delivery);
- String publisherAlias = null;
- String consumerAlias = null;
-
- if (publisher.equals("kafka")) {
- publisherAlias = "kafka-publisher";
- consumerAlias = "kafka-consumer";
- }
-
- detectInvalidValue(delegatingListenerAlias, "Delegating listener type " + type + " not supported!");
- detectInvalidValue(deliveryAlias, "Event delivery " + delivery + " not supported");
- beanFactory.registerAlias(delegatingListenerAlias, "delegating-listener");
- beanFactory.registerAlias(deliveryAlias, "event-delivery");
- if (!delegatingListenerAlias.equals("default")) {
- detectInvalidValue(serializationAlias, "Serialization system type " + serialization + " not supported!");
- detectInvalidValue(publisherAlias, "Publisher system type " + publisher + " not supported!");
- beanFactory.registerAlias(serializationAlias, "event-serializer");
- beanFactory.registerAlias(publisherAlias, "publisher");
- beanFactory.registerAlias(consumerAlias, "consumer");
- if (delegatingListenerAlias.equals("registered")) {
- detectInvalidValue(registrationAlias, "Registration system type " + registration + " not supported!");
- beanFactory.registerAlias(registrationAlias, "distant-mailbox-path-register-mapper");
- }
- }
-
- } catch (ConfigurationException e) {
- throw new FatalBeanException("Unable to config the mailboxmanager", e);
- }
- }
-
- private void detectInvalidValue(String registrationAlias, String message) throws ConfigurationException {
- if (Strings.isNullOrEmpty(registrationAlias)) {
- throw new ConfigurationException(message);
- }
- }
-
- private String getRegistrationAlias(String registration) {
- if (registration.equals("cassandra")) {
- return "cassandra-mailbox-path-register-mapper";
- }
- return null;
- }
-
- private String getSerializationAlias(String serialization) {
- if (serialization.equals("json")) {
- return "json-event-serializer";
- } else if (serialization.equals("message-pack")) {
- return "message-pack-event-serializer";
- }
- return null;
- }
-
- private String getDelegatingListenerAlias(String type) {
- if (type.equals("default")) {
- return "default-delegating-listener";
- } else if (type.equals("broadcast")) {
- return "broadcast-delegating-listener";
- } else if (type.equals("registered")) {
- return "registered-delegating-listener";
- }
- return null;
- }
-
- public String getDeliveryString(String delivery) {
- if (delivery.equals("synchronous")) {
- return "synchronous-event-delivery";
- } else if (delivery.equals("asynchronous")) {
- return "asynchronous-event-delivery";
- } else if (delivery.equals("mixed")) {
- return "mixed-event-delivery";
- }
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml b/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
index 40f6008..297b579 100644
--- a/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
+++ b/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
@@ -149,7 +149,6 @@
</bean>
<!-- Event system -->
- <bean class="org.apache.james.container.spring.bean.factorypostprocessor.EventsConfigurationBeanFactoryPostProcessor"/>
<bean id="dispatcher" class="org.apache.james.mailbox.store.event.MailboxEventDispatcher">
<constructor-arg index="0" ref="delegating-listener"/>
</bean>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f9e478fc/src/site/xdoc/server/config-events.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/server/config-events.xml b/src/site/xdoc/server/config-events.xml
index 7bc0c48..1ad0222 100644
--- a/src/site/xdoc/server/config-events.xml
+++ b/src/site/xdoc/server/config-events.xml
@@ -110,34 +110,9 @@
<li>The default implementation might not deliver some events on server stop.</li>
</ul>
- <ul>
- Broadcast implementation :
- <li>The broadcast implementation might not deliver some events on server stop.</li>
- <li>The broadcast implementation is tight to limitation of the underlying publisher.</li>
- </ul>
-
- <ul>
- Registered implementation :
- <li>The registered implementation might not deliver some events on server stop.</li>
- <li>The registered implementation is tight to limitation of the underlying publisher, and underlying registration system.</li>
- </ul>
-
- <h2>Publisher</h2>
-
- <p>
- Available implementation is Kafka based. Kafka ensure at least one delivery. This means some messages might be
- delivered two times. You need to compile and run James using Java 8 in order to use the Kafka messaging system.
- </p>
-
<h2>Event serializer</h2>
- <p>There are two types of event serialization systems :
- <ul>
- <li>Json : events are converted to JSON</li>
- <li>Message Pack : a binary representation of JSON. 2 times smaller in average but two times longer to compute. It allows you to trade
- bandwidth and data readability against CPU time.</li>
- </ul>
- </p>
+ <p>Json is the only serialization system currently supported.</p>
<h2>Registration systems</h2>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[09/29] james-project git commit: JAMES-2487 Update
com.jayway.restassured to 2.9.0
Posted by bt...@apache.org.
JAMES-2487 Update com.jayway.restassured to 2.9.0
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/7d005382
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7d005382
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7d005382
Branch: refs/heads/master
Commit: 7d00538287ef9a35473ba2d7f7f9316abfd72302
Parents: 091face
Author: Gautier DI FOLCO <gd...@linagora.com>
Authored: Mon Jul 23 10:04:38 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:34:52 2018 +0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/7d005382/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 105a137..af11b8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1684,7 +1684,7 @@
<dependency>
<groupId>com.jayway.restassured</groupId>
<artifactId>rest-assured</artifactId>
- <version>2.6.0</version>
+ <version>2.9.0</version>
</dependency>
<dependency>
<groupId>com.nurkiewicz.asyncretry</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[23/29] james-project git commit: JAMES-2469 Fasten Group tests
Posted by bt...@apache.org.
JAMES-2469 Fasten Group tests
Avoid launching FakeSmtp when not needed
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/74d54189
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/74d54189
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/74d54189
Branch: refs/heads/master
Commit: 74d54189475dbc2eb02ae28c3864da451e0c46c9
Parents: 1169a7d
Author: benwa <bt...@linagora.com>
Authored: Sat Jul 14 11:38:56 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:48 2018 +0700
----------------------------------------------------------------------
.../mailets/GroupMappingRelayTest.java | 161 +++++++++++++++++++
.../transport/mailets/GroupMappingTest.java | 30 +---
2 files changed, 162 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/74d54189/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
new file mode 100644
index 0000000..2094628
--- /dev/null
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
@@ -0,0 +1,161 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.transport.mailets;
+
+
+import static io.restassured.RestAssured.given;
+import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN;
+import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP;
+import static org.apache.james.mailets.configuration.Constants.PASSWORD;
+import static org.apache.james.mailets.configuration.Constants.SMTP_PORT;
+import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute;
+import static org.hamcrest.Matchers.equalTo;
+
+import javax.mail.internet.MimeMessage;
+
+import org.apache.james.core.builder.MimeMessageBuilder;
+import org.apache.james.jmap.mailet.VacationMailet;
+import org.apache.james.mailets.TemporaryJamesServer;
+import org.apache.james.mailets.configuration.CommonProcessors;
+import org.apache.james.mailets.configuration.MailetConfiguration;
+import org.apache.james.mailets.configuration.MailetContainer;
+import org.apache.james.mailets.configuration.ProcessorConfiguration;
+import org.apache.james.mailrepository.api.MailRepositoryUrl;
+import org.apache.james.probe.DataProbe;
+import org.apache.james.transport.matchers.All;
+import org.apache.james.transport.matchers.IsSenderInRRTLoop;
+import org.apache.james.transport.matchers.RecipientIsLocal;
+import org.apache.james.utils.DataProbeImpl;
+import org.apache.james.utils.FakeSmtp;
+import org.apache.james.utils.IMAPMessageReader;
+import org.apache.james.utils.SMTPMessageSender;
+import org.apache.james.utils.WebAdminGuiceProbe;
+import org.apache.james.webadmin.WebAdminUtils;
+import org.apache.james.webadmin.routes.GroupsRoutes;
+import org.apache.mailet.base.test.FakeMail;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import com.jayway.awaitility.Duration;
+
+import io.restassured.specification.RequestSpecification;
+
+public class GroupMappingRelayTest {
+ private static final String DOMAIN1 = "domain1.com";
+
+ public static final String SENDER_LOCAL_PART = "fromuser";
+ private static final String SENDER = SENDER_LOCAL_PART + "@" + DOMAIN1;
+ private static final String GROUP_ON_DOMAIN1 = "group@" + DOMAIN1;
+
+ private static final String MESSAGE_CONTENT = "any text";
+ public static final String RRT_ERROR = "rrt-error";
+ public static final MailRepositoryUrl RRT_ERROR_REPOSITORY = MailRepositoryUrl.from("file://var/mail/rrt-error/");
+
+ private TemporaryJamesServer jamesServer;
+ private MimeMessage message;
+ private RequestSpecification webAdminApi;
+
+ @Rule
+ public final FakeSmtp fakeSmtp = new FakeSmtp();
+ @Rule
+ public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
+ @Rule
+ public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
+
+ @Before
+ public void setup() throws Exception {
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ .putProcessor(ProcessorConfiguration.transport()
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(RecipientRewriteTable.class)
+ .addProperty("errorProcessor", RRT_ERROR))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(RecipientIsLocal.class)
+ .mailet(VacationMailet.class))
+ .addMailetsFrom(CommonProcessors.deliverOnlyTransport())
+ .addMailet(MailetConfiguration.remoteDeliveryBuilder()
+ .matcher(All.class)
+ .addProperty("gateway", fakeSmtp.getContainer().getContainerIp())))
+ .putProcessor(ProcessorConfiguration.builder()
+ .state(RRT_ERROR)
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(ToRepository.class)
+ .addProperty("passThrough", "true")
+ .addProperty("repositoryPath", RRT_ERROR_REPOSITORY.asString()))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(IsSenderInRRTLoop.class)
+ .mailet(Null.class))
+ .addMailet(MailetConfiguration.builder()
+ .matcher(All.class)
+ .mailet(Bounce.class)));
+
+ jamesServer = TemporaryJamesServer.builder()
+ .withMailetContainer(mailetContainer)
+ .build(temporaryFolder);
+
+ fakeSmtp.awaitStarted(awaitAtMostOneMinute);
+
+ DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class);
+ dataProbe.addDomain(DOMAIN1);
+
+ dataProbe.addUser(SENDER, PASSWORD);
+
+ WebAdminGuiceProbe webAdminGuiceProbe = jamesServer.getProbe(WebAdminGuiceProbe.class);
+ webAdminGuiceProbe.await();
+ webAdminApi = given()
+ .spec(WebAdminUtils.buildRequestSpecification(webAdminGuiceProbe.getWebAdminPort()).build());
+
+ message = MimeMessageBuilder.mimeMessageBuilder()
+ .setSubject("test")
+ .setText(MESSAGE_CONTENT)
+ .build();
+ }
+
+ @After
+ public void tearDown() {
+ jamesServer.shutdown();
+ }
+
+ @Test
+ public void sendMessageShouldSendAMessageToAnExternalGroupMember() throws Exception {
+ String externalMail = "ray@yopmail.com";
+ webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + externalMail);
+
+ messageSender.connect(LOCALHOST_IP, SMTP_PORT)
+ .sendMessage(FakeMail.builder()
+ .mimeMessage(message)
+ .sender(SENDER)
+ .recipient(GROUP_ON_DOMAIN1));
+
+ awaitAtMostOneMinute
+ .pollDelay(Duration.ONE_HUNDRED_MILLISECONDS)
+ .until(() -> fakeSmtp.isReceived(response -> response
+ .body("[0].from", equalTo(SENDER))
+ .body("[0].to[0]", equalTo(externalMail))
+ .body("[0].text", equalTo(MESSAGE_CONTENT))));
+ }
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/74d54189/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
index dd501cd..1aadb4f 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
@@ -27,7 +27,6 @@ import static org.apache.james.mailets.configuration.Constants.PASSWORD;
import static org.apache.james.mailets.configuration.Constants.SMTP_PORT;
import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.Matchers.equalTo;
import javax.mail.internet.MimeMessage;
@@ -46,7 +45,6 @@ import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.IsSenderInRRTLoop;
import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.utils.DataProbeImpl;
-import org.apache.james.utils.FakeSmtp;
import org.apache.james.utils.IMAPMessageReader;
import org.apache.james.utils.MailRepositoryProbeImpl;
import org.apache.james.utils.SMTPMessageSender;
@@ -85,8 +83,6 @@ public class GroupMappingTest {
private RequestSpecification webAdminApi;
@Rule
- public final FakeSmtp fakeSmtp = new FakeSmtp();
- @Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
@@ -104,10 +100,7 @@ public class GroupMappingTest {
.addMailet(MailetConfiguration.builder()
.matcher(RecipientIsLocal.class)
.mailet(VacationMailet.class))
- .addMailetsFrom(CommonProcessors.deliverOnlyTransport())
- .addMailet(MailetConfiguration.remoteDeliveryBuilder()
- .matcher(All.class)
- .addProperty("gateway", fakeSmtp.getContainer().getContainerIp())))
+ .addMailetsFrom(CommonProcessors.deliverOnlyTransport()))
.putProcessor(ProcessorConfiguration.builder()
.state(RRT_ERROR)
.addMailet(MailetConfiguration.builder()
@@ -126,8 +119,6 @@ public class GroupMappingTest {
.withMailetContainer(mailetContainer)
.build(temporaryFolder);
- fakeSmtp.awaitStarted(awaitAtMostOneMinute);
-
dataProbe = jamesServer.getProbe(DataProbeImpl.class);
dataProbe.addDomain(DOMAIN1);
dataProbe.addDomain(DOMAIN2);
@@ -492,23 +483,4 @@ public class GroupMappingTest {
.select(IMAPMessageReader.INBOX)
.awaitMessage(awaitAtMostOneMinute);
}
-
- @Test
- public void sendMessageShouldSendAMessageToAnExternalGroupMember() throws Exception {
- String externalMail = "ray@yopmail.com";
- webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + externalMail);
-
- messageSender.connect(LOCALHOST_IP, SMTP_PORT)
- .sendMessage(FakeMail.builder()
- .mimeMessage(message)
- .sender(SENDER)
- .recipient(GROUP_ON_DOMAIN1));
-
- awaitAtMostOneMinute
- .pollDelay(Duration.ONE_HUNDRED_MILLISECONDS)
- .until(() -> fakeSmtp.isReceived(response -> response
- .body("[0].from", equalTo(SENDER))
- .body("[0].to[0]", equalTo(externalMail))
- .body("[0].text", equalTo(MESSAGE_CONTENT))));
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[13/29] james-project git commit: JAMES-2487 Update org.xmlunit to
2.6.0
Posted by bt...@apache.org.
JAMES-2487 Update org.xmlunit to 2.6.0
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fedf0a2f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fedf0a2f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fedf0a2f
Branch: refs/heads/master
Commit: fedf0a2feffec59bd0870f8022286a3f84c5db12
Parents: 65db2c4
Author: Gautier DI FOLCO <gd...@linagora.com>
Authored: Mon Jul 23 14:12:58 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:07 2018 +0700
----------------------------------------------------------------------
server/mailet/integration-testing/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/fedf0a2f/server/mailet/integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml
index 4f6e5a0..1989ecb 100644
--- a/server/mailet/integration-testing/pom.xml
+++ b/server/mailet/integration-testing/pom.xml
@@ -165,12 +165,12 @@
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
- <version>2.5.1</version>
+ <version>2.6.0</version>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-matchers</artifactId>
- <version>2.5.1</version>
+ <version>2.6.0</version>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[03/29] james-project git commit: JAMES-2496 don't use
project.groupId for dep mgnt as it's resolved in children pom
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml
index d261fa2..815f264 100644
--- a/server/container/guice/pom.xml
+++ b/server/container/guice/pom.xml
@@ -70,119 +70,119 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-es-resporter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-imap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmx</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-lmtp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-mailbox</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-mailbox-plugin-spamassassin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-mailet</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-managedsieve</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-pop</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-smtp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-data</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-mailbox</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-mailqueue</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-mailrepository</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-swagger</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jpa-common-guice</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jpa-common-guice</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jpa-smtp-common-guice</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/protocols/imap/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/imap/pom.xml b/server/container/guice/protocols/imap/pom.xml
index f776b11..41fc0aa 100644
--- a/server/container/guice/protocols/imap/pom.xml
+++ b/server/container/guice/protocols/imap/pom.xml
@@ -33,15 +33,15 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-mailbox</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-imap4</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/protocols/jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/jmap/pom.xml b/server/container/guice/protocols/jmap/pom.xml
index 3ccc665..0769a63 100644
--- a/server/container/guice/protocols/jmap/pom.xml
+++ b/server/container/guice/protocols/jmap/pom.xml
@@ -33,29 +33,29 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-mailet</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jmap</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/protocols/lmtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/lmtp/pom.xml b/server/container/guice/protocols/lmtp/pom.xml
index a974caa..cac5e9c 100644
--- a/server/container/guice/protocols/lmtp/pom.xml
+++ b/server/container/guice/protocols/lmtp/pom.xml
@@ -33,11 +33,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-lmtp</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/protocols/managedsieve/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/managedsieve/pom.xml b/server/container/guice/protocols/managedsieve/pom.xml
index d6c9790..4c06069 100644
--- a/server/container/guice/protocols/managedsieve/pom.xml
+++ b/server/container/guice/protocols/managedsieve/pom.xml
@@ -33,15 +33,15 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-managesieve</artifactId>
</dependency>
<dependency>
@@ -53,7 +53,7 @@
<artifactId>guice-multibindings</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-managesieve</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/protocols/netty/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/netty/pom.xml b/server/container/guice/protocols/netty/pom.xml
index ad87969..d983b4b 100644
--- a/server/container/guice/protocols/netty/pom.xml
+++ b/server/container/guice/protocols/netty/pom.xml
@@ -33,11 +33,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}.protocols</groupId>
+ <groupId>${james.groupId}.protocols</groupId>
<artifactId>protocols-netty</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/protocols/pop/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/pop/pom.xml b/server/container/guice/protocols/pop/pom.xml
index e11b5d2..7e99798 100644
--- a/server/container/guice/protocols/pop/pom.xml
+++ b/server/container/guice/protocols/pop/pom.xml
@@ -33,11 +33,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-pop3</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/protocols/smtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/smtp/pom.xml b/server/container/guice/protocols/smtp/pom.xml
index 04fec9b..3f52b32 100644
--- a/server/container/guice/protocols/smtp/pom.xml
+++ b/server/container/guice/protocols/smtp/pom.xml
@@ -33,11 +33,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-smtp</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/protocols/webadmin-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-cassandra/pom.xml b/server/container/guice/protocols/webadmin-cassandra/pom.xml
index 45e1b6d..f69d365 100644
--- a/server/container/guice/protocols/webadmin-cassandra/pom.xml
+++ b/server/container/guice/protocols/webadmin-cassandra/pom.xml
@@ -33,11 +33,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-cassandra</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/protocols/webadmin-data/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-data/pom.xml b/server/container/guice/protocols/webadmin-data/pom.xml
index 7f9e335..1c14613 100644
--- a/server/container/guice/protocols/webadmin-data/pom.xml
+++ b/server/container/guice/protocols/webadmin-data/pom.xml
@@ -33,15 +33,15 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-data</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/protocols/webadmin-mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-mailbox/pom.xml b/server/container/guice/protocols/webadmin-mailbox/pom.xml
index fe5756e..d29281f 100644
--- a/server/container/guice/protocols/webadmin-mailbox/pom.xml
+++ b/server/container/guice/protocols/webadmin-mailbox/pom.xml
@@ -33,15 +33,15 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-mailbox</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/protocols/webadmin-mailqueue/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-mailqueue/pom.xml b/server/container/guice/protocols/webadmin-mailqueue/pom.xml
index 627a8ed..af5779b 100644
--- a/server/container/guice/protocols/webadmin-mailqueue/pom.xml
+++ b/server/container/guice/protocols/webadmin-mailqueue/pom.xml
@@ -35,15 +35,15 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-mailqueue</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/protocols/webadmin-mailrepository/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-mailrepository/pom.xml b/server/container/guice/protocols/webadmin-mailrepository/pom.xml
index 25f4983..5ce56be 100644
--- a/server/container/guice/protocols/webadmin-mailrepository/pom.xml
+++ b/server/container/guice/protocols/webadmin-mailrepository/pom.xml
@@ -35,15 +35,15 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-mailrepository</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/protocols/webadmin-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin-swagger/pom.xml b/server/container/guice/protocols/webadmin-swagger/pom.xml
index 27f6f51..f3ddeaa 100644
--- a/server/container/guice/protocols/webadmin-swagger/pom.xml
+++ b/server/container/guice/protocols/webadmin-swagger/pom.xml
@@ -33,15 +33,15 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-swagger</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/protocols/webadmin/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/webadmin/pom.xml b/server/container/guice/protocols/webadmin/pom.xml
index 79f86d6..2edd0ff 100644
--- a/server/container/guice/protocols/webadmin/pom.xml
+++ b/server/container/guice/protocols/webadmin/pom.xml
@@ -33,11 +33,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/jetty/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/jetty/pom.xml b/server/container/jetty/pom.xml
index db833c3..bacbfab 100644
--- a/server/container/jetty/pom.xml
+++ b/server/container/jetty/pom.xml
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-core</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/mailbox-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/mailbox-adapter/pom.xml b/server/container/mailbox-adapter/pom.xml
index 115accf..8a8927a 100644
--- a/server/container/mailbox-adapter/pom.xml
+++ b/server/container/mailbox-adapter/pom.xml
@@ -34,58 +34,58 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-maildir</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-tool</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/metrics/metrics-es-reporter/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/metrics/metrics-es-reporter/pom.xml b/server/container/metrics/metrics-es-reporter/pom.xml
index 210d896..dc3d11d 100644
--- a/server/container/metrics/metrics-es-reporter/pom.xml
+++ b/server/container/metrics/metrics-es-reporter/pom.xml
@@ -30,22 +30,22 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-dropwizard</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/spring/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml
index 0598fd0..61c2213 100644
--- a/server/container/spring/pom.xml
+++ b/server/container/spring/pom.xml
@@ -34,49 +34,49 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-tool</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailbox-adapter</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailetcontainer-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
@@ -117,7 +117,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/util-java8/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/util-java8/pom.xml b/server/container/util-java8/pom.xml
index 17b6d48..863fa46 100644
--- a/server/container/util-java8/pom.xml
+++ b/server/container/util-java8/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/util/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/util/pom.xml b/server/container/util/pom.xml
index 43ea0c2..8f2a94e 100644
--- a/server/container/util/pom.xml
+++ b/server/container/util/pom.xml
@@ -34,13 +34,13 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/data/data-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-api/pom.xml b/server/data/data-api/pom.xml
index 69c0b47..cfbd462 100644
--- a/server/data/data-api/pom.xml
+++ b/server/data/data-api/pom.xml
@@ -35,19 +35,19 @@
<dependencies>
<dependency>
<!-- only used by JamesUser (for MailAddress) -->
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailrepository-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/data/data-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/pom.xml b/server/data/data-cassandra/pom.xml
index 2b9cafc..30a46a3 100644
--- a/server/data/data-cassandra/pom.xml
+++ b/server/data/data-cassandra/pom.xml
@@ -32,57 +32,57 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-cassandra</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/data/data-file/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-file/pom.xml b/server/data/data-file/pom.xml
index da8d221..43d3c86 100644
--- a/server/data/data-file/pom.xml
+++ b/server/data/data-file/pom.xml
@@ -34,59 +34,59 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailrepository-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/data/data-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/pom.xml b/server/data/data-hbase/pom.xml
index f904d75..887e1d3 100644
--- a/server/data/data-hbase/pom.xml
+++ b/server/data/data-hbase/pom.xml
@@ -32,37 +32,37 @@
<name>Apache James :: Server :: Data :: HBase Persistence</name>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-hbase</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/data/data-jcr/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/pom.xml b/server/data/data-jcr/pom.xml
index 0c22e8f..c3d8ddd 100644
--- a/server/data/data-jcr/pom.xml
+++ b/server/data/data-jcr/pom.xml
@@ -34,23 +34,23 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/data/data-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/pom.xml b/server/data/data-jdbc/pom.xml
index ac76f51..351378f 100644
--- a/server/data/data-jdbc/pom.xml
+++ b/server/data/data-jdbc/pom.xml
@@ -34,54 +34,54 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailrepository-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/data/data-jmap-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jmap-cassandra/pom.xml b/server/data/data-jmap-cassandra/pom.xml
index c48f815..472bcda 100644
--- a/server/data/data-jmap-cassandra/pom.xml
+++ b/server/data/data-jmap-cassandra/pom.xml
@@ -35,21 +35,21 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-jmap</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-jmap</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/data/data-jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jmap/pom.xml b/server/data/data-jmap/pom.xml
index 7ae0de2..fa9db60 100644
--- a/server/data/data-jmap/pom.xml
+++ b/server/data/data-jmap/pom.xml
@@ -34,11 +34,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/data/data-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml
index b0bdcc5..e1282ba 100644
--- a/server/data/data-jpa/pom.xml
+++ b/server/data/data-jpa/pom.xml
@@ -34,47 +34,47 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/data/data-ldap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-ldap-integration-testing/pom.xml b/server/data/data-ldap-integration-testing/pom.xml
index 698cb8a..63617e3 100644
--- a/server/data/data-ldap-integration-testing/pom.xml
+++ b/server/data/data-ldap-integration-testing/pom.xml
@@ -34,17 +34,17 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-ldap</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/data/data-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-ldap/pom.xml b/server/data/data-ldap/pom.xml
index daa8443..ea4cd7f 100644
--- a/server/data/data-ldap/pom.xml
+++ b/server/data/data-ldap/pom.xml
@@ -34,15 +34,15 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/data/data-library/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-library/pom.xml b/server/data/data-library/pom.xml
index ac22842..de10694 100644
--- a/server/data/data-library/pom.xml
+++ b/server/data/data-library/pom.xml
@@ -34,44 +34,44 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/data/data-memory/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-memory/pom.xml b/server/data/data-memory/pom.xml
index a01623c..0c06813 100644
--- a/server/data/data-memory/pom.xml
+++ b/server/data/data-memory/pom.xml
@@ -34,38 +34,38 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/dns-service/dnsservice-dnsjava/pom.xml
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-dnsjava/pom.xml b/server/dns-service/dnsservice-dnsjava/pom.xml
index 27b79ff..62bea4f 100644
--- a/server/dns-service/dnsservice-dnsjava/pom.xml
+++ b/server/dns-service/dnsservice-dnsjava/pom.xml
@@ -34,15 +34,15 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/dns-service/dnsservice-library/pom.xml
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-library/pom.xml b/server/dns-service/dnsservice-library/pom.xml
index 8c3385f..1155ede 100644
--- a/server/dns-service/dnsservice-library/pom.xml
+++ b/server/dns-service/dnsservice-library/pom.xml
@@ -34,15 +34,15 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/karaf/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/server/karaf/distribution/pom.xml b/server/karaf/distribution/pom.xml
index 287c58b..ce99c57 100644
--- a/server/karaf/distribution/pom.xml
+++ b/server/karaf/distribution/pom.xml
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-karaf-features</artifactId>
<type>pom</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/karaf/integration/pom.xml
----------------------------------------------------------------------
diff --git a/server/karaf/integration/pom.xml b/server/karaf/integration/pom.xml
index 5a8f3c3..cbbb180 100644
--- a/server/karaf/integration/pom.xml
+++ b/server/karaf/integration/pom.xml
@@ -32,7 +32,7 @@
<!-- Apache Felix Karaf integration -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-karaf-distribution</artifactId>
<type>tar.gz</type>
<scope>test</scope>
@@ -49,27 +49,27 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-karaf-features</artifactId>
<type>pom</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-dnsjava</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-fetchmail</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailetcontainer-camel</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/mailet/integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml
index 51b3bbf..48fd691 100644
--- a/server/mailet/integration-testing/pom.xml
+++ b/server/mailet/integration-testing/pom.xml
@@ -34,74 +34,74 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-crypto</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-icalendar</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailetcontainer-camel</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailets</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-memory-guice</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/mailet/mailetcontainer-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-api/pom.xml b/server/mailet/mailetcontainer-api/pom.xml
index 2e6abbf..cf2cbda 100644
--- a/server/mailet/mailetcontainer-api/pom.xml
+++ b/server/mailet/mailetcontainer-api/pom.xml
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/mailet/mailetcontainer-camel/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/pom.xml b/server/mailet/mailetcontainer-camel/pom.xml
index 3cdaf5b..25f6627 100644
--- a/server/mailet/mailetcontainer-camel/pom.xml
+++ b/server/mailet/mailetcontainer-camel/pom.xml
@@ -34,75 +34,75 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-standard</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailetcontainer-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailetcontainer-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/mailet/mailets/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml
index d60eba1..61ee063 100644
--- a/server/mailet/mailets/pom.xml
+++ b/server/mailet/mailets/pom.xml
@@ -34,147 +34,147 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-standard</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-james-utils</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-mdn</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailrepository-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
@@ -207,17 +207,17 @@
<artifactId>apache-jspf-resolver</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-managesieve</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-managesieve</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-smtp</artifactId>
<scope>compile</scope>
</dependency>
@@ -274,7 +274,7 @@
<build>
<plugins>
<plugin>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>maven-mailetdocs-plugin</artifactId>
<version>0.1</version>
<configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/mailrepository/mailrepository-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailrepository/mailrepository-api/pom.xml b/server/mailrepository/mailrepository-api/pom.xml
index 688fdad..c97ab80 100644
--- a/server/mailrepository/mailrepository-api/pom.xml
+++ b/server/mailrepository/mailrepository-api/pom.xml
@@ -34,22 +34,22 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/mailrepository/mailrepository-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailrepository/mailrepository-cassandra/pom.xml b/server/mailrepository/mailrepository-cassandra/pom.xml
index 65f91ba..69102d9 100644
--- a/server/mailrepository/mailrepository-cassandra/pom.xml
+++ b/server/mailrepository/mailrepository-cassandra/pom.xml
@@ -34,46 +34,46 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>blob-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>blob-cassandra</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>blob-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailrepository-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailrepository-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/mailrepository/mailrepository-memory/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailrepository/mailrepository-memory/pom.xml b/server/mailrepository/mailrepository-memory/pom.xml
index 486f5c8..43ac17a 100644
--- a/server/mailrepository/mailrepository-memory/pom.xml
+++ b/server/mailrepository/mailrepository-memory/pom.xml
@@ -34,20 +34,20 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailrepository-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailrepository-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/fetchmail/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/pom.xml b/server/protocols/fetchmail/pom.xml
index e0e5d85..52488b0 100644
--- a/server/protocols/fetchmail/pom.xml
+++ b/server/protocols/fetchmail/pom.xml
@@ -34,31 +34,31 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[24/29] james-project git commit: JAMES-2469 Fasten Embedded
ElasticSearch
Posted by bt...@apache.org.
JAMES-2469 Fasten Embedded ElasticSearch
Avoid waiting 100ms for nothing upon start and stop, avoid a ~10ms request upon stop.
The files were dropped anyway, so the 'partial' (we do use several indexes) DeleteIndex query was useless, I removed it.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/9b8e48a6
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/9b8e48a6
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/9b8e48a6
Branch: refs/heads/master
Commit: 9b8e48a6ca7d5bfe63dd4365611654b1aa178f27
Parents: 74d5418
Author: benwa <bt...@linagora.com>
Authored: Sun Jul 15 14:27:05 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:48 2018 +0700
----------------------------------------------------------------------
.../backends/es/ElasticSearchIndexerTest.java | 2 +-
.../backends/es/EmbeddedElasticSearch.java | 31 +++++---------------
.../backends/es/IndexCreationFactoryTest.java | 2 +-
.../backends/es/NodeMappingFactoryTest.java | 2 +-
.../backends/es/search/ScrollIterableTest.java | 2 +-
.../ElasticSearchIntegrationTest.java | 2 +-
...ticSearchQuotaSearchTestSystemExtension.java | 2 +-
.../ElasticSearchQuotaMailboxListenerTest.java | 2 +-
.../host/ElasticSearchHostSystem.java | 2 +-
.../apache/james/EmbeddedElasticSearchRule.java | 3 +-
.../james/JamesCapabilitiesServerTest.java | 3 +-
.../jmap/cassandra/CassandraJmapExtension.java | 3 +-
.../cassandra/cucumber/CassandraStepdefs.java | 3 +-
.../ElasticSearchQuotaSearchExtension.java | 2 +-
14 files changed, 20 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java
----------------------------------------------------------------------
diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java
index 544389d..ee37e80 100644
--- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java
+++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java
@@ -45,7 +45,7 @@ public class ElasticSearchIndexerTest {
private static final WriteAliasName ALIAS_NAME = new WriteAliasName("alias_name");
private static final TypeName TYPE_NAME = new TypeName("type_name");
private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, INDEX_NAME);
+ private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
@Rule
public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch);
http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java
----------------------------------------------------------------------
diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java
index 19002b5..721d9e7 100644
--- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java
+++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/EmbeddedElasticSearch.java
@@ -26,7 +26,6 @@ import java.io.IOException;
import java.nio.file.Path;
import java.util.function.Supplier;
-import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
import org.elasticsearch.action.admin.indices.flush.FlushAction;
import org.elasticsearch.action.admin.indices.flush.FlushRequestBuilder;
import org.elasticsearch.client.Client;
@@ -34,17 +33,11 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.node.Node;
import org.junit.rules.ExternalResource;
import org.junit.rules.TemporaryFolder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.jayway.awaitility.Duration;
public class EmbeddedElasticSearch extends ExternalResource {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(EmbeddedElasticSearch.class);
-
private final Supplier<Path> folder;
- private final IndexName indexName;
private Node node;
private static Path createTempDir(TemporaryFolder temporaryFolder) {
@@ -55,17 +48,16 @@ public class EmbeddedElasticSearch extends ExternalResource {
}
}
- public EmbeddedElasticSearch(TemporaryFolder temporaryFolder, IndexName indexName) {
- this(() -> EmbeddedElasticSearch.createTempDir(temporaryFolder), indexName);
+ public EmbeddedElasticSearch(TemporaryFolder temporaryFolder) {
+ this(() -> EmbeddedElasticSearch.createTempDir(temporaryFolder));
}
- public EmbeddedElasticSearch(Path folder, IndexName indexName) {
- this(() -> folder, indexName);
+ public EmbeddedElasticSearch(Path folder) {
+ this(() -> folder);
}
- private EmbeddedElasticSearch(Supplier<Path> folder, IndexName indexName) {
+ private EmbeddedElasticSearch(Supplier<Path> folder) {
this.folder = folder;
- this.indexName = indexName;
}
@Override
@@ -76,20 +68,10 @@ public class EmbeddedElasticSearch extends ExternalResource {
.build())
.node();
node.start();
- awaitForElasticSearch();
}
@Override
public void after() {
- awaitForElasticSearch();
- try (Client client = node.client()) {
- client.admin()
- .indices()
- .delete(new DeleteIndexRequest(indexName.getValue()))
- .actionGet();
- } catch (Exception e) {
- LOGGER.warn("Error while closing ES connection", e);
- }
node.close();
}
@@ -102,7 +84,8 @@ public class EmbeddedElasticSearch extends ExternalResource {
* This method ensure that ElasticSearch service is up and indices are updated
*/
public void awaitForElasticSearch() {
- await().atMost(Duration.TEN_SECONDS).until(this::flush);
+ await().atMost(Duration.TEN_SECONDS)
+ .until(this::flush);
}
private boolean flush() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/IndexCreationFactoryTest.java
----------------------------------------------------------------------
diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/IndexCreationFactoryTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/IndexCreationFactoryTest.java
index 012914e..1c9f1d8 100644
--- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/IndexCreationFactoryTest.java
+++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/IndexCreationFactoryTest.java
@@ -33,7 +33,7 @@ public class IndexCreationFactoryTest {
public static final ReadAliasName ALIAS_NAME = new ReadAliasName("alias");
private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, INDEX_NAME);
+ private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
@Rule
public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch);
http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/NodeMappingFactoryTest.java
----------------------------------------------------------------------
diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/NodeMappingFactoryTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/NodeMappingFactoryTest.java
index d6920af..50e2f1e 100644
--- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/NodeMappingFactoryTest.java
+++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/NodeMappingFactoryTest.java
@@ -36,7 +36,7 @@ public class NodeMappingFactoryTest {
public static final TypeName TYPE_NAME = new TypeName("type");
private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, INDEX_NAME);
+ private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
@Rule
public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch);
http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/search/ScrollIterableTest.java
----------------------------------------------------------------------
diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/search/ScrollIterableTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/search/ScrollIterableTest.java
index c9bb496..4c65a9b 100644
--- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/search/ScrollIterableTest.java
+++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/search/ScrollIterableTest.java
@@ -57,7 +57,7 @@ public class ScrollIterableTest {
public static final TypeName TYPE_NAME = new TypeName("messages");
private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, INDEX_NAME);
+ private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
@Rule
public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch);
http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java
index e8b8aae..f237799 100644
--- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java
+++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java
@@ -64,7 +64,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest
private static final int SEARCH_SIZE = 1;
private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX);
+ private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
@Rule
public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch);
http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java
index ecefaf7..cf35a03 100644
--- a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java
+++ b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/ElasticSearchQuotaSearchTestSystemExtension.java
@@ -47,7 +47,7 @@ import org.junit.rules.TemporaryFolder;
public class ElasticSearchQuotaSearchTestSystemExtension implements ParameterResolver, BeforeEachCallback, AfterEachCallback {
private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_INDEX);
+ private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
@Override
public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException {
http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListenerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListenerTest.java b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListenerTest.java
index 076e956..a9ef7de 100644
--- a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListenerTest.java
+++ b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/events/ElasticSearchQuotaMailboxListenerTest.java
@@ -53,7 +53,7 @@ public class ElasticSearchQuotaMailboxListenerTest {
private static final Event EVENT = () -> MAILBOX_SESSION;
private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_INDEX);
+ private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
@Rule
public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch);
http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
index 0e68773..7feed5d 100644
--- a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
+++ b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java
@@ -76,7 +76,7 @@ public class ElasticSearchHostSystem extends JamesImapHostSystem {
public void beforeTest() throws Exception {
super.beforeTest();
this.tempDirectory = Files.createTempDirectory("elasticsearch");
- this.embeddedElasticSearch = new EmbeddedElasticSearch(tempDirectory, MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX);
+ this.embeddedElasticSearch = new EmbeddedElasticSearch(tempDirectory);
embeddedElasticSearch.before();
initFields();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/server/container/guice/cassandra-guice/src/test/java/org/apache/james/EmbeddedElasticSearchRule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/EmbeddedElasticSearchRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/EmbeddedElasticSearchRule.java
index 028dc42..3c6848a 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/EmbeddedElasticSearchRule.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/EmbeddedElasticSearchRule.java
@@ -20,7 +20,6 @@
package org.apache.james;
import org.apache.james.backends.es.EmbeddedElasticSearch;
-import org.apache.james.mailbox.elasticsearch.MailboxElasticSearchConstants;
import org.apache.james.modules.TestElasticSearchModule;
import org.elasticsearch.node.Node;
import org.junit.rules.RuleChain;
@@ -34,7 +33,7 @@ import com.google.inject.Module;
public class EmbeddedElasticSearchRule implements GuiceModuleTestRule {
private final TemporaryFolder temporaryFolder = new TemporaryFolder();
- private final EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX);
+ private final EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
private final RuleChain chain = RuleChain
.outerRule(temporaryFolder)
http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java
index 2b39d71..c55e634 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java
@@ -31,7 +31,6 @@ import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
import org.apache.james.backends.es.EmbeddedElasticSearch;
import org.apache.james.jmap.methods.GetMessageListMethod;
import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.elasticsearch.MailboxElasticSearchConstants;
import org.apache.james.modules.TestElasticSearchModule;
import org.apache.james.modules.TestJMAPServerModule;
import org.apache.james.server.core.configuration.Configuration;
@@ -48,7 +47,7 @@ public class JamesCapabilitiesServerTest {
private GuiceJamesServer server;
private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX);
+ private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
@ClassRule
public static DockerCassandraRule cassandraServer = new DockerCassandraRule();
http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java
index 9a4297c..3adc452 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java
@@ -27,7 +27,6 @@ import org.apache.james.GuiceJamesServer;
import org.apache.james.backends.es.EmbeddedElasticSearch;
import org.apache.james.jmap.methods.integration.JamesWithSpamAssassin;
import org.apache.james.jmap.methods.integration.SpamAssassinModule;
-import org.apache.james.mailbox.elasticsearch.MailboxElasticSearchConstants;
import org.apache.james.mailbox.extractor.TextExtractor;
import org.apache.james.mailbox.store.search.PDFTextExtractor;
import org.apache.james.modules.TestESMetricReporterModule;
@@ -60,7 +59,7 @@ public class CassandraJmapExtension implements BeforeAllCallback, AfterAllCallba
public CassandraJmapExtension() {
this.temporaryFolder = new TemporaryFolder();
this.cassandra = new DockerCassandraRule();
- this.elasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX);
+ this.elasticSearch = new EmbeddedElasticSearch(temporaryFolder);
this.spamAssassinExtension = new SpamAssassinExtension();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
index 4c53770..d67daa7 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraStepdefs.java
@@ -34,7 +34,6 @@ import org.apache.james.backends.es.EmbeddedElasticSearch;
import org.apache.james.jmap.methods.integration.cucumber.ImapStepdefs;
import org.apache.james.jmap.methods.integration.cucumber.MainStepdefs;
import org.apache.james.mailbox.cassandra.ids.CassandraMessageId;
-import org.apache.james.mailbox.elasticsearch.MailboxElasticSearchConstants;
import org.apache.james.mailbox.extractor.TextExtractor;
import org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
import org.apache.james.modules.TestESMetricReporterModule;
@@ -57,7 +56,7 @@ public class CassandraStepdefs {
private final MainStepdefs mainStepdefs;
private final ImapStepdefs imapStepdefs;
private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX);
+ private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
private DockerCassandraRule cassandraServer = CucumberCassandraSingleton.cassandraServer;
@Inject
http://git-wip-us.apache.org/repos/asf/james-project/blob/9b8e48a6/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java
index d9a9e24..48f25f0 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ElasticSearchQuotaSearchExtension.java
@@ -51,7 +51,7 @@ public class ElasticSearchQuotaSearchExtension implements ParameterResolver, Bef
private WebAdminQuotaSearchTestSystem restQuotaSearchTestSystem;
private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder, QuotaRatioElasticSearchConstants.DEFAULT_QUOTA_RATIO_INDEX);
+ private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
@Override
public void beforeEach(ExtensionContext context) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[07/29] james-project git commit: JAMES-2487 Update info.cukes
Posted by bt...@apache.org.
JAMES-2487 Update info.cukes
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f75b6e1c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f75b6e1c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f75b6e1c
Branch: refs/heads/master
Commit: f75b6e1cfb2b78172ef012d6880cad658ea86569
Parents: f9e478f
Author: Gautier DI FOLCO <gd...@linagora.com>
Authored: Fri Jul 20 11:25:58 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:34:51 2018 +0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/f75b6e1c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ee24151..ecb4387 100644
--- a/pom.xml
+++ b/pom.xml
@@ -621,7 +621,7 @@
<geronimo-annotation-spec.version>1.0.1</geronimo-annotation-spec.version>
<spring-osgi-extender.version>1.2.1</spring-osgi-extender.version>
<org.osgi.core.version>5.0.0</org.osgi.core.version>
- <cucumber.version>1.2.4</cucumber.version>
+ <cucumber.version>1.2.5</cucumber.version>
<exam.version>2.6.0</exam.version>
<url.version>1.4.0</url.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[02/29] james-project git commit: JAMES-2496 don't use
project.groupId for dep mgnt as it's resolved in children pom
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
index 03fa0ca..6fd5f0d 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
@@ -34,105 +34,105 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-spamassassin</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jmap-integration-testing</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<!-- Force Memory JMAP integration tests to be played before Cassandra ones -->
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>memory-jmap-integration-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
index 4ba2d66..1e3bc40 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
@@ -34,77 +34,77 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-spamassassin</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-jmap</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-mailbox</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
index 0294e25..e06cb75 100644
--- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
@@ -34,69 +34,69 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-spamassassin</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jmap-integration-testing</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-memory-guice</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-memory-guice</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/pom.xml
index 2331050..0e796ae 100644
--- a/server/protocols/jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/pom.xml
@@ -41,7 +41,7 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>memory-jmap-integration-testing</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml
index 7921b13..9e4873a 100644
--- a/server/protocols/jmap/pom.xml
+++ b/server/protocols/jmap/pom.xml
@@ -34,131 +34,131 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-core</artifactId>
<version>${apache-mime4j.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-mdn</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-jmap</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jetty</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jwt</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/protocols-imap4/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/pom.xml b/server/protocols/protocols-imap4/pom.xml
index e6a1a3c..7047dd2 100644
--- a/server/protocols/protocols-imap4/pom.xml
+++ b/server/protocols/protocols-imap4/pom.xml
@@ -34,23 +34,23 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
</dependency>
<dependency>
@@ -84,11 +84,11 @@
<artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-imap</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-netty</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/protocols-library/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-library/pom.xml b/server/protocols/protocols-library/pom.xml
index 434481c..d5b5ed2 100644
--- a/server/protocols/protocols-library/pom.xml
+++ b/server/protocols/protocols-library/pom.xml
@@ -34,16 +34,16 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<exclusions>
<exclusion>
@@ -53,7 +53,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
@@ -73,11 +73,11 @@
<artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-netty</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/protocols-lmtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-lmtp/pom.xml b/server/protocols/protocols-lmtp/pom.xml
index c4aa27d..a5eb7ad 100644
--- a/server/protocols/protocols-lmtp/pom.xml
+++ b/server/protocols/protocols-lmtp/pom.xml
@@ -34,43 +34,43 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-smtp</artifactId>
<exclusions>
<exclusion>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</exclusion>
<exclusion>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-library</artifactId>
</exclusion>
<exclusion>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</exclusion>
<exclusion>
@@ -100,19 +100,19 @@
<artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-lmtp</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-netty</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-smtp</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/protocols-managesieve/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-managesieve/pom.xml b/server/protocols/protocols-managesieve/pom.xml
index 6d07776..addcf5e 100644
--- a/server/protocols/protocols-managesieve/pom.xml
+++ b/server/protocols/protocols-managesieve/pom.xml
@@ -14,11 +14,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
@@ -42,15 +42,15 @@
<artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-managesieve</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-netty</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/protocols-pop3/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-pop3/pom.xml b/server/protocols/protocols-pop3/pom.xml
index 3e3c368..cf5c8f9 100644
--- a/server/protocols/protocols-pop3/pom.xml
+++ b/server/protocols/protocols-pop3/pom.xml
@@ -34,67 +34,67 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -130,21 +130,21 @@
<artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-netty</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-pop3</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/protocols-smtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml
index 5e20bd2..eec9266 100644
--- a/server/protocols/protocols-smtp/pom.xml
+++ b/server/protocols/protocols-smtp/pom.xml
@@ -39,108 +39,108 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
@@ -188,26 +188,26 @@
<artifactId>apache-jspf-resolver</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-netty</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-smtp</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-smtp</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/webadmin-integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/pom.xml
index b15a5e5..ae10057 100644
--- a/server/protocols/webadmin-integration-test/pom.xml
+++ b/server/protocols/webadmin-integration-test/pom.xml
@@ -34,59 +34,59 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-data</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-mailbox</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/webadmin/webadmin-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-cassandra/pom.xml b/server/protocols/webadmin/webadmin-cassandra/pom.xml
index 6f4aa90..8bb1a2e 100644
--- a/server/protocols/webadmin/webadmin-cassandra/pom.xml
+++ b/server/protocols/webadmin/webadmin-cassandra/pom.xml
@@ -34,21 +34,21 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/webadmin/webadmin-core/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml
index b72d499..99f8b14 100644
--- a/server/protocols/webadmin/webadmin-core/pom.xml
+++ b/server/protocols/webadmin/webadmin-core/pom.xml
@@ -34,28 +34,28 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jwt</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-task</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/webadmin/webadmin-data/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml
index 5b2b224..70a25a5 100644
--- a/server/protocols/webadmin/webadmin-data/pom.xml
+++ b/server/protocols/webadmin/webadmin-data/pom.xml
@@ -33,44 +33,44 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/webadmin/webadmin-mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml
index 7bd777b..c4ca76d 100644
--- a/server/protocols/webadmin/webadmin-mailbox/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml
@@ -34,89 +34,89 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-search</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-search</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-search-scanning</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-search-elasticsearch</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/webadmin/webadmin-mailqueue/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailqueue/pom.xml b/server/protocols/webadmin/webadmin-mailqueue/pom.xml
index c69f92a..f82f3d9 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailqueue/pom.xml
@@ -34,36 +34,36 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-task</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/webadmin/webadmin-mailrepository/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailrepository/pom.xml b/server/protocols/webadmin/webadmin-mailrepository/pom.xml
index b7d2030..c77b2f8 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailrepository/pom.xml
@@ -34,49 +34,49 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailrepository-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailrepository-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -86,7 +86,7 @@
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/protocols/webadmin/webadmin-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-swagger/pom.xml b/server/protocols/webadmin/webadmin-swagger/pom.xml
index 89dde51..99b6367 100644
--- a/server/protocols/webadmin/webadmin-swagger/pom.xml
+++ b/server/protocols/webadmin/webadmin-swagger/pom.xml
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/queue/queue-activemq/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-activemq/pom.xml b/server/queue/queue-activemq/pom.xml
index d5b2620..2fa6884 100644
--- a/server/queue/queue-activemq/pom.xml
+++ b/server/queue/queue-activemq/pom.xml
@@ -34,50 +34,50 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-jms</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-jms</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/queue/queue-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-api/pom.xml b/server/queue/queue-api/pom.xml
index 407dfdd..cfdc624 100644
--- a/server/queue/queue-api/pom.xml
+++ b/server/queue/queue-api/pom.xml
@@ -34,31 +34,31 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/queue/queue-file/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-file/pom.xml b/server/queue/queue-file/pom.xml
index 1c11a63..8bde705 100644
--- a/server/queue/queue-file/pom.xml
+++ b/server/queue/queue-file/pom.xml
@@ -34,46 +34,46 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/queue/queue-jms/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml
index cff1b06..92b9449 100644
--- a/server/queue/queue-jms/pom.xml
+++ b/server/queue/queue-jms/pom.xml
@@ -34,51 +34,51 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-smtp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
@@ -112,7 +112,7 @@
<artifactId>geronimo-annotation_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-smtp</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/queue/queue-memory/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-memory/pom.xml b/server/queue/queue-memory/pom.xml
index fab1b1e..8f71b92 100644
--- a/server/queue/queue-memory/pom.xml
+++ b/server/queue/queue-memory/pom.xml
@@ -15,32 +15,32 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/queue/queue-rabbitmq/pom.xml
----------------------------------------------------------------------
diff --git a/server/queue/queue-rabbitmq/pom.xml b/server/queue/queue-rabbitmq/pom.xml
index 032d40d..7ad50f8 100644
--- a/server/queue/queue-rabbitmq/pom.xml
+++ b/server/queue/queue-rabbitmq/pom.xml
@@ -34,12 +34,12 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/task/pom.xml
----------------------------------------------------------------------
diff --git a/server/task/pom.xml b/server/task/pom.xml
index 11ce1a8..10a0704 100644
--- a/server/task/pom.xml
+++ b/server/task/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/testing/pom.xml b/server/testing/pom.xml
index c3434d5..69d8f4f 100644
--- a/server/testing/pom.xml
+++ b/server/testing/pom.xml
@@ -32,16 +32,16 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[12/29] james-project git commit: JAMES-2487 Update org.jgrapht to
1.2.0
Posted by bt...@apache.org.
JAMES-2487 Update org.jgrapht to 1.2.0
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/65db2c41
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/65db2c41
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/65db2c41
Branch: refs/heads/master
Commit: 65db2c419dad0c66197bb848b04d1e8b23501fe7
Parents: 3ad12fc
Author: Gautier DI FOLCO <gd...@linagora.com>
Authored: Mon Jul 23 13:39:50 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:07 2018 +0700
----------------------------------------------------------------------
server/protocols/jmap/pom.xml | 2 +-
.../java/org/apache/james/jmap/utils/DependencyGraph.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/65db2c41/server/protocols/jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml
index eeb3252..716accc 100644
--- a/server/protocols/jmap/pom.xml
+++ b/server/protocols/jmap/pom.xml
@@ -275,7 +275,7 @@
<dependency>
<groupId>org.jgrapht</groupId>
<artifactId>jgrapht-core</artifactId>
- <version>0.9.1</version>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/65db2c41/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/DependencyGraph.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/DependencyGraph.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/DependencyGraph.java
index c9b2d2d..bbf0179 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/DependencyGraph.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/DependencyGraph.java
@@ -24,20 +24,20 @@ import java.util.function.Function;
import java.util.stream.Stream;
import org.apache.james.util.streams.Iterators;
-import org.jgrapht.alg.CycleDetector;
+import org.jgrapht.alg.cycle.CycleDetector;
import org.jgrapht.graph.DefaultDirectedGraph;
import org.jgrapht.graph.DefaultEdge;
-import org.jgrapht.graph.builder.DirectedGraphBuilder;
+import org.jgrapht.graph.builder.GraphBuilder;
import org.jgrapht.traverse.TopologicalOrderIterator;
public class DependencyGraph<T> {
- private final DirectedGraphBuilder<T, DefaultEdge, DefaultDirectedGraph<T, DefaultEdge>> builder;
+ private final GraphBuilder<T, DefaultEdge, DefaultDirectedGraph<T, DefaultEdge>> builder;
private final Function<T, Optional<T>> getParent;
public DependencyGraph(Function<T, Optional<T>> getParent) {
this.getParent = getParent;
- this.builder = new DirectedGraphBuilder<>(new DefaultDirectedGraph<>(DefaultEdge.class));
+ this.builder = new GraphBuilder<>(new DefaultDirectedGraph<>(DefaultEdge.class));
}
public void registerItem(T item) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[28/29] james-project git commit: JAMES-2469 Removing unecessary
awaits
Posted by bt...@apache.org.
JAMES-2469 Removing unecessary awaits
It brings down CassandraMessageMethodTest execution time from 3min28 down to 3min17
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c84f10fb
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c84f10fb
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c84f10fb
Branch: refs/heads/master
Commit: c84f10fb8408e6ef96995246092dcfe0db074f59
Parents: 9b8e48a
Author: benwa <bt...@linagora.com>
Authored: Sat Jul 14 14:34:23 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:49 2018 +0700
----------------------------------------------------------------------
.../james/jmap/methods/integration/GetVacationResponseTest.java | 2 --
.../james/jmap/methods/integration/SetMailboxesMethodTest.java | 2 --
.../james/jmap/methods/integration/SetMessagesMethodTest.java | 2 --
.../james/jmap/methods/integration/SetVacationResponseTest.java | 2 --
4 files changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/c84f10fb/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
index 86a2859..2311acb 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
@@ -83,8 +83,6 @@ public abstract class GetVacationResponseTest {
dataProbe.addDomain(DOMAIN);
dataProbe.addUser(ALICE, ALICE_PASSWORD);
accessToken = authenticateJamesUser(baseUri(jmapServer), ALICE, ALICE_PASSWORD);
-
- await();
}
@After
http://git-wip-us.apache.org/repos/asf/james-project/blob/c84f10fb/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
index c0ce1e7..c1eaf4e 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
@@ -106,8 +106,6 @@ public abstract class SetMailboxesMethodTest {
dataProbe.addUser(username, password);
inboxId = mailboxProbe.createMailbox("#private", username, DefaultMailboxes.INBOX);
accessToken = authenticateJamesUser(baseUri(jmapServer), username, password);
-
- await();
}
@After
http://git-wip-us.apache.org/repos/asf/james-project/blob/c84f10fb/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
index faf69fd..67aa33c 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
@@ -175,8 +175,6 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox("#private", USERNAME, DefaultMailboxes.INBOX);
accessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), USERNAME, PASSWORD);
bobAccessToken = HttpJmapAuthentication.authenticateJamesUser(baseUri(jmapServer), BOB, BOB_PASSWORD);
-
- await();
}
@After
http://git-wip-us.apache.org/repos/asf/james-project/blob/c84f10fb/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
index 46f5067..352ee30 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
@@ -76,8 +76,6 @@ public abstract class SetVacationResponseTest {
.addDomain(DOMAIN)
.addUser(USER, PASSWORD);
accessToken = authenticateJamesUser(baseUri(jmapServer), USER, PASSWORD);
-
- await();
}
@After
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[25/29] james-project git commit: JAMES-2469 Remove custom header
setting from configuration
Posted by bt...@apache.org.
JAMES-2469 Remove custom header setting from configuration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f46313de
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f46313de
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f46313de
Branch: refs/heads/master
Commit: f46313dee5e7a3eea2aca2a419aaaedb9f323942
Parents: faf21d9
Author: benwa <bt...@linagora.com>
Authored: Tue Jul 17 10:43:19 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:49 2018 +0700
----------------------------------------------------------------------
.../destination/conf/mailetcontainer.xml | 10 ----------
.../destination/conf/mailetcontainer.xml | 11 +----------
.../jpa/destination/conf/mailetcontainer.xml | 10 ----------
.../spring/destination/conf/mailetcontainer.xml | 10 ----------
.../src/test/resources/mailetcontainer.xml | 5 -----
.../src/test/resources/mailetcontainer.xml | 4 ----
.../src/test/resources/mailetcontainer.xml | 5 +----
.../src/test/resources/mailetcontainer.xml | 4 ----
.../sample-configuration/mailetcontainer.xml | 8 --------
.../src/test/resources/mailetcontainer.xml | 18 ------------------
.../sample-configuration/mailetcontainer.xml | 8 --------
.../src/test/resources/mailetcontainer.xml | 18 ------------------
.../sample-configuration/mailetcontainer.xml | 8 --------
.../src/test/resources/mailetcontainer.xml | 4 ----
.../src/test/resources/mailetcontainer.xml | 4 ----
.../src/test/resources/mailetcontainer.xml | 4 ----
16 files changed, 2 insertions(+), 129 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
index d00a4a5..3839b39 100644
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
@@ -56,16 +56,6 @@
<matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
</matcher>
- <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
- <name>X-UserIsAuth</name>
- <value>true</value>
- <onMailetException>ignore</onMailetException>
- </mailet>
- <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader">
- <name>X-WasSigned</name>
- <value>true</value>
- <onMailetException>ignore</onMailetException>
- </mailet>
<mailet match="All" class="RemoveMimeHeader">
<name>bcc</name>
<onMailetException>ignore</onMailetException>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
index 8a154e9..3839b39 100644
--- a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
@@ -55,16 +55,7 @@
<matcher match="SentByMailet"/>
<matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
</matcher>
- <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
- <name>X-UserIsAuth</name>
- <value>true</value>
- <onMailetException>ignore</onMailetException>
- </mailet>
- <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader">
- <name>X-WasSigned</name>
- <value>true</value>
- <onMailetException>ignore</onMailetException>
- </mailet>
+
<mailet match="All" class="RemoveMimeHeader">
<name>bcc</name>
<onMailetException>ignore</onMailetException>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
index e7df363..642bea4 100644
--- a/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
@@ -55,16 +55,6 @@
<matcher match="SentByMailet"/>
</matcher>
- <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
- <name>X-UserIsAuth</name>
- <value>true</value>
- <onMailetException>ignore</onMailetException>
- </mailet>
- <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader">
- <name>X-WasSigned</name>
- <value>true</value>
- <onMailetException>ignore</onMailetException>
- </mailet>
<mailet match="All" class="RemoveMimeHeader">
<name>bcc</name>
<onMailetException>ignore</onMailetException>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/spring/destination/conf/mailetcontainer.xml b/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
index d1f51c1..3209409 100644
--- a/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
@@ -55,16 +55,6 @@
<matcher match="SentByMailet"/>
</matcher>
- <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
- <name>X-UserIsAuth</name>
- <value>true</value>
- <onMailetException>ignore</onMailetException>
- </mailet>
- <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader">
- <name>X-WasSigned</name>
- <value>true</value>
- <onMailetException>ignore</onMailetException>
- </mailet>
<mailet match="All" class="RemoveMimeHeader">
<name>bcc</name>
<onMailetException>ignore</onMailetException>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml b/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
index 1a86820..d854443 100644
--- a/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
+++ b/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
@@ -47,12 +47,7 @@
</mailet>
</processor>
-
<processor state="transport" enableJmx="true">
- <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
- <name>X-UserIsAuth</name>
- <value>true</value>
- </mailet>
<mailet match="All" class="RemoveMimeHeader">
<name>bcc</name>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/container/cli-integration/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/cli-integration/src/test/resources/mailetcontainer.xml b/server/container/cli-integration/src/test/resources/mailetcontainer.xml
index 417b9e4..f14a335 100644
--- a/server/container/cli-integration/src/test/resources/mailetcontainer.xml
+++ b/server/container/cli-integration/src/test/resources/mailetcontainer.xml
@@ -53,10 +53,6 @@
<matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
</matcher>
- <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
- <name>X-UserIsAuth</name>
- <value>true</value>
- </mailet>
<mailet match="All" class="RemoveMimeHeader">
<name>bcc</name>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
index 298fd52..4a7d1e8 100644
--- a/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
+++ b/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
@@ -53,10 +53,7 @@
<matcher match="SentByMailet"/>
<matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
</matcher>
- <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
- <name>X-UserIsAuth</name>
- <value>true</value>
- </mailet>
+
<mailet match="All" class="RemoveMimeHeader">
<name>bcc</name>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml
index f68b1a2..4204c18 100644
--- a/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml
+++ b/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml
@@ -52,10 +52,6 @@
<matcher match="SentByMailet"/>
</matcher>
- <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
- <name>X-UserIsAuth</name>
- <value>true</value>
- </mailet>
<mailet match="All" class="RemoveMimeHeader">
<name>bcc</name>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml b/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml
index d3a81be..de035fb 100644
--- a/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml
+++ b/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml
@@ -53,14 +53,6 @@
<matcher match="SentByMailet"/>
</matcher>
- <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
- <name>X-UserIsAuth</name>
- <value>true</value>
- </mailet>
- <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader">
- <name>X-WasSigned</name>
- <value>true</value>
- </mailet>
<mailet match="All" class="RecipientRewriteTable" />
<mailet match="RecipientIsLocal" class="LocalDelivery"/>
<mailet match="HostIsLocal" class="ToProcessor">
http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/container/guice/jpa-smtp-mariadb/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp-mariadb/src/test/resources/mailetcontainer.xml b/server/container/guice/jpa-smtp-mariadb/src/test/resources/mailetcontainer.xml
index d0cfea7..dedb391 100644
--- a/server/container/guice/jpa-smtp-mariadb/src/test/resources/mailetcontainer.xml
+++ b/server/container/guice/jpa-smtp-mariadb/src/test/resources/mailetcontainer.xml
@@ -53,27 +53,12 @@
<processor state="transport" enableJmx="true">
- <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
- <name>X-UserIsAuth</name>
- <value>true</value>
- </mailet>
- <mailet match="All" class="RemoveMimeHeader">
- <name>bcc</name>
- </mailet>
- <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader">
- <name>X-WasSigned</name>
- <value>true</value>
- </mailet>
<mailet match="All" class="RemoveMimeHeader">
<name>bcc</name>
</mailet>
<mailet match="All" class="RecipientRewriteTable">
<errorProcessor>rrt-error</errorProcessor>
</mailet>
- <!-- <mailet match="HostIsLocal" class="ToProcessor">
- <processor>local-address-error</processor>
- <notice>550 - Requested action not taken: no such user here</notice>
- </mailet> -->
<mailet match="All" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5 minutes</delayTime>
@@ -88,9 +73,6 @@
<sendpartial>false</sendpartial>
<bounceProcessor>bounces</bounceProcessor>
</mailet>
- <!-- mailet match="All" class="ToProcessor">
- <processor>relay-denied</processor>
- </mailet-->
</processor>
<processor state="local-address-error" enableJmx="true">
http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml b/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml
index d3a81be..de035fb 100644
--- a/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml
+++ b/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml
@@ -53,14 +53,6 @@
<matcher match="SentByMailet"/>
</matcher>
- <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
- <name>X-UserIsAuth</name>
- <value>true</value>
- </mailet>
- <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader">
- <name>X-WasSigned</name>
- <value>true</value>
- </mailet>
<mailet match="All" class="RecipientRewriteTable" />
<mailet match="RecipientIsLocal" class="LocalDelivery"/>
<mailet match="HostIsLocal" class="ToProcessor">
http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/container/guice/jpa-smtp/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/src/test/resources/mailetcontainer.xml b/server/container/guice/jpa-smtp/src/test/resources/mailetcontainer.xml
index d0cfea7..dedb391 100644
--- a/server/container/guice/jpa-smtp/src/test/resources/mailetcontainer.xml
+++ b/server/container/guice/jpa-smtp/src/test/resources/mailetcontainer.xml
@@ -53,27 +53,12 @@
<processor state="transport" enableJmx="true">
- <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
- <name>X-UserIsAuth</name>
- <value>true</value>
- </mailet>
- <mailet match="All" class="RemoveMimeHeader">
- <name>bcc</name>
- </mailet>
- <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader">
- <name>X-WasSigned</name>
- <value>true</value>
- </mailet>
<mailet match="All" class="RemoveMimeHeader">
<name>bcc</name>
</mailet>
<mailet match="All" class="RecipientRewriteTable">
<errorProcessor>rrt-error</errorProcessor>
</mailet>
- <!-- <mailet match="HostIsLocal" class="ToProcessor">
- <processor>local-address-error</processor>
- <notice>550 - Requested action not taken: no such user here</notice>
- </mailet> -->
<mailet match="All" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5 minutes</delayTime>
@@ -88,9 +73,6 @@
<sendpartial>false</sendpartial>
<bounceProcessor>bounces</bounceProcessor>
</mailet>
- <!-- mailet match="All" class="ToProcessor">
- <processor>relay-denied</processor>
- </mailet-->
</processor>
<processor state="local-address-error" enableJmx="true">
http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
index ae32aa6..a910f1b 100644
--- a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
+++ b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
@@ -53,14 +53,6 @@
<matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
</matcher>
- <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
- <name>X-UserIsAuth</name>
- <value>true</value>
- </mailet>
- <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader">
- <name>X-WasSigned</name>
- <value>true</value>
- </mailet>
<mailet match="All" class="RemoveMimeHeader">
<name>bcc</name>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
index 6aef809..2bb4a95 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
@@ -54,10 +54,6 @@
<matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
</matcher>
- <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
- <name>X-UserIsAuth</name>
- <value>true</value>
- </mailet>
<mailet match="All" class="RemoveMimeHeader">
<name>bcc</name>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
index 5cdc6b5..2eacd5c 100644
--- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
@@ -55,10 +55,6 @@
<matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
</matcher>
- <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
- <name>X-UserIsAuth</name>
- <value>true</value>
- </mailet>
<mailet match="All" class="RemoveMimeHeader">
<name>bcc</name>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/f46313de/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml b/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml
index a16cf3c..f24fd9c 100644
--- a/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml
+++ b/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml
@@ -54,10 +54,6 @@
<matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
</matcher>
- <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
- <name>X-UserIsAuth</name>
- <value>true</value>
- </mailet>
<mailet match="All" class="RemoveMimeHeader">
<name>bcc</name>
</mailet>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[14/29] james-project git commit: JAMES-2488 update netflix curator
Posted by bt...@apache.org.
JAMES-2488 update netflix curator
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/bbfc3dcb
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/bbfc3dcb
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/bbfc3dcb
Branch: refs/heads/master
Commit: bbfc3dcb436d24f3b3418da140e4c6a95be4f57c
Parents: fedf0a2
Author: duc <dt...@linagora.com>
Authored: Fri Jul 20 15:48:42 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:07 2018 +0700
----------------------------------------------------------------------
mailbox/zoo-seq-provider/pom.xml | 10 +-
.../mailbox/store/mail/ZooUidProvider.java | 16 ++-
.../mailbox/store/mail/ZooUidProviderTest.java | 139 +++++++++----------
3 files changed, 83 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/bbfc3dcb/mailbox/zoo-seq-provider/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/zoo-seq-provider/pom.xml b/mailbox/zoo-seq-provider/pom.xml
index a253b27..1f269ce 100644
--- a/mailbox/zoo-seq-provider/pom.xml
+++ b/mailbox/zoo-seq-provider/pom.xml
@@ -33,7 +33,7 @@
<description>High performance distribuited sequence provider based on ZooKeepr</description>
<properties>
- <curator.version>1.3.2</curator.version>
+ <curator.version>4.0.1</curator.version>
</properties>
<dependencies>
@@ -55,22 +55,22 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>com.netflix.curator</groupId>
+ <groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
<version>${curator.version}</version>
</dependency>
<dependency>
- <groupId>com.netflix.curator</groupId>
+ <groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>${curator.version}</version>
</dependency>
<dependency>
- <groupId>com.netflix.curator</groupId>
+ <groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
<version>${curator.version}</version>
</dependency>
<dependency>
- <groupId>com.netflix.curator</groupId>
+ <groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
<version>${curator.version}</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/bbfc3dcb/mailbox/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java
----------------------------------------------------------------------
diff --git a/mailbox/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java b/mailbox/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java
index 391fe8c..5274f60 100644
--- a/mailbox/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java
+++ b/mailbox/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java
@@ -21,6 +21,12 @@ package org.apache.james.mailbox.store.mail;
import java.util.Optional;
import org.apache.commons.lang3.NotImplementedException;
+import org.apache.curator.RetryPolicy;
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.imps.CuratorFrameworkState;
+import org.apache.curator.framework.recipes.atomic.AtomicValue;
+import org.apache.curator.framework.recipes.atomic.DistributedAtomicLong;
+import org.apache.curator.retry.RetryOneTime;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.exception.MailboxException;
@@ -28,12 +34,6 @@ import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.store.mail.model.Mailbox;
import com.google.common.base.Preconditions;
-import com.netflix.curator.RetryPolicy;
-import com.netflix.curator.framework.CuratorFramework;
-import com.netflix.curator.framework.imps.CuratorFrameworkState;
-import com.netflix.curator.framework.recipes.atomic.AtomicValue;
-import com.netflix.curator.framework.recipes.atomic.DistributedAtomicLong;
-import com.netflix.curator.retry.RetryOneTime;
/**
* ZooKeeper based implementation of a distributed sequential UID generator.
@@ -42,6 +42,8 @@ public class ZooUidProvider implements UidProvider {
// TODO: use ZK paths to store uid and modSeq, etc.
public static final String UID_PATH_SUFFIX = "-uid";
+ public static final String PATH_PREFIX = "/";
+
private final CuratorFramework client;
private final RetryPolicy retryPolicy;
@@ -99,6 +101,6 @@ public class ZooUidProvider implements UidProvider {
}
public static <E extends MailboxId> String pathForMailbox(Mailbox mailbox) {
- return mailbox.getMailboxId().serialize() + UID_PATH_SUFFIX;
+ return PATH_PREFIX + mailbox.getMailboxId().serialize() + UID_PATH_SUFFIX;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/bbfc3dcb/mailbox/zoo-seq-provider/src/test/java/org/apache/james/mailbox/store/mail/ZooUidProviderTest.java
----------------------------------------------------------------------
diff --git a/mailbox/zoo-seq-provider/src/test/java/org/apache/james/mailbox/store/mail/ZooUidProviderTest.java b/mailbox/zoo-seq-provider/src/test/java/org/apache/james/mailbox/store/mail/ZooUidProviderTest.java
index c318807..cabd90b 100644
--- a/mailbox/zoo-seq-provider/src/test/java/org/apache/james/mailbox/store/mail/ZooUidProviderTest.java
+++ b/mailbox/zoo-seq-provider/src/test/java/org/apache/james/mailbox/store/mail/ZooUidProviderTest.java
@@ -24,6 +24,11 @@ import java.io.Serializable;
import java.util.Optional;
import java.util.UUID;
+import org.apache.curator.RetryPolicy;
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.curator.retry.RetryOneTime;
+import org.apache.curator.test.TestingServer;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
@@ -32,11 +37,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.netflix.curator.RetryPolicy;
-import com.netflix.curator.framework.CuratorFramework;
-import com.netflix.curator.framework.CuratorFrameworkFactory;
-import com.netflix.curator.retry.RetryOneTime;
-import com.netflix.curator.test.TestingServer;
/**
* Test for UID provider.
@@ -137,73 +137,72 @@ public class ZooUidProviderTest {
}
+ private static TestingServer testServer;
+ private static final int ZOO_TEST_PORT = 3123;
+ private final RetryPolicy retryPolicy = new RetryOneTime(1);
+ private CuratorFramework client;
+ private ZooUidProvider uuidProvider;
+ private ZooUidProvider longProvider;
+ private SimpleMailbox mailboxUUID;
+ private SimpleMailbox mailboxLong;
+ private UUID randomUUID = UUID.randomUUID();
+
+ @Before
+ public void setUp() throws Exception {
+ testServer = new TestingServer(ZOO_TEST_PORT);
+ client = CuratorFrameworkFactory.builder().connectString("localhost:" + ZOO_TEST_PORT)
+ .retryPolicy(retryPolicy)
+ .namespace("JAMES").build();
+ client.start();
+ uuidProvider = new ZooUidProvider(client, retryPolicy);
+ longProvider = new ZooUidProvider(client, retryPolicy);
+ MailboxPath path1 = new MailboxPath("namespacetest", "namespaceuser", "UUID");
+ MailboxPath path2 = new MailboxPath("namespacetest", "namespaceuser", "Long");
+ mailboxUUID = new SimpleMailbox(path1, 1L);
+ mailboxUUID.setMailboxId(UUIDId.of(randomUUID));
+ mailboxLong = new SimpleMailbox(path2, 2L);
+ mailboxLong.setMailboxId(new LongId(123L));
+ }
- private static TestingServer testServer;
- private static final int ZOO_TEST_PORT = 3123;
- private final RetryPolicy retryPolicy = new RetryOneTime(1);
- private CuratorFramework client;
- private ZooUidProvider uuidProvider;
- private ZooUidProvider longProvider;
- private SimpleMailbox mailboxUUID;
- private SimpleMailbox mailboxLong;
- private UUID randomUUID = UUID.randomUUID();
-
- @Before
- public void setUp() throws Exception {
- testServer = new TestingServer(ZOO_TEST_PORT);
- client = CuratorFrameworkFactory.builder().connectString("localhost:" + ZOO_TEST_PORT)
- .retryPolicy(retryPolicy)
- .namespace("JAMES").build();
- client.start();
- uuidProvider = new ZooUidProvider(client, retryPolicy);
- longProvider = new ZooUidProvider(client, retryPolicy);
- MailboxPath path1 = new MailboxPath("namespacetest", "namespaceuser", "UUID");
- MailboxPath path2 = new MailboxPath("namespacetest", "namespaceuser", "Long");
- mailboxUUID = new SimpleMailbox(path1, 1L);
- mailboxUUID.setMailboxId(UUIDId.of(randomUUID));
- mailboxLong = new SimpleMailbox(path2, 2L);
- mailboxLong.setMailboxId(new LongId(123L));
- }
-
- @After
- public void tearDown() throws Exception {
- client.close();
- testServer.close();
- }
+ @After
+ public void tearDown() throws Exception {
+ client.close();
+ testServer.close();
+ }
- /**
- * Test of nextUid method, of class ZooUidProvider.
- */
- @Test
- public void testNextUid() throws Exception {
- System.out.println("Testing nextUid");
- MessageUid result = uuidProvider.nextUid(null, mailboxUUID);
- assertEquals("Next UID is 1", 1, result.asLong());
- result = longProvider.nextUid(null, mailboxLong);
- assertEquals("Next UID is 1", 1, result.asLong());
- }
+ /**
+ * Test of nextUid method, of class ZooUidProvider.
+ */
+ @Test
+ public void testNextUid() throws Exception {
+ System.out.println("Testing nextUid");
+ MessageUid result = uuidProvider.nextUid(null, mailboxUUID);
+ assertEquals("Next UID is 1", 1, result.asLong());
+ result = longProvider.nextUid(null, mailboxLong);
+ assertEquals("Next UID is 1", 1, result.asLong());
+ }
- /**
- * Test of lastUid method, of class ZooUidProvider.
- */
- @Test
- public void testLastUid() throws Exception {
- System.out.println("Testing lastUid");
- Optional<MessageUid> result = uuidProvider.lastUid(null, mailboxUUID);
- assertEquals("Next UID is empty", Optional.empty(), result);
- MessageUid nextResult = uuidProvider.nextUid(null, mailboxUUID);
- assertEquals("Next UID is 1", 1, nextResult.asLong());
- }
+ /**
+ * Test of lastUid method, of class ZooUidProvider.
+ */
+ @Test
+ public void testLastUid() throws Exception {
+ System.out.println("Testing lastUid");
+ Optional<MessageUid> result = uuidProvider.lastUid(null, mailboxUUID);
+ assertEquals("Next UID is empty", Optional.empty(), result);
+ MessageUid nextResult = uuidProvider.nextUid(null, mailboxUUID);
+ assertEquals("Next UID is 1", 1, nextResult.asLong());
+ }
- /**
- * Test of lastUid method, of class ZooUidProvider.
- */
- @Test
- public void testLongLastUid() throws Exception {
- System.out.println("Testing long lastUid");
- Optional<MessageUid> result = longProvider.lastUid(null, mailboxLong);
- assertEquals("Next UID is empty", Optional.empty(), result);
- MessageUid nextResult = longProvider.nextUid(null, mailboxLong);
- assertEquals("Next UID is 1", 1, nextResult.asLong());
- }
+ /**
+ * Test of lastUid method, of class ZooUidProvider.
+ */
+ @Test
+ public void testLongLastUid() throws Exception {
+ System.out.println("Testing long lastUid");
+ Optional<MessageUid> result = longProvider.lastUid(null, mailboxLong);
+ assertEquals("Next UID is empty", Optional.empty(), result);
+ MessageUid nextResult = longProvider.nextUid(null, mailboxLong);
+ assertEquals("Next UID is 1", 1, nextResult.asLong());
}
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[29/29] james-project git commit: JAMES-2469 relay-allowed composite
matcher
Posted by bt...@apache.org.
JAMES-2469 relay-allowed composite matcher
This is more elegant, and less verbose than duplicated mailet pairs. Moreover,
it comes up with a boot performance improvement.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/aaf12995
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/aaf12995
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/aaf12995
Branch: refs/heads/master
Commit: aaf12995828d905310efe4e16f3cb9686fca9999
Parents: c84f10f
Author: benwa <bt...@linagora.com>
Authored: Tue Jul 17 10:24:07 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:49 2018 +0700
----------------------------------------------------------------------
.../destination/conf/mailetcontainer.xml | 18 +++++++---------
.../destination/conf/mailetcontainer.xml | 20 +++++++-----------
.../jpa/destination/conf/mailetcontainer.xml | 18 +++++++---------
.../spring/destination/conf/mailetcontainer.xml | 17 +++++++--------
.../src/test/resources/mailetcontainer.xml | 19 ++++++++---------
.../src/test/resources/mailetcontainer.xml | 8 ++++++-
.../src/test/resources/mailetcontainer.xml | 8 ++++++-
.../src/test/resources/mailetcontainer.xml | 14 ++++++-------
.../sample-configuration/mailetcontainer.xml | 15 ++++++-------
.../sample-configuration/mailetcontainer.xml | 15 ++++++-------
.../sample-configuration/mailetcontainer.xml | 18 +++++++---------
.../src/test/resources/mailetcontainer.xml | 22 ++++++++------------
.../src/test/resources/mailetcontainer.xml | 19 ++++++++---------
.../src/test/resources/mailetcontainer.xml | 16 +++++++-------
14 files changed, 110 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/aaf12995/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
index 4034ed7..353dea9 100644
--- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/mailetcontainer.xml
@@ -49,6 +49,13 @@
</processor>
<processor state="transport" enableJmx="true">
+ <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
+ <matcher match="SMTPAuthSuccessful"/>
+ <matcher match="SMTPIsAuthNetwork"/>
+ <matcher match="SentByMailet"/>
+ <matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
+ </matcher>
+
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
<value>true</value>
@@ -75,16 +82,7 @@
<notice>550 - Requested action not taken: no such user here</notice>
</mailet>
- <mailet match="SMTPAuthSuccessful" class="ToProcessor">
- <processor>relay</processor>
- </mailet>
- <mailet match="SMTPIsAuthNetwork" class="ToProcessor">
- <processor>relay</processor>
- </mailet>
- <mailet match="org.apache.james.jmap.mailet.SentByJmap" class="ToProcessor">
- <processor>relay</processor>
- </mailet>
- <mailet match="SentByMailet" class="ToProcessor">
+ <mailet match="relay-allowed" class="ToProcessor">
<processor>relay</processor>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/aaf12995/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
index 55b0950..a8de354 100644
--- a/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/cassandra/destination/conf/mailetcontainer.xml
@@ -49,6 +49,12 @@
</processor>
<processor state="transport" enableJmx="true">
+ <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
+ <matcher match="SMTPAuthSuccessful"/>
+ <matcher match="SMTPIsAuthNetwork"/>
+ <matcher match="SentByMailet"/>
+ <matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
+ </matcher>
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
<value>true</value>
@@ -75,19 +81,7 @@
<notice>550 - Requested action not taken: no such user here</notice>
</mailet>
- <mailet match="SMTPAuthSuccessful" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="SMTPIsAuthNetwork" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="SentByMailet" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="org.apache.james.jmap.mailet.SentByJmap" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="HasMailAttribute=RelayAllowed" class="ToProcessor">
+ <mailet match="relay-allowed" class="ToProcessor">
<processor>relay</processor>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/aaf12995/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml b/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
index 88bf3c9..27bbd4b 100644
--- a/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/guice/jpa/destination/conf/mailetcontainer.xml
@@ -49,6 +49,12 @@
</processor>
<processor state="transport" enableJmx="true">
+ <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
+ <matcher match="SMTPAuthSuccessful"/>
+ <matcher match="SMTPIsAuthNetwork"/>
+ <matcher match="SentByMailet"/>
+ </matcher>
+
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
<value>true</value>
@@ -74,19 +80,9 @@
<notice>550 - Requested action not taken: no such user here</notice>
</mailet>
- <mailet match="SMTPAuthSuccessful" class="ToProcessor">
- <processor>relay</processor>
- </mailet>
- <mailet match="SMTPIsAuthNetwork" class="ToProcessor">
- <processor>relay</processor>
- </mailet>
- <mailet match="SentByMailet" class="ToProcessor">
+ <mailet match="relay-allowed" class="ToProcessor">
<processor>relay</processor>
</mailet>
-
- <mailet match="All" class="ToProcessor">
- <processor>relay-denied</processor>
- </mailet>
</processor>
<processor state="relay" enableJmx="true">
http://git-wip-us.apache.org/repos/asf/james-project/blob/aaf12995/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/spring/destination/conf/mailetcontainer.xml b/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
index d978697..9e404be 100644
--- a/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
+++ b/dockerfiles/run/spring/destination/conf/mailetcontainer.xml
@@ -49,6 +49,12 @@
</processor>
<processor state="transport" enableJmx="true">
+ <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
+ <matcher match="SMTPAuthSuccessful"/>
+ <matcher match="SMTPIsAuthNetwork"/>
+ <matcher match="SentByMailet"/>
+ </matcher>
+
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
<value>true</value>
@@ -74,16 +80,7 @@
<notice>550 - Requested action not taken: no such user here</notice>
</mailet>
- <mailet match="SMTPAuthSuccessful" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="SMTPIsAuthNetwork" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="SentByMailet" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="HasMailAttribute=RelayAllowed" class="ToProcessor">
+ <mailet match="relay-allowed" class="ToProcessor">
<processor>relay</processor>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/aaf12995/server/container/cli-integration/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/cli-integration/src/test/resources/mailetcontainer.xml b/server/container/cli-integration/src/test/resources/mailetcontainer.xml
index a842eee..fce9722 100644
--- a/server/container/cli-integration/src/test/resources/mailetcontainer.xml
+++ b/server/container/cli-integration/src/test/resources/mailetcontainer.xml
@@ -46,6 +46,13 @@
<processor state="transport" enableJmx="false">
+ <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
+ <matcher match="SMTPAuthSuccessful"/>
+ <matcher match="SMTPIsAuthNetwork"/>
+ <matcher match="SentByMailet"/>
+ <matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
+ </matcher>
+
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
<value>true</value>
@@ -60,16 +67,8 @@
<processor>local-address-error</processor>
<notice>550 - Requested action not taken: no such user here</notice>
</mailet>
- <mailet match="SMTPAuthSuccessful" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="SentByMailet" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="org.apache.james.jmap.mailet.SentByJmap" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="HasMailAttribute=RelayAllowed" class="RemoteDelivery">
+
+ <mailet match="relay-allowed" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>25</maxRetries>
http://git-wip-us.apache.org/repos/asf/james-project/blob/aaf12995/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml
index 77dd9ec..7605951 100644
--- a/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml
+++ b/server/container/guice/cassandra-guice/src/test/resources/mailetcontainer.xml
@@ -47,6 +47,12 @@
<processor state="transport" enableJmx="false">
+ <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
+ <matcher match="SMTPAuthSuccessful"/>
+ <matcher match="SMTPIsAuthNetwork"/>
+ <matcher match="SentByMailet"/>
+ <matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
+ </matcher>
<mailet match="SenderIs=denied@other.com" class="ToProcessor">
<processor>sender-denied</processor>
</mailet>
@@ -73,7 +79,7 @@
<processor>local-address-error</processor>
<notice>550 - Requested action not taken: no such user here</notice>
</mailet>
- <mailet match="SMTPAuthSuccessful" class="RemoteDelivery">
+ <mailet match="relay-allowed" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>25</maxRetries>
http://git-wip-us.apache.org/repos/asf/james-project/blob/aaf12995/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
index b265f93..2c8ea18 100644
--- a/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
+++ b/server/container/guice/cassandra-ldap-guice/src/test/resources/mailetcontainer.xml
@@ -47,6 +47,12 @@
<processor state="transport" enableJmx="false">
+ <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
+ <matcher match="SMTPAuthSuccessful"/>
+ <matcher match="SMTPIsAuthNetwork"/>
+ <matcher match="SentByMailet"/>
+ <matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
+ </matcher>
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
<value>true</value>
@@ -61,7 +67,7 @@
<processor>local-address-error</processor>
<notice>550 - Requested action not taken: no such user here</notice>
</mailet>
- <mailet match="SMTPAuthSuccessful" class="RemoteDelivery">
+ <mailet match="relay-allowed" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>25</maxRetries>
http://git-wip-us.apache.org/repos/asf/james-project/blob/aaf12995/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml b/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml
index 8bc27f8..cdf3ef8 100644
--- a/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml
+++ b/server/container/guice/jpa-guice/src/test/resources/mailetcontainer.xml
@@ -47,6 +47,11 @@
<processor state="transport" enableJmx="false">
+ <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
+ <matcher match="SMTPAuthSuccessful"/>
+ <matcher match="SentByMailet"/>
+ </matcher>
+
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
<value>true</value>
@@ -62,13 +67,8 @@
<processor>local-address-error</processor>
<notice>550 - Requested action not taken: no such user here</notice>
</mailet>
- <mailet match="SMTPAuthSuccessful" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="SentByMailet" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="HasMailAttribute=RelayAllowed" class="RemoteDelivery">
+
+ <mailet match="relay-allowed" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>25</maxRetries>
http://git-wip-us.apache.org/repos/asf/james-project/blob/aaf12995/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml b/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml
index 909c5db..8ad6c2c 100644
--- a/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml
+++ b/server/container/guice/jpa-smtp-mariadb/sample-configuration/mailetcontainer.xml
@@ -72,6 +72,12 @@
<processor state="transport" enableJmx="true">
+ <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
+ <matcher match="SMTPAuthSuccessful"/>
+ <matcher match="SMTPIsAuthNetwork"/>
+ <matcher match="SentByMailet"/>
+ </matcher>
+
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
<value>true</value>
@@ -86,13 +92,8 @@
<processor>local-address-error</processor>
<notice>550 - Requested action not taken: no such user here</notice>
</mailet>
- <mailet match="SMTPAuthSuccessful" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="SentByMailet" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="HasMailAttribute=RelayAllowed" class="RemoteDelivery">
+
+ <mailet match="relay-allowed" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>25</maxRetries>
http://git-wip-us.apache.org/repos/asf/james-project/blob/aaf12995/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml b/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml
index 909c5db..8ad6c2c 100644
--- a/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml
+++ b/server/container/guice/jpa-smtp/sample-configuration/mailetcontainer.xml
@@ -72,6 +72,12 @@
<processor state="transport" enableJmx="true">
+ <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
+ <matcher match="SMTPAuthSuccessful"/>
+ <matcher match="SMTPIsAuthNetwork"/>
+ <matcher match="SentByMailet"/>
+ </matcher>
+
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
<value>true</value>
@@ -86,13 +92,8 @@
<processor>local-address-error</processor>
<notice>550 - Requested action not taken: no such user here</notice>
</mailet>
- <mailet match="SMTPAuthSuccessful" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="SentByMailet" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="HasMailAttribute=RelayAllowed" class="RemoteDelivery">
+
+ <mailet match="relay-allowed" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>25</maxRetries>
http://git-wip-us.apache.org/repos/asf/james-project/blob/aaf12995/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
index 40509a8..efeca5d 100644
--- a/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
+++ b/server/container/guice/memory-guice/sample-configuration/mailetcontainer.xml
@@ -46,13 +46,17 @@
</processor>
<processor state="transport" enableJmx="true">
+ <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
+ <matcher match="SMTPAuthSuccessful"/>
+ <matcher match="SMTPIsAuthNetwork"/>
+ <matcher match="SentByMailet"/>
+ <matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
+ </matcher>
+
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
<value>true</value>
</mailet>
- <mailet match="org.apache.james.jmap.mailet.SentByJmap" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
<mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader">
<name>X-WasSigned</name>
<value>true</value>
@@ -65,13 +69,7 @@
<mailet match="RecipientIsLocal" class="Sieve"/>
<mailet match="RecipientIsLocal" class="LocalDelivery"/>
- <mailet match="SMTPAuthSuccessful" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="SentByMailet" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="HasMailAttribute=RelayAllowed" class="RemoteDelivery">
+ <mailet match="relay-allowed" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>25</maxRetries>
http://git-wip-us.apache.org/repos/asf/james-project/blob/aaf12995/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
index 914b1a7..aae7b8b 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
@@ -47,6 +47,12 @@
<matcher match="HasMimeType=multipart/report"/>
<matcher match="HasMimeTypeParameter=report-type=disposition-notification"/>
</matcher>
+ <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
+ <matcher match="SMTPAuthSuccessful"/>
+ <matcher match="SMTPIsAuthNetwork"/>
+ <matcher match="SentByMailet"/>
+ <matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
+ </matcher>
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
@@ -75,19 +81,8 @@
<processor>local-address-error</processor>
<notice>550 - Requested action not taken: no such user here</notice>
</mailet>
- <mailet match="SMTPAuthSuccessful" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="SMTPIsAuthNetwork" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="SentByMailet" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="org.apache.james.jmap.mailet.SentByJmap" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="HasMailAttribute=RelayAllowed" class="RemoteDelivery">
+
+ <mailet match="relay-allowed" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>25</maxRetries>
@@ -96,6 +91,7 @@
<sendpartial>true</sendpartial>
<bounceProcessor>bounces</bounceProcessor>
</mailet>
+
<mailet match="All" class="ToProcessor">
<processor>relay-denied</processor>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/aaf12995/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
index 660f310..e1f7f43 100644
--- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
@@ -48,6 +48,12 @@
<matcher match="HasMimeType=multipart/report"/>
<matcher match="HasMimeTypeParameter=report-type=disposition-notification"/>
</matcher>
+ <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
+ <matcher match="SMTPAuthSuccessful"/>
+ <matcher match="SMTPIsAuthNetwork"/>
+ <matcher match="SentByMailet"/>
+ <matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
+ </matcher>
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
@@ -76,16 +82,8 @@
<processor>local-address-error</processor>
<notice>550 - Requested action not taken: no such user here</notice>
</mailet>
- <mailet match="SMTPAuthSuccessful" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="SMTPIsAuthNetwork" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="SentByMailet" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="HasMailAttribute=RelayAllowed" class="RemoteDelivery">
+
+ <mailet match="relay-allowed" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>25</maxRetries>
@@ -94,6 +92,7 @@
<sendpartial>true</sendpartial>
<bounceProcessor>bounces</bounceProcessor>
</mailet>
+
<mailet match="All" class="ToProcessor">
<processor>relay-denied</processor>
</mailet>
http://git-wip-us.apache.org/repos/asf/james-project/blob/aaf12995/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml b/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml
index cf90f14..15f351d 100644
--- a/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml
+++ b/server/protocols/webadmin-integration-test/src/test/resources/mailetcontainer.xml
@@ -47,6 +47,13 @@
<processor state="transport" enableJmx="false">
+ <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or">
+ <matcher match="SMTPAuthSuccessful"/>
+ <matcher match="SMTPIsAuthNetwork"/>
+ <matcher match="SentByMailet"/>
+ <matcher match="org.apache.james.jmap.mailet.SentByJmap"/>
+ </matcher>
+
<mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
<name>X-UserIsAuth</name>
<value>true</value>
@@ -62,13 +69,8 @@
<processor>local-address-error</processor>
<notice>550 - Requested action not taken: no such user here</notice>
</mailet>
- <mailet match="SMTPAuthSuccessful" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="SentByMailet" class="SetMailAttribute">
- <RelayAllowed>true</RelayAllowed>
- </mailet>
- <mailet match="HasMailAttribute=RelayAllowed" class="RemoteDelivery">
+
+ <mailet match="relay-allowed" class="RemoteDelivery">
<outgoingQueue>outgoing</outgoingQueue>
<delayTime>5000, 100000, 500000</delayTime>
<maxRetries>25</maxRetries>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[04/29] james-project git commit: JAMES-2496 don't use
project.groupId for dep mgnt as it's resolved in children pom
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/protocols/imap/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml
index 79f2e31..4144ec6 100644
--- a/protocols/imap/pom.xml
+++ b/protocols/imap/pom.xml
@@ -21,13 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
+ <groupId>org.apache.james.protocols</groupId>
<artifactId>protocols</artifactId>
<version>3.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-imap</artifactId>
<packaging>bundle</packaging>
@@ -35,75 +34,75 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>protocols-api</artifactId>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>apache-james-mailbox-api</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.beetstra.jutf7</groupId>
- <artifactId>jutf7</artifactId>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>apache-james-mailbox-store</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>apache-mime4j-core</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>nl.jqno.equalsverifier</groupId>
- <artifactId>equalsverifier</artifactId>
- <scope>test</scope>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>metrics-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
+ <groupId>${james.protocols.groupId}</groupId>
+ <artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <type>test-jar</type>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <scope>test</scope>
+ <groupId>com.beetstra.jutf7</groupId>
+ <artifactId>jutf7</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j-core</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-util</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-util-java8</artifactId>
+ <groupId>nl.jqno.equalsverifier</groupId>
+ <artifactId>equalsverifier</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>metrics-api</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/protocols/lmtp/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/lmtp/pom.xml b/protocols/lmtp/pom.xml
index 9418e19..bf8e857 100644
--- a/protocols/lmtp/pom.xml
+++ b/protocols/lmtp/pom.xml
@@ -21,13 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
+ <groupId>org.apache.james.protocols</groupId>
<artifactId>protocols</artifactId>
<version>3.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-lmtp</artifactId>
<packaging>bundle</packaging>
@@ -35,26 +34,26 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-netty</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-smtp</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-smtp</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/protocols/managesieve/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/managesieve/pom.xml b/protocols/managesieve/pom.xml
index 269173e..46bd1f9 100644
--- a/protocols/managesieve/pom.xml
+++ b/protocols/managesieve/pom.xml
@@ -21,13 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
+ <groupId>org.apache.james.protocols</groupId>
<artifactId>protocols</artifactId>
<version>3.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-managesieve</artifactId>
<packaging>bundle</packaging>
@@ -35,6 +34,14 @@
<dependencies>
<dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>apache-jsieve-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-data-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
@@ -52,14 +59,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-jsieve-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-data-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/protocols/netty/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/netty/pom.xml b/protocols/netty/pom.xml
index 8c64980..062a2cb 100644
--- a/protocols/netty/pom.xml
+++ b/protocols/netty/pom.xml
@@ -21,13 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
+ <groupId>org.apache.james.protocols</groupId>
<artifactId>protocols</artifactId>
<version>3.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-netty</artifactId>
<packaging>bundle</packaging>
@@ -35,7 +34,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
@@ -52,10 +55,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-util-java8</artifactId>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/protocols/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/pom.xml b/protocols/pom.xml
index 76ed99c..62e039f 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -26,6 +26,7 @@
<version>3.2.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.james.protocols</groupId>
<artifactId>protocols</artifactId>
<packaging>pom</packaging>
@@ -44,71 +45,6 @@
<module>smtp</module>
</modules>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-jsieve-core</artifactId>
- <version>${jsieve.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j-core</artifactId>
- <version>${apache-mime4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j-dom</artifactId>
- <version>${apache-mime4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-data-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-util</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-util-java8</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>metrics-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<build>
<plugins>
<plugin>
@@ -116,30 +52,6 @@
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <!-- just delete the bin directory -->
- <directory>bin</directory>
- <followSymlinks>false</followSymlinks>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/protocols/pop3/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/pop3/pom.xml b/protocols/pop3/pom.xml
index 1188b14..e200016 100644
--- a/protocols/pop3/pom.xml
+++ b/protocols/pop3/pom.xml
@@ -21,13 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
+ <groupId>org.apache.james.protocols</groupId>
<artifactId>protocols</artifactId>
<version>3.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-pop3</artifactId>
<packaging>bundle</packaging>
@@ -35,17 +34,17 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-netty</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/protocols/smtp/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/smtp/pom.xml b/protocols/smtp/pom.xml
index f11b127..117e175 100644
--- a/protocols/smtp/pom.xml
+++ b/protocols/smtp/pom.xml
@@ -21,13 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
+ <groupId>org.apache.james.protocols</groupId>
<artifactId>protocols</artifactId>
<version>3.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-smtp</artifactId>
<packaging>bundle</packaging>
@@ -35,21 +34,29 @@
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>metrics-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-netty</artifactId>
</dependency>
<dependency>
@@ -88,14 +95,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>metrics-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/app/pom.xml
----------------------------------------------------------------------
diff --git a/server/app/pom.xml b/server/app/pom.xml
index 052723f..4dec2a6 100644
--- a/server/app/pom.xml
+++ b/server/app/pom.xml
@@ -72,7 +72,7 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-jcr</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -83,7 +83,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -94,7 +94,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -105,7 +105,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -116,7 +116,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-spring</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -135,11 +135,11 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-cli</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
<exclusions>
<exclusion>
@@ -149,7 +149,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
<exclusions>
<exclusion>
@@ -160,7 +160,7 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-file</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -171,7 +171,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-hbase</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -198,7 +198,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-jcr</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -209,7 +209,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-jdbc</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -220,17 +220,17 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-jpa</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-ldap</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -241,17 +241,17 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-dnsjava</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-library</artifactId>
<exclusions>
<exclusion>
@@ -261,7 +261,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-fetchmail</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -272,15 +272,15 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailbox-adapter</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -291,7 +291,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailetcontainer-api</artifactId>
<exclusions>
<exclusion>
@@ -301,7 +301,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailetcontainer-camel</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -312,7 +312,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailets</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -323,17 +323,17 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-imap4</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-lmtp</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -344,12 +344,12 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-managesieve</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-pop3</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -361,7 +361,7 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-smtp</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -372,7 +372,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-activemq</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -383,7 +383,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
<exclusions>
<exclusion>
@@ -393,7 +393,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-file</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -404,7 +404,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-jms</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -415,7 +415,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-spring</artifactId>
<exclusions>
<exclusion>
@@ -433,7 +433,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<scope>runtime</scope>
<exclusions>
@@ -444,15 +444,15 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-dropwizard</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
</dependency>
<dependency>
@@ -501,12 +501,12 @@
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-imap</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
+ <groupId>${james.protocols.groupId}</groupId>
<artifactId>protocols-managesieve</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/blob/blob-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/blob/blob-api/pom.xml b/server/blob/blob-api/pom.xml
index 0289a00..9ebf1cf 100644
--- a/server/blob/blob-api/pom.xml
+++ b/server/blob/blob-api/pom.xml
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/blob/blob-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/blob/blob-cassandra/pom.xml b/server/blob/blob-cassandra/pom.xml
index f64dfea..e99e241 100644
--- a/server/blob/blob-cassandra/pom.xml
+++ b/server/blob/blob-cassandra/pom.xml
@@ -34,27 +34,27 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>blob-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>blob-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/cli-integration/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/cli-integration/pom.xml b/server/container/cli-integration/pom.xml
index e9ad179..b295866 100644
--- a/server/container/cli-integration/pom.xml
+++ b/server/container/cli-integration/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-cli</artifactId>
<scope>test</scope>
<exclusions>
@@ -43,25 +43,25 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-memory-guice</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-memory-guice</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/cli/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/cli/pom.xml b/server/container/cli/pom.xml
index f71a272..3bbe7f8 100644
--- a/server/container/cli/pom.xml
+++ b/server/container/cli/pom.xml
@@ -34,19 +34,19 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailbox-adapter</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/core/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml
index bb58abc..97a9d77 100644
--- a/server/container/core/pom.xml
+++ b/server/container/core/pom.xml
@@ -39,40 +39,40 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
<!-- RFC2822Headers constants imported from mailet-base (undetected by bytecode analyzers because constants are inlined) -->
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/cassandra-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml
index 4cf4b50..f93077c 100644
--- a/server/container/guice/cassandra-guice/pom.xml
+++ b/server/container/guice/cassandra-guice/pom.xml
@@ -40,192 +40,192 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-cassandra</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-elasticsearch</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-scanning-search</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-search-elasticsearch</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-icalendar</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>blob-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-jmap-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-es-resporter</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-imap</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmx</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-lmtp</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-mailbox-plugin-spamassassin</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-managedsieve</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-pop</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-smtp</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-data</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-mailbox</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-mailqueue</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-mailrepository</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-swagger</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jmap-integration-testing</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailrepository-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-webadmin-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-es-reporter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>quota-mailing-cassandra</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/cassandra-ldap-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-ldap-guice/pom.xml b/server/container/guice/cassandra-ldap-guice/pom.xml
index 967dd5f..f74dfae 100644
--- a/server/container/guice/cassandra-ldap-guice/pom.xml
+++ b/server/container/guice/cassandra-ldap-guice/pom.xml
@@ -40,70 +40,70 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-cassandra-guice</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-ldap</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-ldap-integration-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-ldap-integration-testing</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/configuration/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/configuration/pom.xml b/server/container/guice/configuration/pom.xml
index 1325475..86130d0 100644
--- a/server/container/guice/configuration/pom.xml
+++ b/server/container/guice/configuration/pom.xml
@@ -33,15 +33,15 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/custom-mailets/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/custom-mailets/pom.xml b/server/container/guice/custom-mailets/pom.xml
index ac1b4fa..ad9e3db 100644
--- a/server/container/guice/custom-mailets/pom.xml
+++ b/server/container/guice/custom-mailets/pom.xml
@@ -33,11 +33,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/es-metric-reporter/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/es-metric-reporter/pom.xml b/server/container/guice/es-metric-reporter/pom.xml
index 0dc57b4..7dfe6e3 100644
--- a/server/container/guice/es-metric-reporter/pom.xml
+++ b/server/container/guice/es-metric-reporter/pom.xml
@@ -36,15 +36,15 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-es-reporter</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/guice-common/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml
index 77019af..cec5b46 100644
--- a/server/container/guice/guice-common/pom.xml
+++ b/server/container/guice/guice-common/pom.xml
@@ -33,128 +33,128 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-file</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-dnsjava</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-imap</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-lmtp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-mailet</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-netty</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-pop</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-smtp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailets</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailrepository-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-onami</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-protocols-smtp</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-activemq</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-task</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-dropwizard</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-logger</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/guice-utils/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-utils/pom.xml b/server/container/guice/guice-utils/pom.xml
index 1f33190..bed5d72 100644
--- a/server/container/guice/guice-utils/pom.xml
+++ b/server/container/guice/guice-utils/pom.xml
@@ -30,11 +30,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/jmx/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jmx/pom.xml b/server/container/guice/jmx/pom.xml
index 8f1d185..5dd7791 100644
--- a/server/container/guice/jmx/pom.xml
+++ b/server/container/guice/jmx/pom.xml
@@ -33,35 +33,35 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailbox-adapter</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailetcontainer-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailetcontainer-camel</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/jpa-common-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-common-guice/pom.xml b/server/container/guice/jpa-common-guice/pom.xml
index 54394b8..0aa069a 100644
--- a/server/container/guice/jpa-common-guice/pom.xml
+++ b/server/container/guice/jpa-common-guice/pom.xml
@@ -39,11 +39,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-jpa</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/jpa-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-guice/pom.xml b/server/container/guice/jpa-guice/pom.xml
index 280b63f..9dda918 100644
--- a/server/container/guice/jpa-guice/pom.xml
+++ b/server/container/guice/jpa-guice/pom.xml
@@ -40,109 +40,109 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-search-scanning</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-jpa</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-es-resporter</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-imap</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmx</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-lmtp</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-mailbox-plugin-spamassassin</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-managedsieve</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-pop</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-smtp</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-data</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-mailbox</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-mailqueue</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-mailrepository</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-swagger</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jpa-common-guice</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jpa-common-guice</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/jpa-smtp-common/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp-common/pom.xml b/server/container/guice/jpa-smtp-common/pom.xml
index 10ff83d..ac62ede 100644
--- a/server/container/guice/jpa-smtp-common/pom.xml
+++ b/server/container/guice/jpa-smtp-common/pom.xml
@@ -34,39 +34,39 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-jpa</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-es-resporter</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-smtp</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-data</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-mailqueue</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-mailrepository</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jpa-common-guice</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/jpa-smtp-mariadb/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp-mariadb/pom.xml b/server/container/guice/jpa-smtp-mariadb/pom.xml
index 319f92a..97624e4 100644
--- a/server/container/guice/jpa-smtp-mariadb/pom.xml
+++ b/server/container/guice/jpa-smtp-mariadb/pom.xml
@@ -36,18 +36,18 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jpa-smtp-common-guice</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/jpa-smtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/container/guice/jpa-smtp/pom.xml
index 901c359..c332036 100644
--- a/server/container/guice/jpa-smtp/pom.xml
+++ b/server/container/guice/jpa-smtp/pom.xml
@@ -40,24 +40,24 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jpa-smtp-common-guice</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jpa-common-guice</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/mailbox-plugin-spamassassin/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/mailbox-plugin-spamassassin/pom.xml b/server/container/guice/mailbox-plugin-spamassassin/pom.xml
index d0c4713..f401ffd 100644
--- a/server/container/guice/mailbox-plugin-spamassassin/pom.xml
+++ b/server/container/guice/mailbox-plugin-spamassassin/pom.xml
@@ -33,11 +33,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-spamassassin</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/mailbox/pom.xml b/server/container/guice/mailbox/pom.xml
index b94e2d2..b340af6 100644
--- a/server/container/guice/mailbox/pom.xml
+++ b/server/container/guice/mailbox/pom.xml
@@ -33,19 +33,19 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-utils</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/mailet/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/mailet/pom.xml b/server/container/guice/mailet/pom.xml
index 6fb99a0..cb9bb95 100644
--- a/server/container/guice/mailet/pom.xml
+++ b/server/container/guice/mailet/pom.xml
@@ -33,29 +33,29 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-standard</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-configuration</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-utils</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailetcontainer-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-mailetcontainer-camel</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/server/container/guice/memory-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/pom.xml b/server/container/guice/memory-guice/pom.xml
index 9f3c4ba..e7e0c84 100644
--- a/server/container/guice/memory-guice/pom.xml
+++ b/server/container/guice/memory-guice/pom.xml
@@ -36,110 +36,110 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-mailing</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-scanning-search</artifactId>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-search-scanning</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-memory</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-imap</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmap</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-jmx</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-lmtp</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-mailbox-plugin-spamassassin</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-managedsieve</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-pop</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-smtp</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-data</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-mailbox</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-mailqueue</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-mailrepository</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-webadmin-swagger</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-memory</artifactId>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[19/29] james-project git commit: JAMES-2488 update openjpa
Posted by bt...@apache.org.
JAMES-2488 update openjpa
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/34c89c28
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/34c89c28
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/34c89c28
Branch: refs/heads/master
Commit: 34c89c28ea11f7997f45f5f30d0cf2eb19393bef
Parents: bbfc3dc
Author: duc <dt...@linagora.com>
Authored: Fri Jul 20 17:25:49 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:24 2018 +0700
----------------------------------------------------------------------
backends-common/jpa/pom.xml | 2 +-
dockerfiles/run/guice/jpa/Dockerfile | 2 +-
mailbox/jpa/pom.xml | 2 +-
.../mailbox/jpa/JPAMailboxSessionMapperFactory.java | 4 ++--
.../james/mailbox/jpa/mail/JPAModSeqProvider.java | 4 ++--
.../james/mailbox/jpa/mail/JPAMapperProvider.java | 12 ++++++------
.../mailbox/jpa/mail/TransactionalAnnotationMapper.java | 6 +++---
.../mailbox/jpa/mail/TransactionalMailboxMapper.java | 6 +++---
.../mailbox/jpa/mail/TransactionalMessageMapper.java | 6 +++---
pom.xml | 1 +
server/data/data-jpa/pom.xml | 2 +-
11 files changed, 24 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/backends-common/jpa/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/jpa/pom.xml b/backends-common/jpa/pom.xml
index 2d6ed92..3fad710 100644
--- a/backends-common/jpa/pom.xml
+++ b/backends-common/jpa/pom.xml
@@ -27,7 +27,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.4.2</version>
+ <version>${apache.openjpa.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/dockerfiles/run/guice/jpa/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/Dockerfile b/dockerfiles/run/guice/jpa/Dockerfile
index bb2e68d..913cfa9 100644
--- a/dockerfiles/run/guice/jpa/Dockerfile
+++ b/dockerfiles/run/guice/jpa/Dockerfile
@@ -27,4 +27,4 @@ ADD destination/conf /root/conf
VOLUME /logs
-ENTRYPOINT java -classpath '/root/james-server.jar:/root/james-server-jpa-guice.lib/*' -javaagent:/root/james-server-cli.lib/openjpa-2.4.2.jar -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ org.apache.james.JPAJamesServerMain
+ENTRYPOINT java -classpath '/root/james-server.jar:/root/james-server-jpa-guice.lib/*' -javaagent:/root/james-server-cli.lib/openjpa-3.0.0.jar -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ org.apache.james.JPAJamesServerMain
http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/mailbox/jpa/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/jpa/pom.xml b/mailbox/jpa/pom.xml
index f3c696d..e613323 100644
--- a/mailbox/jpa/pom.xml
+++ b/mailbox/jpa/pom.xml
@@ -111,7 +111,7 @@
<plugin>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.4.2</version>
+ <version>${apache.openjpa.version}</version>
<configuration>
<includes>org/apache/james/mailbox/jpa/*/model/**/*.class</includes>
<excludes>org/apache/james/mailbox/jpa/mail/model/openjpa/EncryptDecryptHelper.class</excludes>
http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java
index 09ded1f..ade56a6 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java
@@ -22,7 +22,7 @@ import javax.inject.Inject;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.jpa.mail.JPAAnnotationMapper;
@@ -68,7 +68,7 @@ public class JPAMailboxSessionMapperFactory extends MailboxSessionMapperFactory
@Override
public MessageIdMapper createMessageIdMapper(MailboxSession session) throws MailboxException {
- throw new NotImplementedException();
+ throw new NotImplementedException("not implemented");
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java
index 8d31878..35de142 100644
--- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java
+++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAModSeqProvider.java
@@ -23,7 +23,7 @@ import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceException;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
import org.apache.james.mailbox.MailboxPathLocker;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.exception.MailboxException;
@@ -91,6 +91,6 @@ public class JPAModSeqProvider extends AbstractLockingModSeqProvider {
@Override
public long highestModSeq(MailboxSession session, MailboxId mailboxId) throws MailboxException {
- throw new NotImplementedException();
+ throw new NotImplementedException("not implemented");
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java
index dca5583..a3f1b01 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java
@@ -24,7 +24,7 @@ import java.util.Random;
import javax.persistence.EntityManagerFactory;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
import org.apache.james.backends.jpa.JpaTestCluster;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.exception.MailboxException;
@@ -73,7 +73,7 @@ public class JPAMapperProvider implements MapperProvider {
@Override
public AttachmentMapper createAttachmentMapper() throws MailboxException {
- throw new NotImplementedException();
+ throw new NotImplementedException("not implemented");
}
@Override
@@ -108,22 +108,22 @@ public class JPAMapperProvider implements MapperProvider {
@Override
public MessageIdMapper createMessageIdMapper() throws MailboxException {
- throw new NotImplementedException();
+ throw new NotImplementedException("not implemented");
}
@Override
public MessageUid generateMessageUid() {
- throw new NotImplementedException();
+ throw new NotImplementedException("not implemented");
}
@Override
public long generateModSeq(Mailbox mailbox) throws MailboxException {
- throw new NotImplementedException();
+ throw new NotImplementedException("not implemented");
}
@Override
public long highestModSeq(Mailbox mailbox) throws MailboxException {
- throw new NotImplementedException();
+ throw new NotImplementedException("not implemented");
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalAnnotationMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalAnnotationMapper.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalAnnotationMapper.java
index 6873e13..4cb9930 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalAnnotationMapper.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalAnnotationMapper.java
@@ -22,7 +22,7 @@ package org.apache.james.mailbox.jpa.mail;
import java.util.List;
import java.util.Set;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MailboxAnnotation;
import org.apache.james.mailbox.model.MailboxAnnotationKey;
@@ -39,12 +39,12 @@ public class TransactionalAnnotationMapper implements AnnotationMapper {
@Override
public void endRequest() {
- throw new NotImplementedException();
+ throw new NotImplementedException("not implemented");
}
@Override
public <T> T execute(Transaction<T> transaction) {
- throw new NotImplementedException();
+ throw new NotImplementedException("not implemented");
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java
index c1ba844..7f9e6c3 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMailboxMapper.java
@@ -21,7 +21,7 @@ package org.apache.james.mailbox.jpa.mail;
import java.util.List;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
import org.apache.james.mailbox.acl.ACLDiff;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.exception.MailboxNotFoundException;
@@ -42,12 +42,12 @@ public class TransactionalMailboxMapper implements MailboxMapper {
@Override
public void endRequest() {
- throw new NotImplementedException();
+ throw new NotImplementedException("not implemented");
}
@Override
public <T> T execute(Transaction<T> transaction) throws MailboxException {
- throw new NotImplementedException();
+ throw new NotImplementedException("not implemented");
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
index a49a598..de8b570 100644
--- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
+++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/mail/TransactionalMessageMapper.java
@@ -26,7 +26,7 @@ import java.util.Optional;
import javax.mail.Flags;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MailboxCounters;
@@ -48,7 +48,7 @@ public class TransactionalMessageMapper implements MessageMapper {
@Override
public void endRequest() {
- throw new NotImplementedException();
+ throw new NotImplementedException("not implemented");
}
@Override
@@ -66,7 +66,7 @@ public class TransactionalMessageMapper implements MessageMapper {
@Override
public <T> T execute(Transaction<T> transaction) throws MailboxException {
- throw new NotImplementedException();
+ throw new NotImplementedException("not implemented");
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 75fee3b..b518ab4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -585,6 +585,7 @@
<james.protocols.groupId>${james.groupId}.protocols</james.protocols.groupId>
<activemq.version>5.15.4</activemq.version>
<apache-mime4j.version>0.8.2</apache-mime4j.version>
+ <apache.openjpa.version>3.0.0</apache.openjpa.version>
<camel.version>2.22.0</camel.version>
<derby.version>10.9.1.0</derby.version>
<hadoop.version>1.1.1</hadoop.version>
http://git-wip-us.apache.org/repos/asf/james-project/blob/34c89c28/server/data/data-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml
index 2f828c2..23a7742 100644
--- a/server/data/data-jpa/pom.xml
+++ b/server/data/data-jpa/pom.xml
@@ -147,7 +147,7 @@
<plugin>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.4.2</version>
+ <version>${apache.openjpa.version}</version>
<configuration>
<includes>org/apache/james/user/jpa/model/JPAUser.class,
org/apache/james/rrt/jpa/model/JPARecipientRewrite.class,
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[21/29] james-project git commit: JAMES-2469 Simplify configuration
in mailet integration tests
Posted by bt...@apache.org.
JAMES-2469 Simplify configuration in mailet integration tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/48030071
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/48030071
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/48030071
Branch: refs/heads/master
Commit: 4803007171a783d8c777161208ae2b98115e24dc
Parents: fe846d5
Author: benwa <bt...@linagora.com>
Authored: Sat Jul 14 11:29:27 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:37 2018 +0700
----------------------------------------------------------------------
.../james/mailets/TemporaryJamesServer.java | 12 +-
.../mailets/configuration/CommonProcessors.java | 130 +------------------
.../configuration/MailetConfiguration.java | 2 +-
.../mailets/configuration/MailetContainer.java | 2 +-
.../configuration/ProcessorConfiguration.java | 4 -
.../crypto/SMIMESignIntegrationTest.java | 5 -
.../src/test/resources/imapserver.xml | 15 ---
.../src/test/resources/lmtpserver.xml | 18 ---
.../src/test/resources/managesieveserver.xml | 33 -----
.../src/test/resources/pop3server.xml | 19 ---
.../src/test/resources/smtpserver.xml | 30 -----
11 files changed, 9 insertions(+), 261 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
index e9d2f94..3337ef8 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
@@ -54,20 +54,12 @@ public class TemporaryJamesServer {
public static final MailetContainer.Builder DEFAULT_MAILET_CONTAINER_CONFIGURATION = MailetContainer.builder()
.putProcessor(CommonProcessors.root())
.putProcessor(CommonProcessors.error())
- .putProcessor(CommonProcessors.transport())
- .putProcessor(CommonProcessors.spam())
- .putProcessor(CommonProcessors.localAddressError())
- .putProcessor(CommonProcessors.relayDenied())
- .putProcessor(CommonProcessors.bounces())
- .putProcessor(CommonProcessors.sieveManagerCheck());
+ .putProcessor(CommonProcessors.transport());
public static final MailetContainer.Builder SIMPLE_MAILET_CONTAINER_CONFIGURATION = MailetContainer.builder()
.putProcessor(CommonProcessors.simpleRoot())
.putProcessor(CommonProcessors.error())
- .putProcessor(CommonProcessors.transport())
- .putProcessor(CommonProcessors.localAddressError())
- .putProcessor(CommonProcessors.relayDenied())
- .putProcessor(CommonProcessors.bounces());
+ .putProcessor(CommonProcessors.transport());
public static class Builder {
private ImmutableList.Builder<Module> overrideModules;
http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
index d465620..936124f 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/CommonProcessors.java
@@ -30,20 +30,15 @@ import org.apache.james.transport.mailets.Null;
import org.apache.james.transport.mailets.PostmasterAlias;
import org.apache.james.transport.mailets.RecipientRewriteTable;
import org.apache.james.transport.mailets.RemoteDelivery;
-import org.apache.james.transport.mailets.SetMailAttribute;
import org.apache.james.transport.mailets.SetMimeHeader;
import org.apache.james.transport.mailets.Sieve;
import org.apache.james.transport.mailets.ToProcessor;
import org.apache.james.transport.mailets.ToRepository;
-import org.apache.james.transport.mailets.managesieve.ManageSieveMailet;
import org.apache.james.transport.matchers.All;
import org.apache.james.transport.matchers.HasMailAttribute;
-import org.apache.james.transport.matchers.InSpammerBlacklist;
-import org.apache.james.transport.matchers.RecipientIs;
import org.apache.james.transport.matchers.RecipientIsLocal;
import org.apache.james.transport.matchers.RelayLimit;
import org.apache.james.transport.matchers.SMTPAuthSuccessful;
-import org.apache.mailet.Mail;
public class CommonProcessors {
@@ -51,7 +46,7 @@ public class CommonProcessors {
public static ProcessorConfiguration root() {
return ProcessorConfiguration.root()
- .enableJmx(true)
+ .enableJmx(false)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(PostmasterAlias.class))
@@ -59,35 +54,6 @@ public class CommonProcessors {
.matcher(RelayLimit.class)
.matcherCondition("30")
.mailet(Null.class))
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIs.class)
- .matcherCondition("sievemanager@james.linagora.com")
- .mailet(ToProcessor.class)
- .addProperty("processor", "sieve-manager-check"))
- .addMailet(MailetConfiguration.builder()
- .matcher(HasMailAttribute.class)
- .matcherCondition("spamChecked")
- .mailet(ToProcessor.class)
- .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(SetMailAttribute.class)
- .addProperty("spamChecked", "true"))
- .addMailet(MailetConfiguration.builder()
- .matcher(SMTPAuthSuccessful.class)
- .mailet(ToProcessor.class)
- .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
- .addMailet(MailetConfiguration.builder()
- .matcher(InSpammerBlacklist.class)
- .matcherCondition("query.bondedsender.org.")
- .mailet(ToProcessor.class)
- .addProperty("processor", ProcessorConfiguration.STATE_TRANSPORT))
- .addMailet(MailetConfiguration.builder()
- .matcher(InSpammerBlacklist.class)
- .matcherCondition("dnsbl.njabl.org.")
- .mailet(ToProcessor.class)
- .addProperty("processor", ProcessorConfiguration.STATE_SPAM)
- .addProperty("notice", "550 Requested action not taken: rejected - see http://njabl.org/"))
.addMailet(MailetConfiguration.TO_TRANSPORT)
.build();
}
@@ -100,7 +66,7 @@ public class CommonProcessors {
public static ProcessorConfiguration error() {
return ProcessorConfiguration.error()
- .enableJmx(true)
+ .enableJmx(false)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(Bounce.class))
@@ -113,12 +79,7 @@ public class CommonProcessors {
public static ProcessorConfiguration transport() {
return ProcessorConfiguration.transport()
- .enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(SMTPAuthSuccessful.class)
- .mailet(SetMimeHeader.class)
- .addProperty("name", "X-UserIsAuth")
- .addProperty("value", "true"))
+ .enableJmx(false)
.addMailet(MailetConfiguration.builder()
.matcher(HasMailAttribute.class)
.matcherCondition("org.apache.james.SMIMECheckSignature")
@@ -154,7 +115,7 @@ public class CommonProcessors {
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(ToProcessor.class)
- .addProperty("processor", "relay-denied"))
+ .addProperty("processor", "error"))
.build();
}
@@ -165,94 +126,13 @@ public class CommonProcessors {
.build();
}
- public static ProcessorConfiguration spam() {
- return ProcessorConfiguration.spam()
- .enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToRepository.class)
- .addProperty("repositoryPath", "file://var/mail/spam/"))
- .build();
- }
-
- public static ProcessorConfiguration localAddressError() {
- return ProcessorConfiguration.builder()
- .state("local-address-error")
- .enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(Bounce.class)
- .addProperty("attachment", "none"))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToRepository.class)
- .addProperty("repositoryPath", "file://var/mail/address-error/"))
- .build();
- }
-
- public static ProcessorConfiguration relayDenied() {
- return ProcessorConfiguration.builder()
- .state("replay-denied")
- .enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(Bounce.class)
- .addProperty("attachment", "none"))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ToRepository.class)
- .addProperty("repositoryPath", "file://var/mail/relay-denied/")
- .addProperty("notice", "Warning: You are sending an e-mail to a remote server. You must be authentified to perform such an operation"))
- .build();
- }
-
public static ProcessorConfiguration bounces() {
return ProcessorConfiguration.bounces()
- .enableJmx(true)
+ .enableJmx(false)
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
.mailet(DSNBounce.class)
.addProperty("passThrough", "false"))
.build();
}
-
- public static ProcessorConfiguration sieveManagerCheck() {
- return ProcessorConfiguration.builder()
- .state("sieve-manager-check")
- .enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(RecipientIsLocal.class)
- .mailet(ToProcessor.class)
- .addProperty("processor", "sieve-manager"))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(Bounce.class)
- .addProperty("inline", "heads")
- .addProperty("attachment", "none")
- .addProperty("passThrough", "false")
- .addProperty("prefix", "[REJECTED]")
- .addProperty("notice", "You can't send messages to configure SIEVE on this serveur unless you are the official SIEVE manager."))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(Null.class))
- .build();
- }
-
- public static ProcessorConfiguration sieveManager() {
- return ProcessorConfiguration.builder()
- .state("sieve-manager")
- .enableJmx(true)
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(SetMailAttribute.class)
- .addProperty(Mail.SMTP_AUTH_USER_ATTRIBUTE_NAME, "true"))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(ManageSieveMailet.class)
- .addProperty("helpURL", "file:/root/james-server-app-3.0.0-beta5-SNAPSHOT/conf/managesieve.help.txt"))
- .addMailet(MailetConfiguration.builder()
- .matcher(All.class)
- .mailet(Null.class))
- .build();
- }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
index b7619c3..cdba77d 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java
@@ -106,7 +106,7 @@ public class MailetConfiguration implements SerializableAsXml {
public static MailetConfiguration.Builder remoteDeliveryBuilder() {
return remoteDeliveryBuilderNoBounces()
- .addProperty("bounceProcessor", ProcessorConfiguration.STATE_BOUNCES);
+ .addProperty("bounceProcessor", ProcessorConfiguration.STATE_ERROR);
}
public static MailetConfiguration.Builder remoteDeliveryBuilderNoBounces() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
index 0e2c3db..ebe29e6 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
@@ -104,7 +104,7 @@ public class MailetContainer implements SerializableAsXml {
public String serializeAsXml() {
StringBuilder builder = new StringBuilder();
builder.append("<?xml version=\"1.0\"?>\n")
- .append("<mailetcontainer enableJmx=\"true\">\n")
+ .append("<mailetcontainer enableJmx=\"false\">\n")
.append("<context><postmaster>").append(getPostmaster()).append("</postmaster>").append("</context>\n")
.append("<spooler><threads>").append(getThreads()).append("</threads>").append("</spooler>\n")
.append("<processors>\n");
http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
index d214f66..08a0a17 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/ProcessorConfiguration.java
@@ -54,10 +54,6 @@ public class ProcessorConfiguration implements SerializableAsXml {
return builder().state(STATE_ERROR);
}
- public static Builder spam() {
- return builder().state(STATE_SPAM);
- }
-
public static class Builder {
private String state;
http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
index 669248f..03f9506 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
@@ -86,11 +86,6 @@ public class SMIMESignIntegrationTest {
.addProperty("keyStoreType", "PKCS12")
.addProperty("debug", "true"))
.addMailet(MailetConfiguration.LOCAL_DELIVERY))
- .putProcessor(CommonProcessors.spam())
- .putProcessor(CommonProcessors.localAddressError())
- .putProcessor(CommonProcessors.relayDenied())
- .putProcessor(CommonProcessors.bounces())
- .putProcessor(CommonProcessors.sieveManagerCheck())
.build();
jamesServer = TemporaryJamesServer.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/resources/imapserver.xml
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/resources/imapserver.xml b/server/mailet/integration-testing/src/test/resources/imapserver.xml
index 28ce44c..5db05e9 100644
--- a/server/mailet/integration-testing/src/test/resources/imapserver.xml
+++ b/server/mailet/integration-testing/src/test/resources/imapserver.xml
@@ -36,19 +36,4 @@ under the License.
<connectionLimit>0</connectionLimit>
<connectionLimitPerIP>0</connectionLimitPerIP>
</imapserver>
- <imapserver enabled="true">
- <jmxName>imapserver-ssl</jmxName>
- <bind>0.0.0.0:1993</bind>
- <connectionBacklog>200</connectionBacklog>
- <tls socketTLS="false" startTLS="false">
- <!-- To create a new keystore execute:
- keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
- -->
- <keystore>file://conf/keystore</keystore>
- <secret>james72laBalle</secret>
- <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
- </tls>
- <connectionLimit>0</connectionLimit>
- <connectionLimitPerIP>0</connectionLimitPerIP>
- </imapserver>
</imapservers>
http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/resources/lmtpserver.xml
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/resources/lmtpserver.xml b/server/mailet/integration-testing/src/test/resources/lmtpserver.xml
index 5c4a9c7..f838adb 100644
--- a/server/mailet/integration-testing/src/test/resources/lmtpserver.xml
+++ b/server/mailet/integration-testing/src/test/resources/lmtpserver.xml
@@ -20,22 +20,4 @@
<lmtpservers>
- <lmtpserver enabled="true">
- <jmxName>lmtpserver</jmxName>
- <!-- LMTP should not be reachable from outside your network so bind it to loopback-->
- <bind>127.0.0.1:1024</bind>
- <connectionBacklog>200</connectionBacklog>
- <connectiontimeout>1200</connectiontimeout>
- <!-- Set the maximum simultaneous incoming connections for this service -->
- <connectionLimit>0</connectionLimit>
- <!-- Set the maximum simultaneous incoming connections per IP for this service -->
- <connectionLimitPerIP>0</connectionLimitPerIP>
- <!-- This sets the maximum allowed message size (in kilobytes) for this -->
- <!-- LMTP service. If unspecified, the value defaults to 0, which means no limit. -->
- <maxmessagesize>0</maxmessagesize>
- <handlerchain>
- <handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
- </handlerchain>
- </lmtpserver>
-
</lmtpservers>
http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/resources/managesieveserver.xml
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/resources/managesieveserver.xml b/server/mailet/integration-testing/src/test/resources/managesieveserver.xml
index ec57e09..f136a43 100644
--- a/server/mailet/integration-testing/src/test/resources/managesieveserver.xml
+++ b/server/mailet/integration-testing/src/test/resources/managesieveserver.xml
@@ -27,39 +27,6 @@
<managesieveservers>
- <managesieveserver enabled="true">
-
- <jmxName>managesieveserver</jmxName>
-
- <bind>0.0.0.0:4190</bind>
-
- <connectionBacklog>200</connectionBacklog>
-
- <tls socketTLS="false" startTLS="false">
- <!-- To create a new keystore execute:
- keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
- -->
- <keystore>file://conf/keystore</keystore>
- <secret>james72laBalle</secret>
- <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
- <!-- The algorithm is optional and only needs to be specified when using something other
- than the Sun JCE provider - You could use IbmX509 with IBM Java runtime. -->
- <algorithm>SunX509</algorithm>
- </tls>
-
- <!-- connection timeout in secconds -->
- <connectiontimeout>360</connectiontimeout>
-
- <!-- Set the maximum simultaneous incoming connections for this service -->
- <connectionLimit>0</connectionLimit>
-
- <!-- Set the maximum simultaneous incoming connections per IP for this service -->
- <connectionLimitPerIP>0</connectionLimitPerIP>
- <maxmessagesize>0</maxmessagesize>
- <addressBracketsEnforcement>true</addressBracketsEnforcement>
-
- </managesieveserver>
-
</managesieveservers>
http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/resources/pop3server.xml
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/resources/pop3server.xml b/server/mailet/integration-testing/src/test/resources/pop3server.xml
index e4187da..bec385a 100644
--- a/server/mailet/integration-testing/src/test/resources/pop3server.xml
+++ b/server/mailet/integration-testing/src/test/resources/pop3server.xml
@@ -20,23 +20,4 @@
<pop3servers>
- <pop3server enabled="true">
- <jmxName>pop3server</jmxName>
- <bind>0.0.0.0:1110</bind>
- <connectionBacklog>200</connectionBacklog>
- <tls socketTLS="false" startTLS="false">
- <!-- To create a new keystore execute:
- keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
- -->
- <keystore>file://conf/keystore</keystore>
- <secret>james72laBalle</secret>
- <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
- </tls>
- <connectiontimeout>1200</connectiontimeout>
- <connectionLimit>0</connectionLimit>
- <connectionLimitPerIP>0</connectionLimitPerIP>
- <handlerchain>
- <handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
- </handlerchain>
- </pop3server>
</pop3servers>
http://git-wip-us.apache.org/repos/asf/james-project/blob/48030071/server/mailet/integration-testing/src/test/resources/smtpserver.xml
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/resources/smtpserver.xml b/server/mailet/integration-testing/src/test/resources/smtpserver.xml
index 30c56f8..b0e2764 100644
--- a/server/mailet/integration-testing/src/test/resources/smtpserver.xml
+++ b/server/mailet/integration-testing/src/test/resources/smtpserver.xml
@@ -76,36 +76,6 @@
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
</handlerchain>
</smtpserver>
- <smtpserver enabled="true">
- <jmxName>smtpserver-authenticated</jmxName>
- <bind>0.0.0.0:1587</bind>
- <connectionBacklog>200</connectionBacklog>
- <tls socketTLS="false" startTLS="false">
- <keystore>file://conf/keystore</keystore>
- <secret>james72laBalle</secret>
- <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
- <algorithm>SunX509</algorithm>
- </tls>
- <connectiontimeout>360</connectiontimeout>
- <connectionLimit>0</connectionLimit>
- <connectionLimitPerIP>0</connectionLimitPerIP>
- <!--
- Authorize only local users
- -->
- <authRequired>true</authRequired>
- {{#hasAuthorizedAddresses}}
- <authorizedAddresses>{{authorizedAddresses}}</authorizedAddresses>
- {{/hasAuthorizedAddresses}}
- <!-- Trust authenticated users -->
- <verifyIdentity>false</verifyIdentity>
- <maxmessagesize>{{maxmessagesize}}</maxmessagesize>
- <addressBracketsEnforcement>{{bracketEnforcement}}</addressBracketsEnforcement>
- <smtpGreeting>JAMES Linagora's SMTP awesome Server</smtpGreeting>
- <handlerchain>
- <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
- <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
- </handlerchain>
- </smtpserver>
</smtpservers>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[17/29] james-project git commit: JAMES-2487 Upgrade
com.jayway.restassured to io.restassured 3.1.0
Posted by bt...@apache.org.
JAMES-2487 Upgrade com.jayway.restassured to io.restassured 3.1.0
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/89df9a44
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/89df9a44
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/89df9a44
Branch: refs/heads/master
Commit: 89df9a447fbff03e4068c45377de5d58174a386e
Parents: 7d00538
Author: Gautier DI FOLCO <gd...@linagora.com>
Authored: Mon Jul 23 12:04:27 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:07 2018 +0700
----------------------------------------------------------------------
mpt/impl/smtp/core/pom.xml | 2 +-
pom.xml | 4 +--
server/container/guice/cassandra-guice/pom.xml | 10 +++---
.../java/org/apache/james/ESReporterTest.java | 12 ++++----
.../apache/james/FixingGhostMailboxTest.java | 16 +++++-----
.../guice/cassandra-ldap-guice/pom.xml | 2 +-
server/container/guice/guice-common/pom.xml | 10 +++---
server/container/guice/jpa-guice/pom.xml | 10 +++---
server/container/guice/jpa-smtp/pom.xml | 2 +-
server/container/guice/memory-guice/pom.xml | 2 +-
server/container/guice/protocols/jmap/pom.xml | 2 +-
.../james/AbstractJmapJamesServerTest.java | 12 ++++----
server/container/jetty/pom.xml | 10 +++---
.../james/http/jetty/JettyHttpServerTest.java | 4 +--
server/mailet/integration-testing/pom.xml | 8 ++---
.../transport/mailets/DlpIntegrationTest.java | 4 +--
.../transport/mailets/GroupMappingTest.java | 16 ++++++----
.../mailets/IsOverQuotaMatcherTest.java | 4 +--
.../transport/mailets/ToRepositoryTest.java | 4 +--
.../cassandra-jmap-integration-testing/pom.xml | 10 +++---
.../cassandra/CassandraBulkOperationTest.java | 6 ++--
.../jmap-integration-testing-common/pom.xml | 10 +++---
.../james/jmap/JMAPAuthenticationTest.java | 8 ++---
.../apache/james/jmap/JmapCommonRequests.java | 6 ++--
.../org/apache/james/jmap/ProvisioningTest.java | 6 ++--
.../org/apache/james/jmap/TestingConstants.java | 8 ++---
.../james/jmap/VacationIntegrationTest.java | 6 ++--
.../integration/ForwardIntegrationTest.java | 8 ++---
.../integration/GetMailboxesMethodTest.java | 4 +--
.../integration/GetMessageListMethodTest.java | 4 +--
.../integration/GetVacationResponseTest.java | 6 ++--
.../methods/integration/QuotaMailingTest.java | 8 ++---
.../methods/integration/SendMDNMethodTest.java | 8 ++---
.../integration/SetMailboxesMethodTest.java | 8 ++---
.../integration/SetMessagesMethodTest.java | 20 ++++++------
.../SetMessagesOutboxFlagUpdateTest.java | 16 +++++-----
.../integration/SetVacationResponseTest.java | 6 ++--
.../integration/SpamAssassinContract.java | 16 +++++-----
.../memory-jmap-integration-testing/pom.xml | 10 +++---
server/protocols/jmap/pom.xml | 10 +++---
.../org/apache/james/jmap/JMAPServletTest.java | 12 ++++----
.../protocols/webadmin-integration-test/pom.xml | 2 +-
.../integration/JwtFilterIntegrationTest.java | 11 +++----
.../WebAdminServerIntegrationTest.java | 8 ++---
.../webadmin/webadmin-cassandra/pom.xml | 2 +-
.../routes/CassandraMigrationRoutesTest.java | 10 +++---
server/protocols/webadmin/webadmin-core/pom.xml | 10 +++---
.../apache/james/webadmin/WebAdminUtils.java | 8 ++---
.../james/webadmin/routes/ErrorRoutesTest.java | 4 +--
.../james/webadmin/routes/TasksRoutesTest.java | 8 ++---
server/protocols/webadmin/webadmin-data/pom.xml | 2 +-
.../routes/DLPConfigurationRoutesTest.java | 14 ++++-----
.../routes/DomainMappingsRoutesTest.java | 20 ++++++------
.../webadmin/routes/DomainsRoutesTest.java | 10 +++---
.../webadmin/routes/ForwardRoutesTest.java | 12 ++++----
.../james/webadmin/routes/GroupsRoutesTest.java | 12 ++++----
.../webadmin/routes/SieveQuotaRoutesTest.java | 6 ++--
.../james/webadmin/routes/UsersRoutesTest.java | 10 +++---
.../protocols/webadmin/webadmin-mailbox/pom.xml | 2 +-
.../DomainQuotaRoutesNoVirtualHostingTest.java | 4 +--
.../webadmin/routes/DomainQuotaRoutesTest.java | 10 +++---
.../webadmin/routes/GlobalQuotaRoutesTest.java | 10 +++---
.../routes/UserMailboxesRoutesTest.java | 8 ++---
.../webadmin/routes/UserQuotaRoutesTest.java | 12 ++++----
.../routes/WebAdminQuotaSearchTestSystem.java | 2 +-
.../webadmin/webadmin-mailqueue/pom.xml | 2 +-
.../webadmin/routes/MailQueueRoutesTest.java | 20 ++++++------
.../webadmin/webadmin-mailrepository/pom.xml | 2 +-
.../routes/MailRepositoriesRoutesTest.java | 32 ++++++++++----------
server/testing/pom.xml | 8 ++---
.../java/org/apache/james/utils/FakeSmtp.java | 18 +++++------
71 files changed, 306 insertions(+), 303 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/mpt/impl/smtp/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/pom.xml b/mpt/impl/smtp/core/pom.xml
index d0f43bc..18174b0 100644
--- a/mpt/impl/smtp/core/pom.xml
+++ b/mpt/impl/smtp/core/pom.xml
@@ -58,7 +58,7 @@
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
+ <groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index af11b8b..22d9b76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1682,9 +1682,9 @@
<version>2.1.0</version>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
+ <groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
- <version>2.9.0</version>
+ <version>3.1.0</version>
</dependency>
<dependency>
<groupId>com.nurkiewicz.asyncretry</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/container/guice/cassandra-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml
index f93077c..d0c4100 100644
--- a/server/container/guice/cassandra-guice/pom.xml
+++ b/server/container/guice/cassandra-guice/pom.xml
@@ -241,15 +241,15 @@
<artifactId>awaitility</artifactId>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
- <artifactId>rest-assured</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.nurkiewicz.asyncretry</groupId>
<artifactId>asyncretry</artifactId>
</dependency>
<dependency>
+ <groupId>io.rest-assured</groupId>
+ <artifactId>rest-assured</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java
index 1c9995f..d598ed3 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/ESReporterTest.java
@@ -19,9 +19,9 @@
package org.apache.james;
import static com.jayway.awaitility.Awaitility.await;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static io.restassured.RestAssured.given;
+import static io.restassured.config.EncoderConfig.encoderConfig;
+import static io.restassured.config.RestAssuredConfig.newConfig;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
@@ -48,9 +48,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.jayway.awaitility.Duration;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.RestAssured;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
public class ESReporterTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
index 9def511..1ebe05f 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/FixingGhostMailboxTest.java
@@ -21,10 +21,10 @@ package org.apache.james;
import static com.datastax.driver.core.querybuilder.QueryBuilder.delete;
import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.with;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.with;
+import static io.restassured.config.EncoderConfig.encoderConfig;
+import static io.restassured.config.RestAssuredConfig.newConfig;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.assertj.core.api.Assertions.assertThat;
@@ -73,10 +73,10 @@ import org.junit.Test;
import com.datastax.driver.core.Cluster;
import com.datastax.driver.core.Session;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
+import io.restassured.RestAssured;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
+import io.restassured.specification.RequestSpecification;
public class FixingGhostMailboxTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/container/guice/cassandra-ldap-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-ldap-guice/pom.xml b/server/container/guice/cassandra-ldap-guice/pom.xml
index f74dfae..9ce1c8e 100644
--- a/server/container/guice/cassandra-ldap-guice/pom.xml
+++ b/server/container/guice/cassandra-ldap-guice/pom.xml
@@ -114,7 +114,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
+ <groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/container/guice/guice-common/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml
index cec5b46..a426fc7 100644
--- a/server/container/guice/guice-common/pom.xml
+++ b/server/container/guice/guice-common/pom.xml
@@ -180,15 +180,15 @@
<artifactId>awaitility</artifactId>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
- <artifactId>rest-assured</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.nurkiewicz.asyncretry</groupId>
<artifactId>asyncretry</artifactId>
</dependency>
<dependency>
+ <groupId>io.rest-assured</groupId>
+ <artifactId>rest-assured</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/container/guice/jpa-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-guice/pom.xml b/server/container/guice/jpa-guice/pom.xml
index 9dda918..db9c1da 100644
--- a/server/container/guice/jpa-guice/pom.xml
+++ b/server/container/guice/jpa-guice/pom.xml
@@ -159,15 +159,15 @@
<artifactId>awaitility</artifactId>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
- <artifactId>rest-assured</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.nurkiewicz.asyncretry</groupId>
<artifactId>asyncretry</artifactId>
</dependency>
<dependency>
+ <groupId>io.rest-assured</groupId>
+ <artifactId>rest-assured</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/container/guice/jpa-smtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/container/guice/jpa-smtp/pom.xml
index c332036..42f7ca5 100644
--- a/server/container/guice/jpa-smtp/pom.xml
+++ b/server/container/guice/jpa-smtp/pom.xml
@@ -73,7 +73,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
+ <groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
<exclusions>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/container/guice/memory-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/pom.xml b/server/container/guice/memory-guice/pom.xml
index e7e0c84..e24dd76 100644
--- a/server/container/guice/memory-guice/pom.xml
+++ b/server/container/guice/memory-guice/pom.xml
@@ -148,7 +148,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
+ <groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/container/guice/protocols/jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/jmap/pom.xml b/server/container/guice/protocols/jmap/pom.xml
index 0769a63..ead0455 100644
--- a/server/container/guice/protocols/jmap/pom.xml
+++ b/server/container/guice/protocols/jmap/pom.xml
@@ -67,7 +67,7 @@
<artifactId>guice-multibindings</artifactId>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
+ <groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/container/guice/protocols/jmap/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java
index fb510be..3e10b05 100644
--- a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java
+++ b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/AbstractJmapJamesServerTest.java
@@ -18,9 +18,9 @@
****************************************************************/
package org.apache.james;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static io.restassured.RestAssured.given;
+import static io.restassured.config.EncoderConfig.encoderConfig;
+import static io.restassured.config.RestAssuredConfig.newConfig;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
@@ -37,9 +37,9 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.RestAssured;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
public abstract class AbstractJmapJamesServerTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/container/jetty/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/jetty/pom.xml b/server/container/jetty/pom.xml
index bacbfab..4087769 100644
--- a/server/container/jetty/pom.xml
+++ b/server/container/jetty/pom.xml
@@ -46,15 +46,15 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
- <artifactId>rest-assured</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
+ <groupId>io.rest-assured</groupId>
+ <artifactId>rest-assured</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/container/jetty/src/test/java/org/apache/james/http/jetty/JettyHttpServerTest.java
----------------------------------------------------------------------
diff --git a/server/container/jetty/src/test/java/org/apache/james/http/jetty/JettyHttpServerTest.java b/server/container/jetty/src/test/java/org/apache/james/http/jetty/JettyHttpServerTest.java
index 17cb1f4..7f31411 100644
--- a/server/container/jetty/src/test/java/org/apache/james/http/jetty/JettyHttpServerTest.java
+++ b/server/container/jetty/src/test/java/org/apache/james/http/jetty/JettyHttpServerTest.java
@@ -19,7 +19,7 @@
package org.apache.james.http.jetty;
-import static com.jayway.restassured.RestAssured.when;
+import static io.restassured.RestAssured.when;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
@@ -41,7 +41,7 @@ import org.junit.Before;
import org.junit.Test;
import com.google.common.io.Closeables;
-import com.jayway.restassured.RestAssured;
+import io.restassured.RestAssured;
public class JettyHttpServerTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/mailet/integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml
index 48fd691..4f6e5a0 100644
--- a/server/mailet/integration-testing/pom.xml
+++ b/server/mailet/integration-testing/pom.xml
@@ -125,13 +125,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
- <artifactId>rest-assured</artifactId>
+ <groupId>com.rabbitmq</groupId>
+ <artifactId>amqp-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
+ <groupId>io.rest-assured</groupId>
+ <artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java
index aae098e..697d90e 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java
@@ -19,7 +19,7 @@
package org.apache.james.transport.mailets;
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN;
import static org.apache.james.mailets.configuration.Constants.FROM;
import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP;
@@ -57,7 +57,7 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import com.google.inject.util.Modules;
-import com.jayway.restassured.specification.RequestSpecification;
+import io.restassured.specification.RequestSpecification;
public class DlpIntegrationTest {
public static final String REPOSITORY_PREFIX = "file://var/mail/dlp/quarantine/";
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
index 45bbcd8..dd501cd 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
@@ -19,7 +19,7 @@
package org.apache.james.transport.mailets;
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN;
import static org.apache.james.mailets.configuration.Constants.IMAP_PORT;
import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP;
@@ -60,7 +60,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.awaitility.Duration;
+
+import io.restassured.specification.RequestSpecification;
public class GroupMappingTest {
private static final String DOMAIN1 = "domain1.com";
@@ -502,9 +504,11 @@ public class GroupMappingTest {
.sender(SENDER)
.recipient(GROUP_ON_DOMAIN1));
- fakeSmtp.isReceived(response -> response
- .body("[0].from", equalTo(SENDER))
- .body("[0].to[0]", equalTo(externalMail))
- .body("[0].text", equalTo(MESSAGE_CONTENT)));
+ awaitAtMostOneMinute
+ .pollDelay(Duration.ONE_HUNDRED_MILLISECONDS)
+ .until(() -> fakeSmtp.isReceived(response -> response
+ .body("[0].from", equalTo(SENDER))
+ .body("[0].to[0]", equalTo(externalMail))
+ .body("[0].text", equalTo(MESSAGE_CONTENT))));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java
index 6b755fb..e0f9e16 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java
@@ -19,7 +19,7 @@
package org.apache.james.transport.mailets;
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN;
import static org.apache.james.mailets.configuration.Constants.IMAP_PORT;
import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP;
@@ -49,7 +49,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.restassured.specification.RequestSpecification;
+import io.restassured.specification.RequestSpecification;
public class IsOverQuotaMatcherTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java
index 3bcff8c..def9542 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java
@@ -19,7 +19,7 @@
package org.apache.james.transport.mailets;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.with;
import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN;
import static org.apache.james.mailets.configuration.Constants.IMAP_PORT;
import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP;
@@ -49,7 +49,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import com.jayway.restassured.specification.RequestSpecification;
+import io.restassured.specification.RequestSpecification;
public class ToRepositoryTest {
private static final String RECIPIENT = "touser@" + DEFAULT_DOMAIN;
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
index d0ad077..986f7db 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml
@@ -138,11 +138,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
- <artifactId>rest-assured</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-guice</artifactId>
<scope>test</scope>
@@ -158,6 +153,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>io.rest-assured</groupId>
+ <artifactId>rest-assured</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraBulkOperationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraBulkOperationTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraBulkOperationTest.java
index 6d56aff..a360649 100644
--- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraBulkOperationTest.java
+++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraBulkOperationTest.java
@@ -19,7 +19,7 @@
package org.apache.james.jmap.cassandra;
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
import static org.apache.james.jmap.TestingConstants.DOMAIN;
@@ -55,8 +55,8 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.parsing.Parser;
+import io.restassured.RestAssured;
+import io.restassured.parsing.Parser;
public class CassandraBulkOperationTest {
private static final Integer NUMBER_OF_MAIL_TO_CREATE = 250;
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
index 5bd752b..0adc13f 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
@@ -118,11 +118,6 @@
<artifactId>json-path</artifactId>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
- <artifactId>rest-assured</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-guice</artifactId>
<scope>test</scope>
@@ -138,6 +133,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>io.rest-assured</groupId>
+ <artifactId>rest-assured</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
index 1f3492e..406ce41 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.james.jmap;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.with;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
import static org.hamcrest.Matchers.both;
import static org.hamcrest.Matchers.equalTo;
@@ -40,8 +40,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
public abstract class JMAPAuthenticationTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java
index 3a90326..ef61472 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java
@@ -19,7 +19,7 @@
package org.apache.james.jmap;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.with;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasKey;
@@ -33,8 +33,8 @@ import java.util.Map;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.mailbox.Role;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.specification.ResponseSpecification;
+import io.restassured.builder.ResponseSpecBuilder;
+import io.restassured.specification.ResponseSpecification;
public class JmapCommonRequests {
private static final String NAME = "[0][0]";
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java
index 7194ad4..b0b9af6 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java
@@ -19,8 +19,8 @@
package org.apache.james.jmap;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.with;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.jmapRequestSpecBuilder;
@@ -42,7 +42,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.jayway.restassured.RestAssured;
+import io.restassured.RestAssured;
public abstract class ProvisioningTest {
private static final String NAME = "[0][0]";
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java
index 9949c61..3b756fd 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/TestingConstants.java
@@ -19,8 +19,8 @@
package org.apache.james.jmap;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static io.restassured.config.EncoderConfig.encoderConfig;
+import static io.restassured.config.RestAssuredConfig.newConfig;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit;
@@ -28,8 +28,8 @@ import java.util.concurrent.TimeUnit;
import com.jayway.awaitility.Awaitility;
import com.jayway.awaitility.Duration;
import com.jayway.awaitility.core.ConditionFactory;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
public interface TestingConstants {
Duration slowPacedPollInterval = Duration.ONE_HUNDRED_MILLISECONDS;
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
index 3148050..36d1e02 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java
@@ -19,8 +19,8 @@
package org.apache.james.jmap;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.with;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
@@ -53,7 +53,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.jayway.restassured.RestAssured;
+import io.restassured.RestAssured;
public abstract class VacationIntegrationTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
index d91876a..1befee7 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/ForwardIntegrationTest.java
@@ -19,8 +19,8 @@
package org.apache.james.jmap.methods.integration;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.with;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapCommonRequests.getOutboxId;
import static org.apache.james.jmap.JmapCommonRequests.isAnyMessageFoundInRecipientsMailboxes;
@@ -56,8 +56,8 @@ import org.junit.Rule;
import org.junit.Test;
import com.jayway.awaitility.Duration;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.specification.RequestSpecification;
+import io.restassured.RestAssured;
+import io.restassured.specification.RequestSpecification;
public abstract class ForwardIntegrationTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
index 9cbc885..05e3d45 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java
@@ -19,7 +19,7 @@
package org.apache.james.jmap.methods.integration;
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.ALICE;
@@ -83,7 +83,7 @@ import org.junit.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-import com.jayway.restassured.RestAssured;
+import io.restassured.RestAssured;
public abstract class GetMailboxesMethodTest {
public static final String READ = String.valueOf(Right.Read.asCharacter());
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
index 8780771..f1643a4 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java
@@ -19,7 +19,7 @@
package org.apache.james.jmap.methods.integration;
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.ALICE;
@@ -76,7 +76,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.jayway.restassured.RestAssured;
+import io.restassured.RestAssured;
public abstract class GetMessageListMethodTest {
public static final int LIMIT_TO_3_MESSAGES = 3;
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
index 0fe102f..86a2859 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
@@ -19,7 +19,7 @@
package org.apache.james.jmap.methods.integration;
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.ALICE;
@@ -48,8 +48,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
public abstract class GetVacationResponseTest {
public static final String SUBJECT = "subject";
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java
index 420a18e..ceae1b3 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/QuotaMailingTest.java
@@ -19,8 +19,8 @@
package org.apache.james.jmap.methods.integration;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.with;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapCommonRequests.getOutboxId;
import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsForAccount;
@@ -54,8 +54,8 @@ import org.junit.Before;
import org.junit.Test;
import com.google.common.base.Strings;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.parsing.Parser;
+import io.restassured.RestAssured;
+import io.restassured.parsing.Parser;
public abstract class QuotaMailingTest {
private static final String HOMER = "homer@" + DOMAIN;
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
index e272ea7..a3bf893 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SendMDNMethodTest.java
@@ -19,8 +19,8 @@
package org.apache.james.jmap.methods.integration;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.with;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapCommonRequests.getInboxId;
import static org.apache.james.jmap.JmapCommonRequests.getOutboxId;
@@ -65,8 +65,8 @@ import org.junit.Before;
import org.junit.Test;
import com.google.common.collect.Iterables;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.parsing.Parser;
+import io.restassured.RestAssured;
+import io.restassured.parsing.Parser;
public abstract class SendMDNMethodTest {
private static final String HOMER = "homer@" + DOMAIN;
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
index dae7e9e..c0ce1e7 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
@@ -19,8 +19,8 @@
package org.apache.james.jmap.methods.integration;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.with;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
@@ -68,7 +68,7 @@ import org.junit.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-import com.jayway.restassured.RestAssured;
+import io.restassured.RestAssured;
public abstract class SetMailboxesMethodTest {
@@ -564,7 +564,7 @@ public abstract class SetMailboxesMethodTest {
with()
.header("Authorization", accessToken.serialize())
.body(requestBody)
- .then()
+ .when()
.post("/jmap");
given()
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
index 24ba7fd..22ca5f8 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
@@ -19,10 +19,10 @@
package org.apache.james.jmap.methods.integration;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.with;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.with;
+import static io.restassured.config.EncoderConfig.encoderConfig;
+import static io.restassured.config.RestAssuredConfig.newConfig;
import static org.apache.james.jmap.JmapCommonRequests.getDraftId;
import static org.apache.james.jmap.JmapCommonRequests.getInboxId;
import static org.apache.james.jmap.JmapCommonRequests.getMailboxId;
@@ -123,10 +123,10 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.common.io.ByteStreams;
import com.jayway.awaitility.Duration;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.parsing.Parser;
+import io.restassured.RestAssured;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
+import io.restassured.parsing.Parser;
public abstract class SetMessagesMethodTest {
private static final String FORWARDED = "$Forwarded";
@@ -3913,7 +3913,7 @@ public abstract class SetMessagesMethodTest {
return with()
.header("Authorization", accessToken.serialize())
.contentType(attachment.getType())
- .content(attachment.getStream())
+ .body(attachment.getStream())
.post("/upload")
.then()
.extract()
@@ -3926,7 +3926,7 @@ public abstract class SetMessagesMethodTest {
return with()
.header("Authorization", accessToken.serialize())
.contentType(attachment.getType())
- .content(new String(IOUtils.toByteArray(attachment.getStream()), StandardCharsets.UTF_8))
+ .body(new String(IOUtils.toByteArray(attachment.getStream()), StandardCharsets.UTF_8))
.post("/upload")
.then()
.extract()
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java
index eb01780..31aa417 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesOutboxFlagUpdateTest.java
@@ -19,10 +19,10 @@
package org.apache.james.jmap.methods.integration;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.with;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.with;
+import static io.restassured.config.EncoderConfig.encoderConfig;
+import static io.restassured.config.RestAssuredConfig.newConfig;
import static org.apache.james.jmap.JmapCommonRequests.getOutboxId;
import static org.apache.james.jmap.JmapCommonRequests.getSetMessagesUpdateOKResponseAssertions;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
@@ -55,10 +55,10 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.parsing.Parser;
+import io.restassured.RestAssured;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
+import io.restassured.parsing.Parser;
public abstract class SetMessagesOutboxFlagUpdateTest {
private static final String USERNAME = "username@" + DOMAIN;
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
index a5c5ad8..46f5067 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
@@ -19,7 +19,7 @@
package org.apache.james.jmap.methods.integration;
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
@@ -45,8 +45,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
public abstract class SetVacationResponseTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java
index 8a2a62c..c07e0ec 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java
@@ -19,10 +19,10 @@
package org.apache.james.jmap.methods.integration;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.with;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.with;
+import static io.restassured.config.EncoderConfig.encoderConfig;
+import static io.restassured.config.RestAssuredConfig.newConfig;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapURIBuilder.baseUri;
import static org.apache.james.jmap.TestingConstants.ARGUMENTS;
@@ -47,10 +47,10 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import com.jayway.awaitility.Duration;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.parsing.Parser;
+import io.restassured.RestAssured;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
+import io.restassured.parsing.Parser;
public interface SpamAssassinContract {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
index aab80ae..db2c09c 100644
--- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml
@@ -107,11 +107,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
- <artifactId>rest-assured</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-guice</artifactId>
<scope>test</scope>
@@ -127,6 +122,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>io.rest-assured</groupId>
+ <artifactId>rest-assured</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml
index 9e4873a..eeb3252 100644
--- a/server/protocols/jmap/pom.xml
+++ b/server/protocols/jmap/pom.xml
@@ -208,15 +208,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
- <artifactId>rest-assured</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
</dependency>
<dependency>
+ <groupId>io.rest-assured</groupId>
+ <artifactId>rest-assured</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java
index 1c753fd..666bcc3 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java
@@ -18,9 +18,9 @@
****************************************************************/
package org.apache.james.jmap;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static io.restassured.RestAssured.given;
+import static io.restassured.config.EncoderConfig.encoderConfig;
+import static io.restassured.config.RestAssuredConfig.newConfig;
import static org.hamcrest.Matchers.equalTo;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
@@ -44,9 +44,9 @@ import org.junit.Test;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.RestAssured;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
public class JMAPServletTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin-integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/pom.xml
index ae10057..fdcb4bd 100644
--- a/server/protocols/webadmin-integration-test/pom.xml
+++ b/server/protocols/webadmin-integration-test/pom.xml
@@ -91,7 +91,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
+ <groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java
index 116f849..fc3a958 100644
--- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java
@@ -19,7 +19,7 @@
package org.apache.james.webadmin.integration;
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
import static org.apache.james.webadmin.Constants.SEPARATOR;
import static org.assertj.core.api.Assertions.assertThat;
@@ -43,8 +43,7 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.response.Header;
+import io.restassured.RestAssured;
public class JwtFilterIntegrationTest {
@@ -95,7 +94,7 @@ public class JwtFilterIntegrationTest {
@Test
public void jwtAuthenticationShouldWork() throws Exception {
given()
- .header(new Header("Authorization", "Bearer " + VALID_TOKEN_ADMIN_TRUE))
+ .header("Authorization", "Bearer " + VALID_TOKEN_ADMIN_TRUE)
.when()
.put(SPECIFIC_DOMAIN)
.then()
@@ -108,7 +107,7 @@ public class JwtFilterIntegrationTest {
@Test
public void jwtShouldRejectNonAdminRequests() throws Exception {
given()
- .header(new Header("Authorization", "Bearer " + VALID_TOKEN_ADMIN_FALSE))
+ .header("Authorization", "Bearer " + VALID_TOKEN_ADMIN_FALSE)
.when()
.put(SPECIFIC_DOMAIN)
.then()
@@ -121,7 +120,7 @@ public class JwtFilterIntegrationTest {
@Test
public void jwtShouldRejectInvalidRequests() throws Exception {
given()
- .header(new Header("Authorization", "Bearer invalid"))
+ .header("Authorization", "Bearer invalid")
.when()
.put(SPECIFIC_DOMAIN)
.then()
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
index b385f6f..b706323 100644
--- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java
@@ -19,9 +19,9 @@
package org.apache.james.webadmin.integration;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static io.restassured.RestAssured.with;
import static org.apache.james.webadmin.Constants.JSON_CONTENT_TYPE;
import static org.apache.james.webadmin.Constants.SEPARATOR;
import static org.assertj.core.api.Assertions.assertThat;
@@ -53,7 +53,7 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import com.jayway.restassured.RestAssured;
+import io.restassured.RestAssured;
public class WebAdminServerIntegrationTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-cassandra/pom.xml b/server/protocols/webadmin/webadmin-cassandra/pom.xml
index 8bb1a2e..27f6450 100644
--- a/server/protocols/webadmin/webadmin-cassandra/pom.xml
+++ b/server/protocols/webadmin/webadmin-cassandra/pom.xml
@@ -53,7 +53,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
+ <groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
index b3f1fc9..1df072f 100644
--- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java
@@ -19,9 +19,9 @@
package org.apache.james.webadmin.routes;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static io.restassured.RestAssured.with;
import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.is;
@@ -56,8 +56,8 @@ import org.junit.Ignore;
import org.junit.Test;
import com.google.common.collect.ImmutableMap;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
public class CassandraMigrationRoutesTest {
private static final SchemaVersion LATEST_VERSION = new SchemaVersion(3);
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-core/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml
index 99f8b14..3755875 100644
--- a/server/protocols/webadmin/webadmin-core/pom.xml
+++ b/server/protocols/webadmin/webadmin-core/pom.xml
@@ -83,15 +83,15 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
- <artifactId>rest-assured</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.sparkjava</groupId>
<artifactId>spark-core</artifactId>
</dependency>
<dependency>
+ <groupId>io.rest-assured</groupId>
+ <artifactId>rest-assured</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jaxrs</artifactId>
<version>1.5.13</version>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
index 8d5534a..7a984eb 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java
@@ -19,8 +19,8 @@
package org.apache.james.webadmin;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static io.restassured.config.EncoderConfig.encoderConfig;
+import static io.restassured.config.RestAssuredConfig.newConfig;
import java.nio.charset.StandardCharsets;
@@ -29,8 +29,8 @@ import org.apache.james.util.Port;
import org.apache.james.webadmin.authentication.NoAuthenticationFilter;
import com.google.common.collect.ImmutableSet;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
public class WebAdminUtils {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
index ffdb07a..943e15c 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/ErrorRoutesTest.java
@@ -19,7 +19,7 @@
package org.apache.james.webadmin.routes;
-import static com.jayway.restassured.RestAssured.when;
+import static io.restassured.RestAssured.when;
import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.apache.james.webadmin.routes.ErrorRoutes.INTERNAL_SERVER_ERROR;
import static org.apache.james.webadmin.routes.ErrorRoutes.JSON_EXTRACT_EXCEPTION;
@@ -38,7 +38,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.jayway.restassured.RestAssured;
+import io.restassured.RestAssured;
public class ErrorRoutesTest {
private static final String NOT_FOUND = "notFound";
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
index 8964c87..b65a84f 100644
--- a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/routes/TasksRoutesTest.java
@@ -19,9 +19,9 @@
package org.apache.james.webadmin.routes;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static io.restassured.RestAssured.with;
import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.hasSize;
@@ -44,7 +44,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.jayway.restassured.RestAssured;
+import io.restassured.RestAssured;
public class TasksRoutesTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-data/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml
index 70a25a5..69bbd37 100644
--- a/server/protocols/webadmin/webadmin-data/pom.xml
+++ b/server/protocols/webadmin/webadmin-data/pom.xml
@@ -83,7 +83,7 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
+ <groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
index 49b6614..b1e51a6 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
@@ -19,10 +19,10 @@
package org.apache.james.webadmin.routes;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.requestSpecification;
-import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.requestSpecification;
+import static io.restassured.RestAssured.when;
+import static io.restassured.RestAssured.with;
import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
import static org.apache.james.webadmin.Constants.JSON_CONTENT_TYPE;
import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
@@ -49,9 +49,9 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.specification.RequestSpecification;
class DLPConfigurationRoutesTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
index 0d36762..a1646c3 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java
@@ -19,11 +19,11 @@
package org.apache.james.webadmin.routes;
-import static com.jayway.restassured.RestAssured.delete;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.put;
-import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.delete;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.put;
+import static io.restassured.RestAssured.when;
+import static io.restassured.RestAssured.with;
import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
@@ -59,11 +59,11 @@ import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.filter.log.LogDetail;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.response.Response;
-import com.jayway.restassured.specification.RequestSpecification;
+import io.restassured.RestAssured;
+import io.restassured.filter.log.LogDetail;
+import io.restassured.http.ContentType;
+import io.restassured.response.Response;
+import io.restassured.specification.RequestSpecification;
class DomainMappingsRoutesTest {
private RecipientRewriteTable recipientRewriteTable;
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
index 7c83988..a243f56 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java
@@ -19,9 +19,9 @@
package org.apache.james.webadmin.routes;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static io.restassured.RestAssured.with;
import static org.apache.james.webadmin.Constants.SEPARATOR;
import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
@@ -49,8 +49,8 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
public class DomainsRoutesTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
index 41fdb95..558bf5c 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java
@@ -19,9 +19,9 @@
package org.apache.james.webadmin.routes;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static io.restassured.RestAssured.with;
import static org.apache.james.webadmin.Constants.SEPARATOR;
import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
@@ -59,9 +59,9 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.filter.log.LogDetail;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.RestAssured;
+import io.restassured.filter.log.LogDetail;
+import io.restassured.http.ContentType;
class ForwardRoutesTest {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[18/29] james-project git commit: JAMES-2488 update jasypt (crypto)
Posted by bt...@apache.org.
JAMES-2488 update jasypt (crypto)
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a35e4b25
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a35e4b25
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a35e4b25
Branch: refs/heads/master
Commit: a35e4b25df5f5d6c90b45f279c31ca7b8089e1d6
Parents: 34c89c2
Author: duc <dt...@linagora.com>
Authored: Fri Jul 20 18:14:40 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:24 2018 +0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/a35e4b25/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b518ab4..140d1e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -663,7 +663,7 @@
<xml-apis.version>1.3.04</xml-apis.version>
<geronimo-activation-spec.version>1.1</geronimo-activation-spec.version>
<mockito-core.version>1.9.0</mockito-core.version>
- <jasypt.version>1.9.0</jasypt.version>
+ <jasypt.version>1.9.2</jasypt.version>
<jackson-databinding.version>2.6.3</jackson-databinding.version>
<guice.version>4.1.0</guice.version>
<jackrabbit-core.version>2.5.2</jackrabbit-core.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[10/29] james-project git commit: JAMES-2487 Update io.cucumber to
2.4.0
Posted by bt...@apache.org.
JAMES-2487 Update io.cucumber to 2.4.0
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/091face8
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/091face8
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/091face8
Branch: refs/heads/master
Commit: 091face8a10476622b9ece73eb6e6cd39a743ac8
Parents: 8ccdad3
Author: Gautier DI FOLCO <gd...@linagora.com>
Authored: Fri Jul 20 12:09:20 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:34:52 2018 +0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/091face8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 775a105..105a137 100644
--- a/pom.xml
+++ b/pom.xml
@@ -621,7 +621,7 @@
<geronimo-annotation-spec.version>1.0.1</geronimo-annotation-spec.version>
<spring-osgi-extender.version>1.2.1</spring-osgi-extender.version>
<org.osgi.core.version>5.0.0</org.osgi.core.version>
- <cucumber.version>2.2.0</cucumber.version>
+ <cucumber.version>2.4.0</cucumber.version>
<exam.version>2.6.0</exam.version>
<url.version>1.4.0</url.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[06/29] james-project git commit: JAMES-2496 don't use
project.groupId for dep mgnt as it's resolved in children pom
Posted by bt...@apache.org.
JAMES-2496 don't use project.groupId for dep mgnt as it's resolved in children pom
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/44583eb1
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/44583eb1
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/44583eb1
Branch: refs/heads/master
Commit: 44583eb1e4b5ca81b9673e1e8e63620589472dc9
Parents: 69b5732
Author: Matthieu Baechler <ma...@apache.org>
Authored: Tue Jul 24 09:25:34 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:28:35 2018 +0700
----------------------------------------------------------------------
backends-common/cassandra/pom.xml | 8 +-
backends-common/elasticsearch/pom.xml | 4 +-
core/pom.xml | 6 +-
event-sourcing/event-sourcing-core/pom.xml | 6 +-
event-sourcing/event-store-api/pom.xml | 4 +-
event-sourcing/event-store-cassandra/pom.xml | 14 +-
event-sourcing/event-store-memory/pom.xml | 10 +-
examples/custom-mailets/pom.xml | 4 +-
mailbox/api/pom.xml | 8 +-
mailbox/backup/pom.xml | 8 +-
mailbox/caching/pom.xml | 4 +-
mailbox/cassandra/pom.xml | 24 +-
mailbox/elasticsearch/pom.xml | 22 +-
mailbox/hbase/pom.xml | 6 +-
mailbox/jcr/pom.xml | 8 +-
mailbox/jpa/pom.xml | 14 +-
mailbox/kafka/pom.xml | 8 +-
mailbox/lucene/pom.xml | 16 +-
mailbox/maildir/pom.xml | 12 +-
mailbox/memory/pom.xml | 10 +-
mailbox/plugin/quota-mailing-cassandra/pom.xml | 26 +-
mailbox/plugin/quota-mailing-memory/pom.xml | 22 +-
mailbox/plugin/quota-mailing/pom.xml | 26 +-
.../plugin/quota-search-elasticsearch/pom.xml | 22 +-
mailbox/plugin/quota-search-scanning/pom.xml | 16 +-
mailbox/plugin/quota-search/pom.xml | 12 +-
mailbox/plugin/spamassassin/pom.xml | 8 +-
mailbox/scanning-search/pom.xml | 12 +-
mailbox/spring/pom.xml | 20 +-
mailbox/store/pom.xml | 18 +-
mailbox/tika/pom.xml | 6 +-
mailbox/tool/pom.xml | 16 +-
mailbox/zoo-seq-provider/pom.xml | 4 +-
mailet/ai/pom.xml | 4 +-
mailet/base/pom.xml | 10 +-
mailet/crypto/pom.xml | 6 +-
mailet/icalendar/pom.xml | 6 +-
mailet/mailetdocs-maven-plugin/pom.xml | 2 +-
mailet/pom.xml | 2 +-
mailet/standard/pom.xml | 14 +-
mdn/pom.xml | 6 +-
metrics/metrics-dropwizard/pom.xml | 6 +-
metrics/metrics-logger/pom.xml | 2 +-
metrics/pom.xml | 54 ---
mpt/antlib/pom.xml | 4 +-
mpt/app/pom.xml | 6 +-
mpt/core/pom.xml | 2 +-
mpt/impl/imap-mailbox/cassandra/pom.xml | 12 +-
mpt/impl/imap-mailbox/core/pom.xml | 16 +-
mpt/impl/imap-mailbox/cyrus/pom.xml | 2 +-
mpt/impl/imap-mailbox/elasticsearch/pom.xml | 18 +-
mpt/impl/imap-mailbox/external-james/pom.xml | 6 +-
mpt/impl/imap-mailbox/hbase/pom.xml | 6 +-
mpt/impl/imap-mailbox/inmemory/pom.xml | 8 +-
mpt/impl/imap-mailbox/jcr/pom.xml | 4 +-
mpt/impl/imap-mailbox/jpa/pom.xml | 10 +-
mpt/impl/imap-mailbox/lucenesearch/pom.xml | 16 +-
mpt/impl/imap-mailbox/maildir/pom.xml | 4 +-
mpt/impl/imap-mailbox/pom.xml | 20 +-
mpt/impl/managesieve/cassandra/pom.xml | 8 +-
mpt/impl/managesieve/core/pom.xml | 6 +-
mpt/impl/managesieve/file/pom.xml | 6 +-
mpt/impl/managesieve/pom.xml | 6 +-
mpt/impl/smtp/cassandra/pom.xml | 16 +-
mpt/impl/smtp/core/pom.xml | 12 +-
mpt/impl/smtp/pom.xml | 4 +-
mpt/mavenplugin/pom.xml | 4 +-
pom.xml | 366 ++++++++++---------
protocols/api/pom.xml | 3 +-
protocols/imap/pom.xml | 73 ++--
protocols/lmtp/pom.xml | 13 +-
protocols/managesieve/pom.xml | 19 +-
protocols/netty/pom.xml | 13 +-
protocols/pom.xml | 90 +----
protocols/pop3/pom.xml | 9 +-
protocols/smtp/pom.xml | 27 +-
server/app/pom.xml | 84 ++---
server/blob/blob-api/pom.xml | 2 +-
server/blob/blob-cassandra/pom.xml | 10 +-
server/container/cli-integration/pom.xml | 10 +-
server/container/cli/pom.xml | 8 +-
server/container/core/pom.xml | 16 +-
server/container/guice/cassandra-guice/pom.xml | 82 ++---
.../guice/cassandra-ldap-guice/pom.xml | 26 +-
server/container/guice/configuration/pom.xml | 6 +-
server/container/guice/custom-mailets/pom.xml | 4 +-
.../container/guice/es-metric-reporter/pom.xml | 6 +-
server/container/guice/guice-common/pom.xml | 58 +--
server/container/guice/guice-utils/pom.xml | 4 +-
server/container/guice/jmx/pom.xml | 16 +-
server/container/guice/jpa-common-guice/pom.xml | 4 +-
server/container/guice/jpa-guice/pom.xml | 50 +--
server/container/guice/jpa-smtp-common/pom.xml | 18 +-
server/container/guice/jpa-smtp-mariadb/pom.xml | 6 +-
server/container/guice/jpa-smtp/pom.xml | 8 +-
.../guice/mailbox-plugin-spamassassin/pom.xml | 4 +-
server/container/guice/mailbox/pom.xml | 8 +-
server/container/guice/mailet/pom.xml | 12 +-
server/container/guice/memory-guice/pom.xml | 50 +--
server/container/guice/pom.xml | 46 +--
server/container/guice/protocols/imap/pom.xml | 6 +-
server/container/guice/protocols/jmap/pom.xml | 12 +-
server/container/guice/protocols/lmtp/pom.xml | 4 +-
.../guice/protocols/managedsieve/pom.xml | 8 +-
server/container/guice/protocols/netty/pom.xml | 4 +-
server/container/guice/protocols/pop/pom.xml | 4 +-
server/container/guice/protocols/smtp/pom.xml | 4 +-
.../guice/protocols/webadmin-cassandra/pom.xml | 4 +-
.../guice/protocols/webadmin-data/pom.xml | 6 +-
.../guice/protocols/webadmin-mailbox/pom.xml | 6 +-
.../guice/protocols/webadmin-mailqueue/pom.xml | 6 +-
.../protocols/webadmin-mailrepository/pom.xml | 6 +-
.../guice/protocols/webadmin-swagger/pom.xml | 6 +-
.../container/guice/protocols/webadmin/pom.xml | 4 +-
server/container/jetty/pom.xml | 2 +-
server/container/mailbox-adapter/pom.xml | 24 +-
.../metrics/metrics-es-reporter/pom.xml | 8 +-
server/container/spring/pom.xml | 24 +-
server/container/util-java8/pom.xml | 2 +-
server/container/util/pom.xml | 4 +-
server/data/data-api/pom.xml | 8 +-
server/data/data-cassandra/pom.xml | 22 +-
server/data/data-file/pom.xml | 24 +-
server/data/data-hbase/pom.xml | 14 +-
server/data/data-jcr/pom.xml | 10 +-
server/data/data-jdbc/pom.xml | 22 +-
server/data/data-jmap-cassandra/pom.xml | 8 +-
server/data/data-jmap/pom.xml | 4 +-
server/data/data-jpa/pom.xml | 18 +-
.../data/data-ldap-integration-testing/pom.xml | 6 +-
server/data/data-ldap/pom.xml | 6 +-
server/data/data-library/pom.xml | 18 +-
server/data/data-memory/pom.xml | 14 +-
server/dns-service/dnsservice-dnsjava/pom.xml | 6 +-
server/dns-service/dnsservice-library/pom.xml | 6 +-
server/karaf/distribution/pom.xml | 2 +-
server/karaf/integration/pom.xml | 12 +-
server/mailet/integration-testing/pom.xml | 28 +-
server/mailet/mailetcontainer-api/pom.xml | 2 +-
server/mailet/mailetcontainer-camel/pom.xml | 32 +-
server/mailet/mailets/pom.xml | 68 ++--
.../mailrepository/mailrepository-api/pom.xml | 8 +-
.../mailrepository-cassandra/pom.xml | 18 +-
.../mailrepository-memory/pom.xml | 8 +-
server/protocols/fetchmail/pom.xml | 14 +-
.../cassandra-jmap-integration-testing/pom.xml | 36 +-
.../jmap-integration-testing-common/pom.xml | 28 +-
.../memory-jmap-integration-testing/pom.xml | 24 +-
.../protocols/jmap-integration-testing/pom.xml | 2 +-
server/protocols/jmap/pom.xml | 54 +--
server/protocols/protocols-imap4/pom.xml | 14 +-
server/protocols/protocols-library/pom.xml | 12 +-
server/protocols/protocols-lmtp/pom.xml | 28 +-
server/protocols/protocols-managesieve/pom.xml | 10 +-
server/protocols/protocols-pop3/pom.xml | 34 +-
server/protocols/protocols-smtp/pom.xml | 54 +--
.../protocols/webadmin-integration-test/pom.xml | 20 +-
.../webadmin/webadmin-cassandra/pom.xml | 8 +-
server/protocols/webadmin/webadmin-core/pom.xml | 12 +-
server/protocols/webadmin/webadmin-data/pom.xml | 18 +-
.../protocols/webadmin/webadmin-mailbox/pom.xml | 34 +-
.../webadmin/webadmin-mailqueue/pom.xml | 14 +-
.../webadmin/webadmin-mailrepository/pom.xml | 22 +-
.../protocols/webadmin/webadmin-swagger/pom.xml | 2 +-
server/queue/queue-activemq/pom.xml | 20 +-
server/queue/queue-api/pom.xml | 12 +-
server/queue/queue-file/pom.xml | 18 +-
server/queue/queue-jms/pom.xml | 22 +-
server/queue/queue-memory/pom.xml | 12 +-
server/queue/queue-rabbitmq/pom.xml | 4 +-
server/task/pom.xml | 2 +-
server/testing/pom.xml | 6 +-
172 files changed, 1380 insertions(+), 1527 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/backends-common/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/pom.xml b/backends-common/cassandra/pom.xml
index 7fad091..ca97a34 100644
--- a/backends-common/cassandra/pom.xml
+++ b/backends-common/cassandra/pom.xml
@@ -36,19 +36,19 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-task</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/backends-common/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/elasticsearch/pom.xml b/backends-common/elasticsearch/pom.xml
index f13ed9b..73dad85 100644
--- a/backends-common/elasticsearch/pom.xml
+++ b/backends-common/elasticsearch/pom.xml
@@ -29,11 +29,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 7085c67..600c567 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -32,18 +32,18 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/event-sourcing/event-sourcing-core/pom.xml
----------------------------------------------------------------------
diff --git a/event-sourcing/event-sourcing-core/pom.xml b/event-sourcing/event-sourcing-core/pom.xml
index ba6c327..559d3c0 100644
--- a/event-sourcing/event-sourcing-core/pom.xml
+++ b/event-sourcing/event-sourcing-core/pom.xml
@@ -33,15 +33,15 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-pojo</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-pojo</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/event-sourcing/event-store-api/pom.xml
----------------------------------------------------------------------
diff --git a/event-sourcing/event-store-api/pom.xml b/event-sourcing/event-store-api/pom.xml
index 942e5ca..cf82368 100644
--- a/event-sourcing/event-store-api/pom.xml
+++ b/event-sourcing/event-store-api/pom.xml
@@ -33,11 +33,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-pojo</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-pojo</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/event-sourcing/event-store-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/event-sourcing/event-store-cassandra/pom.xml b/event-sourcing/event-store-cassandra/pom.xml
index 5bfb682..a07ff79 100644
--- a/event-sourcing/event-store-cassandra/pom.xml
+++ b/event-sourcing/event-store-cassandra/pom.xml
@@ -33,38 +33,38 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-pojo</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/event-sourcing/event-store-memory/pom.xml
----------------------------------------------------------------------
diff --git a/event-sourcing/event-store-memory/pom.xml b/event-sourcing/event-store-memory/pom.xml
index 29afb3d..c1c703b 100644
--- a/event-sourcing/event-store-memory/pom.xml
+++ b/event-sourcing/event-store-memory/pom.xml
@@ -33,28 +33,28 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-pojo</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/examples/custom-mailets/pom.xml
----------------------------------------------------------------------
diff --git a/examples/custom-mailets/pom.xml b/examples/custom-mailets/pom.xml
index e0caa5d..ddda2cb 100644
--- a/examples/custom-mailets/pom.xml
+++ b/examples/custom-mailets/pom.xml
@@ -11,11 +11,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/api/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/api/pom.xml b/mailbox/api/pom.xml
index 8d76a45..0461346 100644
--- a/mailbox/api/pom.xml
+++ b/mailbox/api/pom.xml
@@ -33,20 +33,20 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/backup/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/backup/pom.xml b/mailbox/backup/pom.xml
index be2b75c..b412882 100644
--- a/mailbox/backup/pom.xml
+++ b/mailbox/backup/pom.xml
@@ -34,21 +34,21 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/caching/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/caching/pom.xml b/mailbox/caching/pom.xml
index fd468c0..68dfd62 100644
--- a/mailbox/caching/pom.xml
+++ b/mailbox/caching/pom.xml
@@ -33,11 +33,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml
index 5560191..81f179f 100644
--- a/mailbox/cassandra/pom.xml
+++ b/mailbox/cassandra/pom.xml
@@ -33,61 +33,61 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>blob-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>blob-cassandra</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-task</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/pom.xml b/mailbox/elasticsearch/pom.xml
index 4075a24..c6b2dfd 100644
--- a/mailbox/elasticsearch/pom.xml
+++ b/mailbox/elasticsearch/pom.xml
@@ -33,59 +33,59 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-tika</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/hbase/pom.xml b/mailbox/hbase/pom.xml
index fbd2dc2..3b6af03 100644
--- a/mailbox/hbase/pom.xml
+++ b/mailbox/hbase/pom.xml
@@ -33,17 +33,17 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/jcr/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/jcr/pom.xml b/mailbox/jcr/pom.xml
index d9bac47..eb1a958 100644
--- a/mailbox/jcr/pom.xml
+++ b/mailbox/jcr/pom.xml
@@ -33,21 +33,21 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/jpa/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/jpa/pom.xml b/mailbox/jpa/pom.xml
index 64e73fd..f3c696d 100644
--- a/mailbox/jpa/pom.xml
+++ b/mailbox/jpa/pom.xml
@@ -33,37 +33,37 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/kafka/pom.xml b/mailbox/kafka/pom.xml
index 087e2a6..9e035ee 100644
--- a/mailbox/kafka/pom.xml
+++ b/mailbox/kafka/pom.xml
@@ -31,21 +31,21 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/lucene/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/lucene/pom.xml b/mailbox/lucene/pom.xml
index c730350..89c28a3 100644
--- a/mailbox/lucene/pom.xml
+++ b/mailbox/lucene/pom.xml
@@ -33,42 +33,42 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/maildir/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/maildir/pom.xml b/mailbox/maildir/pom.xml
index bc1932b..4961808 100644
--- a/mailbox/maildir/pom.xml
+++ b/mailbox/maildir/pom.xml
@@ -33,31 +33,31 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/memory/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/memory/pom.xml b/mailbox/memory/pom.xml
index 48ff590..6162f1d 100644
--- a/mailbox/memory/pom.xml
+++ b/mailbox/memory/pom.xml
@@ -33,27 +33,27 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/plugin/quota-mailing-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-mailing-cassandra/pom.xml b/mailbox/plugin/quota-mailing-cassandra/pom.xml
index 659b043..e0a85d4 100644
--- a/mailbox/plugin/quota-mailing-cassandra/pom.xml
+++ b/mailbox/plugin/quota-mailing-cassandra/pom.xml
@@ -33,70 +33,70 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-cassandra</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-mailing</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-mailing</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/plugin/quota-mailing-memory/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-mailing-memory/pom.xml b/mailbox/plugin/quota-mailing-memory/pom.xml
index 7807951..f28cd55 100644
--- a/mailbox/plugin/quota-mailing-memory/pom.xml
+++ b/mailbox/plugin/quota-mailing-memory/pom.xml
@@ -33,60 +33,60 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-memory</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-memory</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-mailing</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-mailing</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/plugin/quota-mailing/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-mailing/pom.xml b/mailbox/plugin/quota-mailing/pom.xml
index 640a85d..a947bcb 100644
--- a/mailbox/plugin/quota-mailing/pom.xml
+++ b/mailbox/plugin/quota-mailing/pom.xml
@@ -33,62 +33,62 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/plugin/quota-search-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-search-elasticsearch/pom.xml b/mailbox/plugin/quota-search-elasticsearch/pom.xml
index 3cd062e..2441a9c 100644
--- a/mailbox/plugin/quota-search-elasticsearch/pom.xml
+++ b/mailbox/plugin/quota-search-elasticsearch/pom.xml
@@ -33,58 +33,58 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-es</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-search</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-search</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/plugin/quota-search-scanning/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-search-scanning/pom.xml b/mailbox/plugin/quota-search-scanning/pom.xml
index 039b968..4151107 100644
--- a/mailbox/plugin/quota-search-scanning/pom.xml
+++ b/mailbox/plugin/quota-search-scanning/pom.xml
@@ -33,44 +33,44 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-search</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-quota-search</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/plugin/quota-search/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-search/pom.xml b/mailbox/plugin/quota-search/pom.xml
index a2cac33..b2139f2 100644
--- a/mailbox/plugin/quota-search/pom.xml
+++ b/mailbox/plugin/quota-search/pom.xml
@@ -33,32 +33,32 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/plugin/spamassassin/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/plugin/spamassassin/pom.xml b/mailbox/plugin/spamassassin/pom.xml
index 9710aa0..ec8f1c5 100644
--- a/mailbox/plugin/spamassassin/pom.xml
+++ b/mailbox/plugin/spamassassin/pom.xml
@@ -33,21 +33,21 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/scanning-search/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/scanning-search/pom.xml b/mailbox/scanning-search/pom.xml
index faef9be..3836d38 100644
--- a/mailbox/scanning-search/pom.xml
+++ b/mailbox/scanning-search/pom.xml
@@ -33,32 +33,32 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/spring/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/spring/pom.xml b/mailbox/spring/pom.xml
index 944e7b5..1bbe6ac 100644
--- a/mailbox/spring/pom.xml
+++ b/mailbox/spring/pom.xml
@@ -33,46 +33,46 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<!-- TODO: enable after fix maibox-hbase -->
<!--<dependency>-->
- <!--<groupId>${project.groupId}</groupId>-->
+ <!--<groupId>${james.groupId}</groupId>-->
<!--<artifactId>apache-james-mailbox-hbase</artifactId>-->
<!--</dependency>-->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-jcr</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-jpa</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-lucene</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-maildir</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-tool</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/store/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/store/pom.xml b/mailbox/store/pom.xml
index ab520b0..aafca39 100644
--- a/mailbox/store/pom.xml
+++ b/mailbox/store/pom.xml
@@ -33,42 +33,42 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-james-utils</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-mdn</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/tika/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml
index d241d04..3d22cd7 100644
--- a/mailbox/tika/pom.xml
+++ b/mailbox/tika/pom.xml
@@ -33,17 +33,17 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/tool/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/tool/pom.xml b/mailbox/tool/pom.xml
index 1b3e07a..b5525d1 100644
--- a/mailbox/tool/pom.xml
+++ b/mailbox/tool/pom.xml
@@ -33,41 +33,41 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-jpa</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailbox/zoo-seq-provider/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/zoo-seq-provider/pom.xml b/mailbox/zoo-seq-provider/pom.xml
index d564718..a253b27 100644
--- a/mailbox/zoo-seq-provider/pom.xml
+++ b/mailbox/zoo-seq-provider/pom.xml
@@ -38,11 +38,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailet/ai/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/ai/pom.xml b/mailet/ai/pom.xml
index 7e44c10..639985f 100644
--- a/mailet/ai/pom.xml
+++ b/mailet/ai/pom.xml
@@ -37,11 +37,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailet/base/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/base/pom.xml b/mailet/base/pom.xml
index c54aab2..a094b2e 100644
--- a/mailet/base/pom.xml
+++ b/mailet/base/pom.xml
@@ -39,19 +39,19 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -125,7 +125,7 @@
</configuration>
</plugin>
<plugin>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>maven-mailetdocs-plugin</artifactId>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailet/crypto/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/crypto/pom.xml b/mailet/crypto/pom.xml
index 1168ee6..078b55f 100644
--- a/mailet/crypto/pom.xml
+++ b/mailet/crypto/pom.xml
@@ -38,11 +38,11 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-api</artifactId>
<version>${project.version}</version>
</dependency>
@@ -76,7 +76,7 @@
</configuration>
</plugin>
<plugin>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>maven-mailetdocs-plugin</artifactId>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailet/icalendar/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/icalendar/pom.xml b/mailet/icalendar/pom.xml
index 6042fbb..e589af9 100644
--- a/mailet/icalendar/pom.xml
+++ b/mailet/icalendar/pom.xml
@@ -31,17 +31,17 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailet/mailetdocs-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/mailetdocs-maven-plugin/pom.xml b/mailet/mailetdocs-maven-plugin/pom.xml
index 75adfac..88f7a13 100644
--- a/mailet/mailetdocs-maven-plugin/pom.xml
+++ b/mailet/mailetdocs-maven-plugin/pom.xml
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailet/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/pom.xml b/mailet/pom.xml
index 97739e0..37cc224 100644
--- a/mailet/pom.xml
+++ b/mailet/pom.xml
@@ -67,7 +67,7 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>maven-mailetdocs-plugin</artifactId>
<version>${plugin.mailetdocs.version}</version>
</plugin>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mailet/standard/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml
index 7f987b8..640db3c 100644
--- a/mailet/standard/pom.xml
+++ b/mailet/standard/pom.xml
@@ -38,31 +38,31 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
<version>${apache-mime4j.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -143,7 +143,7 @@
<build>
<plugins>
<plugin>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>maven-mailetdocs-plugin</artifactId>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mdn/pom.xml
----------------------------------------------------------------------
diff --git a/mdn/pom.xml b/mdn/pom.xml
index 672ab97..e867566 100644
--- a/mdn/pom.xml
+++ b/mdn/pom.xml
@@ -32,15 +32,15 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>javax-mail-extension</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/metrics/metrics-dropwizard/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/metrics-dropwizard/pom.xml b/metrics/metrics-dropwizard/pom.xml
index ee5a86c..4ad04f6 100644
--- a/metrics/metrics-dropwizard/pom.xml
+++ b/metrics/metrics-dropwizard/pom.xml
@@ -31,15 +31,15 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/metrics/metrics-logger/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/metrics-logger/pom.xml b/metrics/metrics-logger/pom.xml
index c0681d2..9092c06 100644
--- a/metrics/metrics-logger/pom.xml
+++ b/metrics/metrics-logger/pom.xml
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/pom.xml b/metrics/pom.xml
index bc1f673..b02bffe 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -38,58 +38,4 @@
<module>metrics-logger</module>
</modules>
- <properties>
- <assertj.version>3.3.0</assertj.version>
- <es.version>2.2.1</es.version>
- <es-reporter.version>2.2.0</es-reporter.version>
- <guava.version>18.0</guava.version>
- <javax.inject.version>1</javax.inject.version>
- <junit.version>4.11</junit.version>
- <testcontainers-version>1.1.7</testcontainers-version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-filesystem-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>metrics-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>metrics-dropwizard</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>${metrics.version}</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-jvm</artifactId>
- <version>${metrics.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>${javax.inject.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mpt/antlib/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/antlib/pom.xml b/mpt/antlib/pom.xml
index af0ac74..d2d1ebc 100644
--- a/mpt/antlib/pom.xml
+++ b/mpt/antlib/pom.xml
@@ -37,11 +37,11 @@ to the library requiring no extra coding.</description>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mpt/app/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/app/pom.xml b/mpt/app/pom.xml
index 78665b6..28239ac 100644
--- a/mpt/app/pom.xml
+++ b/mpt/app/pom.xml
@@ -37,11 +37,11 @@ interfaces to the MPT library.</description>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
@@ -78,7 +78,7 @@ interfaces to the MPT library.</description>
<include>commons-logging:commons-logging</include>
<include>commons-cli:commons-cli</include>
<include>junit:junit</include>
- <include>${project.groupId}:apache-james-mpt-core</include>
+ <include>${james.groupId}:apache-james-mpt-core</include>
</includes>
</artifactSet>
</configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/mpt/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/core/pom.xml b/mpt/core/pom.xml
index 7bca0ba..36af7ff 100644
--- a/mpt/core/pom.xml
+++ b/mpt/core/pom.xml
@@ -32,7 +32,7 @@
<url>http://james.apache.org/mpt/main</url>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/44583eb1/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 55cacf1..2289877 100644
--- a/mpt/impl/imap-mailbox/cassandra/pom.xml
+++ b/mpt/impl/imap-mailbox/cassandra/pom.xml
@@ -32,31 +32,31 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-cassandra</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-cassandra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-cassandra</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mpt-imapmailbox-core</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${james.groupId}</groupId>
<artifactId>blob-cassandra</artifactId>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[16/29] james-project git commit: JAMES-2487 Upgrade
com.jayway.restassured to io.restassured 3.1.0
Posted by bt...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
index 09ae779..0c09d5b 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java
@@ -19,9 +19,9 @@
package org.apache.james.webadmin.routes;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static io.restassured.RestAssured.with;
import static org.apache.james.webadmin.Constants.SEPARATOR;
import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
@@ -58,9 +58,9 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.filter.log.LogDetail;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.RestAssured;
+import io.restassured.filter.log.LogDetail;
+import io.restassured.http.ContentType;
class GroupsRoutesTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
index a5ebd5a..27dbee3 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/SieveQuotaRoutesTest.java
@@ -19,7 +19,7 @@
package org.apache.james.webadmin.routes;
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
@@ -36,8 +36,8 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
public class SieveQuotaRoutesTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
index 873f246..a7bed25 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java
@@ -19,9 +19,9 @@
package org.apache.james.webadmin.routes;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static io.restassured.RestAssured.with;
import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.any;
@@ -50,8 +50,8 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableMap;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
class UsersRoutesTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml
index c4ca76d..033f413 100644
--- a/server/protocols/webadmin/webadmin-mailbox/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml
@@ -129,7 +129,7 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
+ <groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
index 0700cef..b1500c3 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java
@@ -19,7 +19,7 @@
package org.apache.james.webadmin.routes;
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import org.apache.james.core.Domain;
@@ -40,7 +40,7 @@ import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import com.google.common.collect.ImmutableSet;
-import com.jayway.restassured.RestAssured;
+import io.restassured.RestAssured;
class DomainQuotaRoutesNoVirtualHostingTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java
index db58a6b..1d6f458 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java
@@ -19,8 +19,8 @@
package org.apache.james.webadmin.routes;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.when;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
import static org.assertj.core.api.Assertions.assertThat;
@@ -35,9 +35,9 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.path.json.JsonPath;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.path.json.JsonPath;
@ExtendWith(ScanningQuotaSearchExtension.class)
class DomainQuotaRoutesTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java
index 25bd32e..48b4534 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java
@@ -19,8 +19,8 @@
package org.apache.james.webadmin.routes;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.when;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Map;
@@ -34,9 +34,9 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.path.json.JsonPath;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.path.json.JsonPath;
@ExtendWith(ScanningQuotaSearchExtension.class)
class GlobalQuotaRoutesTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
index 1b457c4..003d407 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
@@ -19,8 +19,8 @@
package org.apache.james.webadmin.routes;
-import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.when;
+import static io.restassured.RestAssured.with;
import static org.apache.james.webadmin.Constants.SEPARATOR;
import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.apache.james.webadmin.routes.UserMailboxesRoutes.USERS_BASE;
@@ -60,8 +60,8 @@ import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
class UserMailboxesRoutesTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java
index a2299ca..fd759bb 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java
@@ -19,9 +19,9 @@
package org.apache.james.webadmin.routes;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static io.restassured.RestAssured.with;
import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER;
import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
import static org.assertj.core.api.Assertions.assertThat;
@@ -57,9 +57,9 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import com.google.common.base.Strings;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.path.json.JsonPath;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.path.json.JsonPath;
class UserQuotaRoutesTest {
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
index 75f8d26..9a791c0 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/WebAdminQuotaSearchTestSystem.java
@@ -32,7 +32,7 @@ import org.apache.james.webadmin.service.UserQuotaService;
import org.apache.james.webadmin.utils.JsonTransformer;
import com.google.common.collect.ImmutableSet;
-import com.jayway.restassured.specification.RequestSpecification;
+import io.restassured.specification.RequestSpecification;
public class WebAdminQuotaSearchTestSystem {
private final QuotaSearchTestSystem quotaSearchTestSystem;
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailqueue/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailqueue/pom.xml b/server/protocols/webadmin/webadmin-mailqueue/pom.xml
index f82f3d9..962b011 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailqueue/pom.xml
@@ -73,7 +73,7 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
+ <groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
index 3cfaef9..1811b83 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
@@ -19,11 +19,11 @@
package org.apache.james.webadmin.routes;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.RestAssured.with;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static io.restassured.RestAssured.with;
+import static io.restassured.config.EncoderConfig.encoderConfig;
+import static io.restassured.config.RestAssuredConfig.newConfig;
import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.empty;
@@ -60,10 +60,10 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import com.github.steveash.guavate.Guavate;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
+import io.restassured.RestAssured;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
+import io.restassured.specification.RequestSpecification;
public class MailQueueRoutesTest {
@@ -520,7 +520,7 @@ public class MailQueueRoutesTest {
with()
.queryParam("delayed", "true")
.body("{\"delayed\": \"false\"}")
- .then()
+ .when()
.patch(FIRST_QUEUE + "/mails");
assertThat(queue.browse())
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailrepository/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailrepository/pom.xml b/server/protocols/webadmin/webadmin-mailrepository/pom.xml
index c77b2f8..1c30113 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailrepository/pom.xml
@@ -96,7 +96,7 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
+ <groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
index c451ff4..f930d5d 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
@@ -19,9 +19,9 @@
package org.apache.james.webadmin.routes;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.RestAssured.when;
-import static com.jayway.restassured.RestAssured.with;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static io.restassured.RestAssured.with;
import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER;
import static net.javacrumbs.jsonunit.core.Option.IGNORING_EXTRA_FIELDS;
import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
@@ -91,10 +91,10 @@ import org.mockito.stubbing.Answer;
import com.github.steveash.guavate.Guavate;
import com.google.common.collect.ImmutableList;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.parsing.Parser;
+import io.restassured.RestAssured;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
+import io.restassured.parsing.Parser;
public class MailRepositoriesRoutesTest {
@@ -151,7 +151,7 @@ public class MailRepositoriesRoutesTest {
@Test
public void putMailRepositoryShouldReturnOkWhenRepositoryIsCreated() throws Exception {
given()
- .parameters("protocol", "url")
+ .params("protocol", "url")
.when()
.put(PATH_ESCAPED_MY_REPO)
.then()
@@ -164,14 +164,14 @@ public class MailRepositoriesRoutesTest {
@Test
public void putMailRepositoryShouldReturnOkWhenRepositoryAlreadyExists() throws Exception {
given()
- .parameters("protocol", "url")
+ .params("protocol", "url")
.when()
.put(PATH_ESCAPED_MY_REPO)
.then()
.statusCode(HttpStatus.NO_CONTENT_204);
given()
- .parameters("protocol", "url")
+ .params("protocol", "url")
.when()
.put(PATH_ESCAPED_MY_REPO)
.then()
@@ -187,7 +187,7 @@ public class MailRepositoriesRoutesTest {
.thenThrow(new MailRepositoryStore.MailRepositoryStoreException("Error while selecting repository url://myRepo"));
given()
- .parameters("protocol", "url")
+ .params("protocol", "url")
.when()
.put(PATH_ESCAPED_MY_REPO)
.then()
@@ -584,7 +584,7 @@ public class MailRepositoriesRoutesTest {
String jsonAsString =
given()
- .parameters("additionalFields", "attributes,headers,textBody,htmlBody,messageSize,perRecipientsHeaders")
+ .params("additionalFields", "attributes,headers,textBody,htmlBody,messageSize,perRecipientsHeaders")
.when()
.get(PATH_ESCAPED_MY_REPO + "/mails/" + NAME_1)
.then()
@@ -651,7 +651,7 @@ public class MailRepositoriesRoutesTest {
.build());
given()
- .parameters("additionalFields", ",,,messageSize")
+ .params("additionalFields", ",,,messageSize")
.when()
.get(PATH_ESCAPED_MY_REPO + "/mails/" + NAME_1)
.then()
@@ -684,7 +684,7 @@ public class MailRepositoriesRoutesTest {
.build());
given()
- .parameters("additionalFields", "headers")
+ .params("additionalFields", "headers")
.when()
.get(PATH_ESCAPED_MY_REPO + "/mails/" + NAME_1)
.then()
@@ -709,7 +709,7 @@ public class MailRepositoriesRoutesTest {
.build());
given()
- .parameters("additionalFields", "messageSize,messageSize")
+ .params("additionalFields", "messageSize,messageSize")
.when()
.get(PATH_ESCAPED_MY_REPO + "/mails/" + NAME_1)
.then()
@@ -739,7 +739,7 @@ public class MailRepositoriesRoutesTest {
.build());
given()
- .parameters("additionalFields", "nonExistingField")
+ .params("additionalFields", "nonExistingField")
.when()
.get(PATH_ESCAPED_MY_REPO + "/mails/" + NAME_1)
.then()
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/testing/pom.xml b/server/testing/pom.xml
index 69d8f4f..87aec19 100644
--- a/server/testing/pom.xml
+++ b/server/testing/pom.xml
@@ -50,14 +50,14 @@
<artifactId>awaitility</artifactId>
</dependency>
<dependency>
- <groupId>com.jayway.restassured</groupId>
- <artifactId>rest-assured</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>io.rest-assured</groupId>
+ <artifactId>rest-assured</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.6.1</version>
http://git-wip-us.apache.org/repos/asf/james-project/blob/89df9a44/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java
----------------------------------------------------------------------
diff --git a/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java b/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java
index 5013110..1f5f042 100644
--- a/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java
+++ b/server/testing/src/main/java/org/apache/james/utils/FakeSmtp.java
@@ -19,9 +19,9 @@
package org.apache.james.utils;
-import static com.jayway.restassured.RestAssured.given;
-import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
-import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
+import static io.restassured.RestAssured.given;
+import static io.restassured.config.EncoderConfig.encoderConfig;
+import static io.restassured.config.RestAssuredConfig.newConfig;
import java.nio.charset.StandardCharsets;
import java.util.function.Function;
@@ -34,12 +34,12 @@ import org.junit.runners.model.Statement;
import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
import com.jayway.awaitility.core.ConditionFactory;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.response.ValidatableResponse;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.builder.ResponseSpecBuilder;
+import io.restassured.http.ContentType;
+import io.restassured.response.ValidatableResponse;
+import io.restassured.specification.RequestSpecification;
+import io.restassured.specification.ResponseSpecification;
public class FakeSmtp implements TestRule {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[15/29] james-project git commit: JAMES-2487 Update junit to 4.12
Posted by bt...@apache.org.
JAMES-2487 Update junit to 4.12
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3ad12fcc
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3ad12fcc
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3ad12fcc
Branch: refs/heads/master
Commit: 3ad12fcc73308181bb4a046f87381b2f7e8e1bd7
Parents: 89df9a4
Author: Gautier DI FOLCO <gd...@linagora.com>
Authored: Mon Jul 23 12:15:14 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:07 2018 +0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/3ad12fcc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 22d9b76..75fee3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -608,7 +608,7 @@
<commons-logging.version>1.1.1</commons-logging.version>
<dnsjava.version>2.1.1</dnsjava.version>
- <junit.version>4.11</junit.version>
+ <junit.version>4.12</junit.version>
<junit.jupiter.version>5.0.2</junit.jupiter.version>
<junit.plateform.version>1.0.2</junit.plateform.version>
<junit.vintage.version>4.12.2</junit.vintage.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[22/29] james-project git commit: JAMES-2469 RabbitMQ as a class rule
Posted by bt...@apache.org.
JAMES-2469 RabbitMQ as a class rule
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/1169a7d3
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/1169a7d3
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/1169a7d3
Branch: refs/heads/master
Commit: 1169a7d3220d0a4db57db9745f2434bddaad021b
Parents: 4803007
Author: benwa <bt...@linagora.com>
Authored: Sat Jul 14 11:35:05 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 25 09:35:48 2018 +0700
----------------------------------------------------------------------
.../transport/mailets/ICSAttachmentWorkflowTest.java | 10 ++++++----
.../apache/james/transport/mailets/amqp/AmqpRule.java | 11 +++++++++--
2 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/1169a7d3/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
index 8c8a794..997251e 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
@@ -52,9 +52,9 @@ import org.apache.james.utils.SMTPMessageSender;
import org.apache.mailet.base.test.FakeMail;
import org.junit.After;
import org.junit.Before;
+import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
import com.google.common.collect.ImmutableList;
@@ -426,14 +426,15 @@ public class ICSAttachmentWorkflowTest {
"END:VCALENDAR\r\n" +
"";
- public SwarmGenericContainer rabbitMqContainer = new SwarmGenericContainer(Images.RABBITMQ)
+ @ClassRule
+ public static SwarmGenericContainer rabbitMqContainer = new SwarmGenericContainer(Images.RABBITMQ)
.withAffinityToContainer();
+ @Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
public AmqpRule amqpRule = new AmqpRule(rabbitMqContainer, EXCHANGE_NAME, ROUTING_KEY);
@Rule
- public RuleChain chain = RuleChain.outerRule(temporaryFolder).around(rabbitMqContainer).around(amqpRule);
- @Rule
public IMAPMessageReader imapMessageReader = new IMAPMessageReader();
@Rule
public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN);
@@ -550,6 +551,7 @@ public class ICSAttachmentWorkflowTest {
@After
public void tearDown() throws Exception {
jamesServer.shutdown();
+ amqpRule.readAll();
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/1169a7d3/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/amqp/AmqpRule.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/amqp/AmqpRule.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/amqp/AmqpRule.java
index c117b8d..8198236 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/amqp/AmqpRule.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/amqp/AmqpRule.java
@@ -37,6 +37,8 @@ import com.rabbitmq.client.GetResponse;
public class AmqpRule extends ExternalResource {
+ private static final boolean AUTO_ACK = true;
+
private final SwarmGenericContainer rabbitMqContainer;
private final String exchangeName;
private final String routingKey;
@@ -68,14 +70,19 @@ public class AmqpRule extends ExternalResource {
return amqpUri;
}
+ public void readAll() throws IOException {
+ while (channel.basicGet(queueName, AUTO_ACK) != null) {
+
+ }
+ }
+
public Optional<String> readContent() throws IOException {
return readContentAsBytes()
.map(value -> new String(value, StandardCharsets.UTF_8));
}
public Optional<byte[]> readContentAsBytes() throws IOException {
- boolean autoAck = true;
- return Optional.ofNullable(channel.basicGet(queueName, autoAck))
+ return Optional.ofNullable(channel.basicGet(queueName, AUTO_ACK))
.map(GetResponse::getBody);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org