You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/10/14 06:49:48 UTC
[camel] branch master updated (16114e1 -> 1337b86)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 16114e1 Sync Properties
new 76522fa Fix surefire argLine usage
new 1337b86 [CAMEL-15674] Upgrade to maven-archetype-plugin 3.2.0
The 2 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:
camel-dependencies/pom.xml | 2 +-
parent/pom.xml | 13 +++----------
2 files changed, 4 insertions(+), 11 deletions(-)
[camel] 01/02: Fix surefire argLine usage
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 76522fa415dd84e007ed6c8665fd7110ef8c3de4
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Sep 25 12:10:39 2020 +0200
Fix surefire argLine usage
---
parent/pom.xml | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 9c79d41..c2ba700 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -36,7 +36,7 @@
<compiler.fork>true</compiler.fork>
<cxf.codegenplugin.forkmode>once</cxf.codegenplugin.forkmode>
<cxf.codegen.jvmArgs/>
- <camel.surefire.fork.vmargs/>
+ <camel.surefire.fork.vmargs>-XX:+ExitOnOutOfMemoryError</camel.surefire.fork.vmargs>
<cxf.xjc.jvmArgs/>
<trimStackTrace>false</trimStackTrace>
<!-- dependency versions -->
@@ -4326,7 +4326,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin-version}</version>
<configuration>
- <argLine>-XX:+ExitOnOutOfMemoryError</argLine>
+ <argLine>@{camel.surefire.fork.vmargs}</argLine>
<!--forkMode>pertest</forkMode -->
<forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
<childDelegation>false</childDelegation>
@@ -4683,13 +4683,6 @@
<showWarnings>true</showWarnings>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <!--lets avoid polluting every pom.xml as these settings are almost always needed-->
- <configuration>
- <argLine>${camel.surefire.fork.vmargs}</argLine>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
</build>
[camel] 02/02: [CAMEL-15674] Upgrade to maven-archetype-plugin 3.2.0
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1337b861001853265f5ab97d2f3cb42266931673
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Oct 9 14:08:50 2020 +0200
[CAMEL-15674] Upgrade to maven-archetype-plugin 3.2.0
---
camel-dependencies/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 87214fb..31efc2d 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -398,7 +398,7 @@
<lz4-version>1.6.0</lz4-version>
<maven-antrun-plugin-version>1.6</maven-antrun-plugin-version>
<maven-archetype-packaging-version>2.3</maven-archetype-packaging-version>
- <maven-archetype-plugin-version>3.0.1</maven-archetype-plugin-version>
+ <maven-archetype-plugin-version>3.2.0</maven-archetype-plugin-version>
<maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
<maven-checkstyle-plugin-version>3.1.1</maven-checkstyle-plugin-version>
<maven-checkstyle-version>8.35</maven-checkstyle-version>
diff --git a/parent/pom.xml b/parent/pom.xml
index c2ba700..6a5fe99 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -382,7 +382,7 @@
<!-- needed from tooling/archetypes -->
<!-- use antrun 1.6 as 1.7 fails with finding tools.jar on java on some platforms -->
<maven-antrun-plugin-version>1.6</maven-antrun-plugin-version>
- <maven-archetype-plugin-version>3.0.1</maven-archetype-plugin-version>
+ <maven-archetype-plugin-version>3.2.0</maven-archetype-plugin-version>
<maven-archetype-packaging-version>2.3</maven-archetype-packaging-version>
<maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
<maven-checkstyle-plugin-version>3.1.1</maven-checkstyle-plugin-version>