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 c38650230ceb981c00503774068dfa62a27e7d31
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Thu Feb 11 15:01:54 2021 +0700
JAMES-3500 Re-enable some reuseForks
---
backends-common/elasticsearch/pom.xml | 2 +-
backends-common/rabbitmq/pom.xml | 2 +-
mailbox/api/pom.xml | 2 +-
mailbox/backup/pom.xml | 2 +-
mailbox/cassandra/pom.xml | 4 ++--
mailbox/event/json/pom.xml | 2 +-
mailbox/memory/pom.xml | 2 +-
mailbox/store/pom.xml | 2 +-
mailbox/tools/indexer/pom.xml | 2 +-
mailet/standard/pom.xml | 2 +-
mdn/pom.xml | 2 +-
mpt/impl/imap-mailbox/cassandra/pom.xml | 2 +-
mpt/impl/imap-mailbox/inmemory/pom.xml | 2 +-
mpt/impl/imap-mailbox/jpa/pom.xml | 2 +-
mpt/impl/imap-mailbox/lucenesearch/pom.xml | 2 +-
protocols/imap/pom.xml | 2 +-
protocols/smtp/pom.xml | 2 +-
server/blob/blob-cassandra/pom.xml | 2 +-
server/blob/blob-memory/pom.xml | 2 +-
server/blob/blob-s3/pom.xml | 13 +++++++++++++
server/container/guice/cassandra-rabbitmq-guice/pom.xml | 2 +-
server/data/data-cassandra/pom.xml | 2 +-
server/data/data-file/pom.xml | 2 +-
server/mailet/integration-testing/pom.xml | 4 ++--
server/mailet/mailets/pom.xml | 2 +-
server/mailrepository/mailrepository-cassandra/pom.xml | 2 +-
.../rabbitmq-jmap-draft-integration-testing/pom.xml | 2 +-
server/protocols/jmap-draft/pom.xml | 2 +-
.../distributed-jmap-rfc-8621-integration-tests/pom.xml | 2 +-
.../memory-jmap-rfc-8621-integration-tests/pom.xml | 13 +++++++++++++
.../distributed-webadmin-integration-test/pom.xml | 2 +-
.../memory-webadmin-integration-test/pom.xml | 4 ++--
server/protocols/webadmin/webadmin-mailbox/pom.xml | 2 +-
33 files changed, 60 insertions(+), 34 deletions(-)
diff --git a/backends-common/elasticsearch/pom.xml
b/backends-common/elasticsearch/pom.xml
index c1d56ad..9620615 100644
--- a/backends-common/elasticsearch/pom.xml
+++ b/backends-common/elasticsearch/pom.xml
@@ -113,7 +113,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>2</forkCount>
</configuration>
</plugin>
diff --git a/backends-common/rabbitmq/pom.xml b/backends-common/rabbitmq/pom.xml
index 584dc4f..1bfe6ba 100644
--- a/backends-common/rabbitmq/pom.xml
+++ b/backends-common/rabbitmq/pom.xml
@@ -115,7 +115,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>2</forkCount>
</configuration>
</plugin>
diff --git a/mailbox/api/pom.xml b/mailbox/api/pom.xml
index 91339f7..ff31374 100644
--- a/mailbox/api/pom.xml
+++ b/mailbox/api/pom.xml
@@ -130,7 +130,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>1C</forkCount>
</configuration>
</plugin>
diff --git a/mailbox/backup/pom.xml b/mailbox/backup/pom.xml
index a203ff5..854b934 100644
--- a/mailbox/backup/pom.xml
+++ b/mailbox/backup/pom.xml
@@ -95,7 +95,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>1C</forkCount>
</configuration>
</plugin>
diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml
index 12ae44d..ef3566d 100644
--- a/mailbox/cassandra/pom.xml
+++ b/mailbox/cassandra/pom.xml
@@ -200,8 +200,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
- <forkCount>2</forkCount>
+ <reuseForks>true</reuseForks>
+ <forkCount>4</forkCount>
</configuration>
</plugin>
</plugins>
diff --git a/mailbox/event/json/pom.xml b/mailbox/event/json/pom.xml
index 5fa06d1..fadfddb 100644
--- a/mailbox/event/json/pom.xml
+++ b/mailbox/event/json/pom.xml
@@ -91,7 +91,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>1C</forkCount>
</configuration>
</plugin>
diff --git a/mailbox/memory/pom.xml b/mailbox/memory/pom.xml
index 3c409c2..3a78ac7 100644
--- a/mailbox/memory/pom.xml
+++ b/mailbox/memory/pom.xml
@@ -109,7 +109,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>1C</forkCount>
</configuration>
</plugin>
diff --git a/mailbox/store/pom.xml b/mailbox/store/pom.xml
index 28b59b2..7d64df7 100644
--- a/mailbox/store/pom.xml
+++ b/mailbox/store/pom.xml
@@ -144,7 +144,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>1C</forkCount>
</configuration>
</plugin>
diff --git a/mailbox/tools/indexer/pom.xml b/mailbox/tools/indexer/pom.xml
index a34f43c..fd7e836 100644
--- a/mailbox/tools/indexer/pom.xml
+++ b/mailbox/tools/indexer/pom.xml
@@ -156,7 +156,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xms128m -Xmx256m</argLine>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
</configuration>
</plugin>
</plugins>
diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml
index d920076..a46de03 100644
--- a/mailet/standard/pom.xml
+++ b/mailet/standard/pom.xml
@@ -127,7 +127,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>1C</forkCount>
</configuration>
</plugin>
diff --git a/mdn/pom.xml b/mdn/pom.xml
index 3bd0bd7..68e15ea 100644
--- a/mdn/pom.xml
+++ b/mdn/pom.xml
@@ -82,7 +82,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>1C</forkCount>
</configuration>
</plugin>
diff --git a/mpt/impl/imap-mailbox/cassandra/pom.xml
b/mpt/impl/imap-mailbox/cassandra/pom.xml
index b34a69b..a2753cf 100644
--- a/mpt/impl/imap-mailbox/cassandra/pom.xml
+++ b/mpt/impl/imap-mailbox/cassandra/pom.xml
@@ -103,7 +103,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>2</forkCount>
</configuration>
</plugin>
diff --git a/mpt/impl/imap-mailbox/inmemory/pom.xml
b/mpt/impl/imap-mailbox/inmemory/pom.xml
index 46c79cd..0edd035 100644
--- a/mpt/impl/imap-mailbox/inmemory/pom.xml
+++ b/mpt/impl/imap-mailbox/inmemory/pom.xml
@@ -76,7 +76,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>1C</forkCount>
</configuration>
</plugin>
diff --git a/mpt/impl/imap-mailbox/jpa/pom.xml
b/mpt/impl/imap-mailbox/jpa/pom.xml
index 703217b..77e815a 100644
--- a/mpt/impl/imap-mailbox/jpa/pom.xml
+++ b/mpt/impl/imap-mailbox/jpa/pom.xml
@@ -97,7 +97,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>1C</forkCount>
</configuration>
</plugin>
diff --git a/mpt/impl/imap-mailbox/lucenesearch/pom.xml
b/mpt/impl/imap-mailbox/lucenesearch/pom.xml
index 254744e..0111b39 100644
--- a/mpt/impl/imap-mailbox/lucenesearch/pom.xml
+++ b/mpt/impl/imap-mailbox/lucenesearch/pom.xml
@@ -94,7 +94,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>1C</forkCount>
</configuration>
</plugin>
diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml
index de7c0b0..91bd67c 100644
--- a/protocols/imap/pom.xml
+++ b/protocols/imap/pom.xml
@@ -121,7 +121,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>1C</forkCount>
</configuration>
</plugin>
diff --git a/protocols/smtp/pom.xml b/protocols/smtp/pom.xml
index 82b6ad1..88b524e 100644
--- a/protocols/smtp/pom.xml
+++ b/protocols/smtp/pom.xml
@@ -98,7 +98,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>1C</forkCount>
</configuration>
</plugin>
diff --git a/server/blob/blob-cassandra/pom.xml
b/server/blob/blob-cassandra/pom.xml
index 2a8c4f7..679071d 100644
--- a/server/blob/blob-cassandra/pom.xml
+++ b/server/blob/blob-cassandra/pom.xml
@@ -102,7 +102,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>2</forkCount>
</configuration>
</plugin>
diff --git a/server/blob/blob-memory/pom.xml b/server/blob/blob-memory/pom.xml
index cb3badf..5284361 100644
--- a/server/blob/blob-memory/pom.xml
+++ b/server/blob/blob-memory/pom.xml
@@ -87,7 +87,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xms1024m -Xmx2048m</argLine>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkedProcessTimeoutInSeconds>1200</forkedProcessTimeoutInSeconds>
</configuration>
</plugin>
diff --git a/server/blob/blob-s3/pom.xml b/server/blob/blob-s3/pom.xml
index 0d862bd..a481878 100644
--- a/server/blob/blob-s3/pom.xml
+++ b/server/blob/blob-s3/pom.xml
@@ -115,4 +115,17 @@
<version>${s3-sdk.version}</version>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <reuseForks>true</reuseForks>
+ <forkCount>2</forkCount>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/server/container/guice/cassandra-rabbitmq-guice/pom.xml
b/server/container/guice/cassandra-rabbitmq-guice/pom.xml
index 3cccc99..9423391 100644
--- a/server/container/guice/cassandra-rabbitmq-guice/pom.xml
+++ b/server/container/guice/cassandra-rabbitmq-guice/pom.xml
@@ -201,7 +201,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xms512m -Xmx2048m</argLine>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<!-- Fail tests longer than 20 minutes, prevent form
random locking tests -->
<forkedProcessTimeoutInSeconds>1200</forkedProcessTimeoutInSeconds>
<excludedGroups>unstable</excludedGroups>
diff --git a/server/data/data-cassandra/pom.xml
b/server/data/data-cassandra/pom.xml
index ef8679a..f603f5c 100644
--- a/server/data/data-cassandra/pom.xml
+++ b/server/data/data-cassandra/pom.xml
@@ -149,7 +149,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>2</forkCount>
</configuration>
</plugin>
diff --git a/server/data/data-file/pom.xml b/server/data/data-file/pom.xml
index 1edbfe5..5c1cf2e 100644
--- a/server/data/data-file/pom.xml
+++ b/server/data/data-file/pom.xml
@@ -149,7 +149,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>1C</forkCount>
</configuration>
</plugin>
diff --git a/server/mailet/integration-testing/pom.xml
b/server/mailet/integration-testing/pom.xml
index 83dd596..9928346 100644
--- a/server/mailet/integration-testing/pom.xml
+++ b/server/mailet/integration-testing/pom.xml
@@ -162,8 +162,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
- <forkCount>1C</forkCount>
+ <reuseForks>true</reuseForks>
+ <forkCount>2</forkCount>
</configuration>
</plugin>
</plugins>
diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml
index e2b00ed..e7b9659 100644
--- a/server/mailet/mailets/pom.xml
+++ b/server/mailet/mailets/pom.xml
@@ -280,7 +280,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>1C</forkCount>
</configuration>
</plugin>
diff --git a/server/mailrepository/mailrepository-cassandra/pom.xml
b/server/mailrepository/mailrepository-cassandra/pom.xml
index 6f38b42..0b5c0f0 100644
--- a/server/mailrepository/mailrepository-cassandra/pom.xml
+++ b/server/mailrepository/mailrepository-cassandra/pom.xml
@@ -90,7 +90,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>2</forkCount>
</configuration>
</plugin>
diff --git
a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml
b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml
index 0891a7a..3b44dc8 100644
---
a/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml
+++
b/server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/pom.xml
@@ -161,7 +161,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xms512m -Xmx2048m</argLine>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<!-- Fail tests longer than 20 minutes, prevent form
random locking tests -->
<forkedProcessTimeoutInSeconds>1200</forkedProcessTimeoutInSeconds>
<groups
combine.self="override">org.apache.james.junit.categories.BasicFeature,org.apache.james.jmap.categories.EnableCucumber</groups>
diff --git a/server/protocols/jmap-draft/pom.xml
b/server/protocols/jmap-draft/pom.xml
index 9664430..faf106a 100644
--- a/server/protocols/jmap-draft/pom.xml
+++ b/server/protocols/jmap-draft/pom.xml
@@ -269,7 +269,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkCount>1C</forkCount>
</configuration>
</plugin>
diff --git
a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml
b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml
index e608bb4..2018d3a 100644
---
a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml
+++
b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/pom.xml
@@ -121,7 +121,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xms512m -Xmx2048m</argLine>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<!-- Fail tests longer than 20 minutes, prevent form
random locking tests -->
<forkedProcessTimeoutInSeconds>1200</forkedProcessTimeoutInSeconds>
<!-- Junit 5 move from Category to Tag, and it need tag's
name as parameter -->
diff --git
a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml
b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml
index e23f323..06d250b 100644
---
a/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml
+++
b/server/protocols/jmap-rfc-8621-integration-tests/memory-jmap-rfc-8621-integration-tests/pom.xml
@@ -53,4 +53,17 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <reuseForks>true</reuseForks>
+ <forkCount>4</forkCount>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml
index dddc6b3..dcb88dd 100644
---
a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml
+++
b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/pom.xml
@@ -98,7 +98,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xms512m -Xmx2048m</argLine>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<!-- Fail tests longer than 20 minutes, prevent form
random locking tests -->
<forkedProcessTimeoutInSeconds>1200</forkedProcessTimeoutInSeconds>
<groups
combine.self="override">BasicFeature&!unstable</groups>
diff --git
a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/pom.xml
b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/pom.xml
index 43d0ed6..73c485a 100644
---
a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/pom.xml
+++
b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/pom.xml
@@ -58,9 +58,9 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xms512m -Xmx2048m</argLine>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<forkedProcessTimeoutInSeconds>1200</forkedProcessTimeoutInSeconds>
- <forkCount>1C</forkCount>
+ <forkCount>4</forkCount>
</configuration>
</plugin>
</plugins>
diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml
b/server/protocols/webadmin/webadmin-mailbox/pom.xml
index 4ed88c8..49a9372 100644
--- a/server/protocols/webadmin/webadmin-mailbox/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml
@@ -244,7 +244,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xms512m -Xmx2048m</argLine>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
<!-- Fail tests longer than 20 minutes, prevent form
random locking tests -->
<forkedProcessTimeoutInSeconds>1200</forkedProcessTimeoutInSeconds>
<excludedGroups>unstable</excludedGroups>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org
