[camel] branch master updated: CAMEL-13496: set mavenOpts for Maven Invoker pl...

[zr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 1bd1e01  CAMEL-13496: set mavenOpts for Maven Invoker pl...
1bd1e01 is described below

commit 1bd1e01ee3f3ee4fb63140149b1c66c0ffa3f223
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Thu May 9 20:10:31 2019 +0200

    CAMEL-13496: set mavenOpts for Maven Invoker pl...
    
    ...ugin
    
    As noted on the issue, setting `mavenOpts` only adds to the parameters
    on the `java` command line, but luckily the last parameter present is
    the one that is taken into account.
    
    This sets the heap size to 64MB which should be enough for running
    simple integration tests and prints the JVM configuration so if the
    execution fails we can see the used configuration.
    
    Also makes the `camel-restdsl-swagger-plugin` integration tests are only
    run in the `integration-test` phase.
---
 pom.xml                                            | 10 ++++++++++
 tooling/maven/camel-restdsl-swagger-plugin/pom.xml |  3 +--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 50fb0d2..7b0a7a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -359,6 +359,16 @@
                     </executions>
                 </plugin>
 
+                <plugin>
+                    <artifactId>maven-invoker-plugin</artifactId>
+                    <configuration>
+                        <skipInstallation>${invoker.skip}</skipInstallation>
+                        <skipInvocation>${invoker.skip}</skipInvocation>
+                        <mavenOpts>-Xmx64m -XshowSettings</mavenOpts>
+                        <showVersion>true</showVersion>
+                    </configuration>
+                </plugin>
+
             </plugins>
         </pluginManagement>
     </build>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
index 7357cca..1c576ea 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
@@ -98,8 +98,6 @@
                     <postBuildHookScript>verify</postBuildHookScript>
                     <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
                     <settingsFile>src/it/settings.xml</settingsFile>
-                    <skipInstallation>${invoker.skip}</skipInstallation>
-                    <skipInvocation>${invoker.skip}</skipInvocation>
                     <goals>
                         <goal>clean</goal>
                         <goal>verify</goal>
@@ -108,6 +106,7 @@
                 <executions>
                     <execution>
                         <id>integration-test</id>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>install</goal>
                             <goal>integration-test</goal>