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 2019/06/05 03:04:17 UTC
[james-project] branch master updated (c27641f -> f409bfb)
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git.
from c27641f JAMES-2774 Avoid starting too many docker rabbitmq in RabbitMQEventBusTest
new caaf58b JAMES-2761 Avoid uneeded mailbox path resolution upon unsolicited responses
new 030a17e JAMES-2489 WebAdmin projects should avoid parallel execution
new 74a7a48 JAMES-2671 Avoid pulling the entire AWS SDK
new 3acf114 MAILBOX-388 Memory dependency for deletedMessageVault is used only for tests
new af22c34 JAMES-2671 Avoid pulling commons-logging along with AWS SDK
new a650028 JAMES-2155 Avoid JPA dependency in all products
new 3ca8bb1 JAMES-2684 Bind apache-mailet-test in scope test
new 50aadae JAMES-2334 event-sourcing-event-store-cassandra test-jar was not test scoped
new f409bfb JAMES-2751 Apply docker cassandra restart policy to jmap integration tests
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
mailbox/plugin/deleted-messages-vault/pom.xml | 1 +
.../james/imap/processor/AbstractMailboxProcessor.java | 4 ++--
.../org/apache/james/imap/processor/SearchProcessorTest.java | 6 +++++-
server/blob/blob-export-file/pom.xml | 1 +
server/blob/blob-objectstorage/pom.xml | 12 +++++++++++-
.../src/test/java/org/apache/james/DockerCassandraRule.java | 2 +-
server/container/guice/guice-common/pom.xml | 4 ----
.../apache/james/modules/data/SieveJPARepositoryModules.java | 0
server/protocols/webadmin/webadmin-core/pom.xml | 1 -
server/protocols/webadmin/webadmin-data/pom.xml | 1 -
.../webadmin/webadmin-mailbox-deleted-message-vault/pom.xml | 1 -
server/protocols/webadmin/webadmin-mailbox/pom.xml | 1 -
server/protocols/webadmin/webadmin-mailqueue/pom.xml | 1 -
server/protocols/webadmin/webadmin-mailrepository/pom.xml | 1 -
server/queue/queue-rabbitmq/pom.xml | 1 +
15 files changed, 22 insertions(+), 15 deletions(-)
rename server/container/guice/{guice-common => jpa-common-guice}/src/main/java/org/apache/james/modules/data/SieveJPARepositoryModules.java (100%)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 06/09: JAMES-2155 Avoid JPA dependency in all
products
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit a650028680f3def1fefac5ec7bbe468059770f00
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu May 30 17:29:58 2019 +0700
JAMES-2155 Avoid JPA dependency in all products
---
server/container/guice/guice-common/pom.xml | 4 ----
.../java/org/apache/james/modules/data/SieveJPARepositoryModules.java | 0
2 files changed, 4 deletions(-)
diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml
index 3826a3e..fd3dd31 100644
--- a/server/container/guice/guice-common/pom.xml
+++ b/server/container/guice/guice-common/pom.xml
@@ -51,10 +51,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-data-jpa</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>james-server-data-memory</artifactId>
</dependency>
<dependency>
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/data/SieveJPARepositoryModules.java b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/SieveJPARepositoryModules.java
similarity index 100%
rename from server/container/guice/guice-common/src/main/java/org/apache/james/modules/data/SieveJPARepositoryModules.java
rename to server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/SieveJPARepositoryModules.java
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 09/09: JAMES-2751 Apply docker cassandra restart
policy to jmap integration tests
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit f409bfba75920d3bbf1d5549e42b7034dd8bf031
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Thu May 30 16:50:34 2019 +0700
JAMES-2751 Apply docker cassandra restart policy to jmap integration tests
---
.../src/test/java/org/apache/james/DockerCassandraRule.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java
index d8d0369..98a4fa5 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java
@@ -32,7 +32,7 @@ import com.google.inject.util.Modules;
public class DockerCassandraRule implements GuiceModuleTestRule {
- private org.apache.james.backends.cassandra.DockerCassandraRule cassandraContainer = new org.apache.james.backends.cassandra.DockerCassandraRule();
+ private org.apache.james.backends.cassandra.DockerCassandraRule cassandraContainer = new org.apache.james.backends.cassandra.DockerCassandraRule().allowRestart();
@Override
public Statement apply(Statement base, Description description) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 04/09: MAILBOX-388 Memory dependency for
deletedMessageVault is used only for tests
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 3acf1141674445c56c7e0645d550b0a0a6d61aff
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu May 30 17:22:36 2019 +0700
MAILBOX-388 Memory dependency for deletedMessageVault is used only for tests
---
mailbox/plugin/deleted-messages-vault/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/mailbox/plugin/deleted-messages-vault/pom.xml b/mailbox/plugin/deleted-messages-vault/pom.xml
index 66ba8d1..b8f44b7 100644
--- a/mailbox/plugin/deleted-messages-vault/pom.xml
+++ b/mailbox/plugin/deleted-messages-vault/pom.xml
@@ -43,6 +43,7 @@
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-memory</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 01/09: JAMES-2761 Avoid uneeded mailbox path
resolution upon unsolicited responses
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit caaf58b06afc5c6652351e9c0bf4a0cade63f75f
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu May 30 09:56:34 2019 +0700
JAMES-2761 Avoid uneeded mailbox path resolution upon unsolicited responses
Unsolicited responses are generated for each command, and were retrieving mailbox details twice
- One time when retrieving details of the selected mailbox
- One time when retrieving the mailbox from the mailboxPath
Also this closes an inconsistency window upon mailbox renames.
---
.../org/apache/james/imap/processor/AbstractMailboxProcessor.java | 4 ++--
.../java/org/apache/james/imap/processor/SearchProcessorTest.java | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
index 731a3ac..fa43bb7 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
@@ -307,7 +307,7 @@ public abstract class AbstractMailboxProcessor<M extends ImapRequest> extends Ab
private MessageManager getMailbox(ImapSession session, SelectedMailbox selected) throws MailboxException {
final MailboxManager mailboxManager = getMailboxManager();
- return mailboxManager.getMailbox(selected.getPath(), ImapSessionUtils.getMailboxSession(session));
+ return mailboxManager.getMailbox(selected.getMailboxId(), ImapSessionUtils.getMailboxSession(session));
}
private void addRecentResponses(SelectedMailbox selected, ImapProcessor.Responder responder) {
@@ -416,7 +416,7 @@ public abstract class AbstractMailboxProcessor<M extends ImapRequest> extends Ab
result = null;
} else {
final MailboxManager mailboxManager = getMailboxManager();
- result = mailboxManager.getMailbox(selectedMailbox.getPath(), ImapSessionUtils.getMailboxSession(session));
+ result = mailboxManager.getMailbox(selectedMailbox.getMailboxId(), ImapSessionUtils.getMailboxSession(session));
}
return result;
}
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
index 532a79a..b3d4911 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
@@ -58,11 +58,13 @@ import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.MessageUid;
+import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.SearchQuery;
import org.apache.james.mailbox.model.SearchQuery.AddressType;
import org.apache.james.mailbox.model.SearchQuery.Criterion;
import org.apache.james.mailbox.model.SearchQuery.DateResolution;
+import org.apache.james.mailbox.model.TestId;
import org.apache.james.metrics.api.NoopMetricFactory;
import org.junit.After;
import org.junit.Before;
@@ -100,6 +102,7 @@ public class SearchProcessorTest {
new SearchQuery.UidRange(MessageUid.of(42), MessageUid.of(1048)) };
private static final MailboxPath mailboxPath = new MailboxPath("namespace", "user", "name");
+ private static final MailboxId mailboxId = TestId.of(18);
SearchProcessor processor;
ImapProcessor next;
@@ -125,6 +128,7 @@ public class SearchProcessorTest {
mailboxManager = mock(MailboxManager.class);
mailboxSession = MailboxSessionUtil.create("user");
selectedMailbox = mock(SelectedMailbox.class);
+ when(selectedMailbox.getMailboxId()).thenReturn(mailboxId);
processor = new SearchProcessor(next, mailboxManager, serverResponseFactory, new NoopMetricFactory());
expectOk();
@@ -192,7 +196,7 @@ public class SearchProcessorTest {
@SuppressWarnings("unchecked")
private void expectsGetSelectedMailbox() throws Exception {
- when(mailboxManager.getMailbox(mailboxPath, mailboxSession)).thenReturn(mailbox, mailbox);
+ when(mailboxManager.getMailbox(mailboxId, mailboxSession)).thenReturn(mailbox, mailbox);
when(session.getSelected()).thenReturn(selectedMailbox);
when(selectedMailbox.isRecentUidRemoved()).thenReturn(false);
when(selectedMailbox.isSizeChanged()).thenReturn(false);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 02/09: JAMES-2489 WebAdmin projects should avoid
parallel execution
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 030a17e28a47c080cb62c497f87f2038038b2091
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu May 30 10:03:29 2019 +0700
JAMES-2489 WebAdmin projects should avoid parallel execution
-> Leads to low probability random VM crashes
-> Some port conflicts can arise
Minimum time gain of a few minutes do not deserve to frighten overall build stability.
---
server/protocols/webadmin/webadmin-core/pom.xml | 1 -
server/protocols/webadmin/webadmin-data/pom.xml | 1 -
server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/pom.xml | 1 -
server/protocols/webadmin/webadmin-mailbox/pom.xml | 1 -
server/protocols/webadmin/webadmin-mailqueue/pom.xml | 1 -
server/protocols/webadmin/webadmin-mailrepository/pom.xml | 1 -
6 files changed, 6 deletions(-)
diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml
index f1279d6..a744ee6 100644
--- a/server/protocols/webadmin/webadmin-core/pom.xml
+++ b/server/protocols/webadmin/webadmin-core/pom.xml
@@ -167,7 +167,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reuseForks>true</reuseForks>
- <forkCount>1C</forkCount>
</configuration>
</plugin>
</plugins>
diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml
index 3ffa880..aa4f7b2 100644
--- a/server/protocols/webadmin/webadmin-data/pom.xml
+++ b/server/protocols/webadmin/webadmin-data/pom.xml
@@ -185,7 +185,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reuseForks>true</reuseForks>
- <forkCount>1C</forkCount>
</configuration>
</plugin>
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/pom.xml b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/pom.xml
index 50adb89..de046be 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/pom.xml
@@ -205,7 +205,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reuseForks>true</reuseForks>
- <forkCount>1C</forkCount>
</configuration>
</plugin>
</plugins>
diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml
index e78dfc2..d3b834f 100644
--- a/server/protocols/webadmin/webadmin-mailbox/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml
@@ -234,7 +234,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reuseForks>true</reuseForks>
- <forkCount>1C</forkCount>
</configuration>
</plugin>
</plugins>
diff --git a/server/protocols/webadmin/webadmin-mailqueue/pom.xml b/server/protocols/webadmin/webadmin-mailqueue/pom.xml
index 62016e4..3679fb2 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailqueue/pom.xml
@@ -131,7 +131,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reuseForks>true</reuseForks>
- <forkCount>1C</forkCount>
</configuration>
</plugin>
</plugins>
diff --git a/server/protocols/webadmin/webadmin-mailrepository/pom.xml b/server/protocols/webadmin/webadmin-mailrepository/pom.xml
index 148a7df..ab20627 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailrepository/pom.xml
@@ -166,7 +166,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reuseForks>true</reuseForks>
- <forkCount>1C</forkCount>
</configuration>
</plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 07/09: JAMES-2684 Bind apache-mailet-test in scope
test
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 3ca8bb137f61348739a146180cce052c78723279
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri May 31 10:53:58 2019 +0700
JAMES-2684 Bind apache-mailet-test in scope test
---
server/blob/blob-export-file/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/server/blob/blob-export-file/pom.xml b/server/blob/blob-export-file/pom.xml
index c74fffe..4ad96bb 100644
--- a/server/blob/blob-export-file/pom.xml
+++ b/server/blob/blob-export-file/pom.xml
@@ -37,6 +37,7 @@
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>apache-mailet-test</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 08/09: JAMES-2334
event-sourcing-event-store-cassandra test-jar was not test scoped
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 50aadaec836a8f2f8a5ddadd2a9a70f02ab6959d
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri May 31 10:57:52 2019 +0700
JAMES-2334 event-sourcing-event-store-cassandra test-jar was not test scoped
---
server/queue/queue-rabbitmq/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/server/queue/queue-rabbitmq/pom.xml b/server/queue/queue-rabbitmq/pom.xml
index 5c31864..dc18aee 100644
--- a/server/queue/queue-rabbitmq/pom.xml
+++ b/server/queue/queue-rabbitmq/pom.xml
@@ -79,6 +79,7 @@
<groupId>${james.groupId}</groupId>
<artifactId>event-sourcing-event-store-cassandra</artifactId>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 03/09: JAMES-2671 Avoid pulling the entire AWS SDK
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 74a7a48ae6d963aecd38c476c93d33875f6acf44
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu May 30 16:57:14 2019 +0700
JAMES-2671 Avoid pulling the entire AWS SDK
Only S3 SDK is required by the blob store
---
server/blob/blob-objectstorage/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/blob/blob-objectstorage/pom.xml b/server/blob/blob-objectstorage/pom.xml
index c1bbf81..b9975bb 100644
--- a/server/blob/blob-objectstorage/pom.xml
+++ b/server/blob/blob-objectstorage/pom.xml
@@ -68,7 +68,7 @@
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk</artifactId>
+ <artifactId>aws-java-sdk-s3</artifactId>
<version>1.11.532</version>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 05/09: JAMES-2671 Avoid pulling commons-logging
along with AWS SDK
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit af22c34bc4af6494682b188097e82ccb7186a9cd
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu May 30 17:26:30 2019 +0700
JAMES-2671 Avoid pulling commons-logging along with AWS SDK
---
server/blob/blob-objectstorage/pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/server/blob/blob-objectstorage/pom.xml b/server/blob/blob-objectstorage/pom.xml
index b9975bb..a92e073 100644
--- a/server/blob/blob-objectstorage/pom.xml
+++ b/server/blob/blob-objectstorage/pom.xml
@@ -70,6 +70,12 @@
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>1.11.532</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.google.crypto.tink</groupId>
@@ -132,6 +138,10 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org