You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/11/22 09:36:53 UTC

[camel] branch master updated: Move integration Maven profile to camel-parent pom.xml in order to enable proper configuration propagation to submodules

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

acosentino 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 d4427da  Move integration Maven profile to camel-parent pom.xml in order to enable proper configuration propagation to submodules
d4427da is described below

commit d4427da10b6238ff3720af1f6509addec1aeff62
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Thu Nov 22 09:01:35 2018 +0100

    Move integration Maven profile to camel-parent pom.xml in order to enable proper configuration propagation to submodules
---
 parent/pom.xml | 33 +++++++++++++++++++++++++++++++++
 pom.xml        | 29 -----------------------------
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 94ee256..e7dca50 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -5679,6 +5679,39 @@
       </dependencies>
     </profile>
 
+    <profile>
+      <id>integration</id>
+      <!--The profile for running the unit and integration test -->
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>${maven-surefire-plugin-version}</version>
+            <configuration>
+              <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+              <childDelegation>false</childDelegation>
+              <useFile>true</useFile>
+              <failIfNoTests>false</failIfNoTests>
+              <runOrder>alphabetical</runOrder>
+              <rerunFailingTestsCount>0</rerunFailingTestsCount>
+              <systemPropertyVariables>
+                <derby.stream.error.file>target/derby.log</derby.stream.error.file>
+                <java.awt.headless>${java.awt.headless}</java.awt.headless>
+              </systemPropertyVariables>
+              <includes>
+                <include>**/*Test.*</include>
+                <include>**/*IntegrationTest.*</include>
+              </includes>
+              <excludes>
+                <exclude>**/*XXXTest.*</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <!-- experimental profile to activate ekstazi http://www.ekstazi.org -->
     <profile>
       <id>ekstazi</id>
diff --git a/pom.xml b/pom.xml
index fe6cf76..5d37e86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -561,35 +561,6 @@
     </profile>
 
     <profile>
-      <id>integration</id>
-      <!--The profile for running the unit and integration test -->
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>${maven-surefire-plugin-version}</version>
-            <configuration>
-              <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
-              <childDelegation>false</childDelegation>
-              <useFile>true</useFile>
-              <failIfNoTests>false</failIfNoTests>
-              <runOrder>alphabetical</runOrder>
-              <systemPropertyVariables>
-                <derby.stream.error.file>target/derby.log</derby.stream.error.file>
-                <java.awt.headless>${java.awt.headless}</java.awt.headless>
-              </systemPropertyVariables>
-              <includes>
-                <include>**/*Test.*</include>
-                <include>**/*IntegrationTest.*</include>
-              </includes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
       <id>deploy</id>
       <build>
         <defaultGoal>deploy</defaultGoal>