This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 6613dffbbda CAMEL-20532: consolidate common failsafe configurations
6613dffbbda is described below
commit 6613dffbbda850638ca9b2c0d352d476e6cb955e
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Fri Mar 8 11:38:21 2024 +0100
CAMEL-20532: consolidate common failsafe configurations
---
components/camel-ftp/pom.xml | 16 +---------------
components/camel-jms/pom.xml | 7 -------
components/camel-kafka/pom.xml | 5 -----
components/camel-spring-xml/pom.xml | 1 -
components/pom.xml | 8 +++++++-
parent/pom.xml | 7 +++++++
6 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index a976aaffa0e..0ae02d6467f 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -32,8 +32,7 @@
<description>Camel FTP support</description>
<properties>
-
- <camel.failsafe.parallel.factor>0.5</camel.failsafe.parallel.factor>
+ <camel.failsafe.parallel>true</camel.failsafe.parallel>
</properties>
<dependencies>
@@ -182,9 +181,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <argLine>-XX:+ExitOnOutOfMemoryError
-Xmx3G</argLine>
- </configuration>
<executions>
<execution>
<id>integration-test</id>
@@ -193,17 +189,7 @@
<goal>verify</goal>
</goals>
<configuration>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
<excludedGroups>not-parallel</excludedGroups>
-
<forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- <systemPropertyVariables>
-
<junit.jupiter.execution.parallel.enabled>true</junit.jupiter.execution.parallel.enabled>
-
<junit.jupiter.execution.parallel.mode.default>same_thread</junit.jupiter.execution.parallel.mode.default>
-
<junit.jupiter.execution.parallel.mode.classes.default>concurrent</junit.jupiter.execution.parallel.mode.classes.default>
-
<junit.jupiter.execution.parallel.config.strategy>dynamic</junit.jupiter.execution.parallel.config.strategy>
-
<junit.jupiter.execution.parallel.config.dynamic.factor>${camel.failsafe.parallel.factor}</junit.jupiter.execution.parallel.config.dynamic.factor>
- </systemPropertyVariables>
</configuration>
</execution>
<execution>
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 3d0ebcdc3c4..b254e4bc1fd 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -239,13 +239,6 @@
<reuseForks>true</reuseForks>
<excludedGroups>not-parallel</excludedGroups>
<forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- <systemPropertyVariables>
-
<junit.jupiter.execution.parallel.enabled>${camel.failsafe.parallel}</junit.jupiter.execution.parallel.enabled>
-
<junit.jupiter.execution.parallel.mode.default>same_thread</junit.jupiter.execution.parallel.mode.default>
-
<junit.jupiter.execution.parallel.mode.classes.default>concurrent</junit.jupiter.execution.parallel.mode.classes.default>
-
<junit.jupiter.execution.parallel.config.strategy>dynamic</junit.jupiter.execution.parallel.config.strategy>
-
<junit.jupiter.execution.parallel.config.dynamic.factor>${camel.failsafe.parallel.factor}</junit.jupiter.execution.parallel.config.dynamic.factor>
- </systemPropertyVariables>
</configuration>
</execution>
<execution>
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index abd8c43b99b..0239796c332 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -160,7 +160,6 @@
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skipITs>${skipITs}</skipITs>
- <reuseForks>true</reuseForks>
</configuration>
<executions>
<execution>
@@ -170,7 +169,6 @@
<systemPropertyVariables>
<kafka.instance.type>local-kafka2-container</kafka.instance.type>
</systemPropertyVariables>
- <reuseForks>true</reuseForks>
<reportNameSuffix>kafka-2</reportNameSuffix>
<excludedGroups>non-abstract,health,idempotent</excludedGroups>
</configuration>
@@ -199,7 +197,6 @@
<configuration>
<skipITs>${skipITs}</skipITs>
<skipTests>${skipTests}</skipTests>
- <reuseForks>true</reuseForks>
</configuration>
<executions>
<execution>
@@ -210,8 +207,6 @@
</goals>
<configuration>
<skipITs>${skipITs}</skipITs>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
<excludedGroups>health,idempotent,breakOnFirstError</excludedGroups>
</configuration>
</execution>
diff --git a/components/camel-spring-xml/pom.xml
b/components/camel-spring-xml/pom.xml
index d04f04cf3a9..c00ea0ac5fb 100644
--- a/components/camel-spring-xml/pom.xml
+++ b/components/camel-spring-xml/pom.xml
@@ -661,7 +661,6 @@
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skipTests>${skipTests}</skipTests>
- <reuseForks>true</reuseForks>
<systemPropertyVariables>
<visibleassertions.silence>true</visibleassertions.silence>
</systemPropertyVariables>
diff --git a/components/pom.xml b/components/pom.xml
index 464a2ba4005..6eadce4b071 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -525,11 +525,17 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
- <reuseForks>true</reuseForks>
+ <argLine>${camel.failsafe.fork.vmargs}</argLine>
+
<reuseForks>${camel.failsafe.reuseForks}</reuseForks>
<forkedProcessTimeoutInSeconds>${camel.failsafe.forkTimeout}</forkedProcessTimeoutInSeconds>
<redirectTestOutputToFile>false</redirectTestOutputToFile>
<systemPropertyVariables>
<visibleassertions.silence>true</visibleassertions.silence>
+
<junit.jupiter.execution.parallel.enabled>${camel.failsafe.parallel}</junit.jupiter.execution.parallel.enabled>
+
<junit.jupiter.execution.parallel.mode.default>same_thread</junit.jupiter.execution.parallel.mode.default>
+
<junit.jupiter.execution.parallel.mode.classes.default>concurrent</junit.jupiter.execution.parallel.mode.classes.default>
+
<junit.jupiter.execution.parallel.config.strategy>${camel.failsafe.parallel.strategy}</junit.jupiter.execution.parallel.config.strategy>
+
<junit.jupiter.execution.parallel.config.dynamic.factor>${camel.failsafe.parallel.factor}</junit.jupiter.execution.parallel.config.dynamic.factor>
</systemPropertyVariables>
</configuration>
<executions>
diff --git a/parent/pom.xml b/parent/pom.xml
index ce854016ce5..188b0311442 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -42,7 +42,14 @@
<camel.surefire.parallel>false</camel.surefire.parallel>
<camel.surefire.parallel.factor>1</camel.surefire.parallel.factor>
<camel.surefire.parallel.strategy>dynamic</camel.surefire.parallel.strategy>
+ <camel.failsafe.fork.vmargs>-XX:+ExitOnOutOfMemoryError
-Xmx3G</camel.failsafe.fork.vmargs>
+ <camel.failsafe.forkCount>1</camel.failsafe.forkCount>
<camel.failsafe.forkTimeout>600</camel.failsafe.forkTimeout>
+ <camel.failsafe.reuseForks>true</camel.failsafe.reuseForks>
+ <camel.failsafe.parallel>false</camel.failsafe.parallel>
+ <camel.failsafe.parallel.factor>0.5</camel.failsafe.parallel.factor>
+
<camel.failsafe.parallel.strategy>dynamic</camel.failsafe.parallel.strategy>
+
<cxf.xjc.jvmArgs />
<trimStackTrace>false</trimStackTrace>
<sourcecheckExcludes />
