You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/05/15 16:02:29 UTC
[camel] branch main updated: (chores) build: fix evaluating multiple conditions for build profiles
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 ef70b6f9a5f (chores) build: fix evaluating multiple conditions for build profiles
ef70b6f9a5f is described below
commit ef70b6f9a5f48be8ae1efefbac47d13f6f7d5cfa
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon May 15 18:01:17 2023 +0200
(chores) build: fix evaluating multiple conditions for build profiles
---
components/camel-aws/pom.xml | 17 ++++++++++-------
components/camel-fhir/pom.xml | 18 +++++++++++-------
components/camel-hashicorp-vault/pom.xml | 15 ++++++++-------
components/camel-infinispan/camel-infinispan/pom.xml | 18 +++++++++++-------
components/camel-zookeeper-master/pom.xml | 18 ++++++++----------
components/camel-zookeeper/pom.xml | 16 ++++++++--------
6 files changed, 56 insertions(+), 46 deletions(-)
diff --git a/components/camel-aws/pom.xml b/components/camel-aws/pom.xml
index 5243285bea3..de5fc9d0bcb 100644
--- a/components/camel-aws/pom.xml
+++ b/components/camel-aws/pom.xml
@@ -32,6 +32,10 @@
<name>Camel :: AWS :: Parent</name>
<description>Camel AWS parent</description>
+ <properties>
+ <skipITs>true</skipITs>
+ </properties>
+
<modules>
<module>camel-aws2-athena</module>
<module>camel-aws-cloudtrail</module>
@@ -60,26 +64,25 @@
<profiles>
<profile>
<!-- Localstack container is only available for x86 64 and ARM 64 -->
- <id>Notx86</id>
+ <id>x86</id>
<activation>
<os>
- <arch>!amd64</arch>
+ <arch>amd64</arch>
</os>
</activation>
<properties>
- <skipITs>true</skipITs>
+ <skipITs>false</skipITs>
</properties>
</profile>
<profile>
- <!-- Localstack container is only available for x86 64 and ARM 64 -->
- <id>NotArm</id>
+ <id>Arm</id>
<activation>
<os>
- <arch>!aarch64</arch>
+ <arch>aarch64</arch>
</os>
</activation>
<properties>
- <skipITs>true</skipITs>
+ <skipITs>false</skipITs>
</properties>
</profile>
</profiles>
diff --git a/components/camel-fhir/pom.xml b/components/camel-fhir/pom.xml
index 59100383c83..776fd97babd 100644
--- a/components/camel-fhir/pom.xml
+++ b/components/camel-fhir/pom.xml
@@ -32,6 +32,10 @@
<name>Camel :: FHIR :: Parent</name>
<description>Camel FHIR parent</description>
+ <properties>
+ <skipITs>true</skipITs>
+ </properties>
+
<modules>
<module>camel-fhir-api</module>
<module>camel-fhir-component</module>
@@ -39,26 +43,26 @@
<profiles>
<profile>
- <!-- FHIR container is only available for x86 64 and ARM-->
- <id>Notx86</id>
+ <!-- FHIR container is only available for x86 64 and ARM 64 -->
+ <id>x86</id>
<activation>
<os>
- <arch>!amd64</arch>
+ <arch>amd64</arch>
</os>
</activation>
<properties>
- <skipITs>true</skipITs>
+ <skipITs>false</skipITs>
</properties>
</profile>
<profile>
- <id>NotARM</id>
+ <id>Arm</id>
<activation>
<os>
- <arch>!aarch64</arch>
+ <arch>aarch64</arch>
</os>
</activation>
<properties>
- <skipITs>true</skipITs>
+ <skipITs>false</skipITs>
</properties>
</profile>
</profiles>
diff --git a/components/camel-hashicorp-vault/pom.xml b/components/camel-hashicorp-vault/pom.xml
index 9fd72ba7a0c..d21ef96b005 100644
--- a/components/camel-hashicorp-vault/pom.xml
+++ b/components/camel-hashicorp-vault/pom.xml
@@ -33,6 +33,7 @@
<description>Camel Hashicorp Vault Component</description>
<properties>
+ <skipITs>true</skipITs>
</properties>
<dependencies>
@@ -89,26 +90,26 @@
<profiles>
<profile>
- <!-- Hashicorp container is only available for x86 64 and ARM-->
- <id>Notx86</id>
+ <!-- Hashicorp vault container is only available for x86 64 and ARM 64 -->
+ <id>x86</id>
<activation>
<os>
- <arch>!amd64</arch>
+ <arch>amd64</arch>
</os>
</activation>
<properties>
- <skipITs>true</skipITs>
+ <skipITs>false</skipITs>
</properties>
</profile>
<profile>
- <id>NotARM</id>
+ <id>Arm</id>
<activation>
<os>
- <arch>!aarch64</arch>
+ <arch>aarch64</arch>
</os>
</activation>
<properties>
- <skipITs>true</skipITs>
+ <skipITs>false</skipITs>
</properties>
</profile>
</profiles>
diff --git a/components/camel-infinispan/camel-infinispan/pom.xml b/components/camel-infinispan/camel-infinispan/pom.xml
index bc2553ec7f3..89bdb691b3f 100644
--- a/components/camel-infinispan/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/camel-infinispan/pom.xml
@@ -32,6 +32,10 @@
<name>Camel :: Infinispan :: Remote</name>
<description>Camel Infinispan Remote support</description>
+ <properties>
+ <skipITs>true</skipITs>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -193,26 +197,26 @@
</profile>
<profile>
- <!-- Infinispan container is only available for x86 64 and ARM-->
- <id>Notx86</id>
+ <!-- Infinispan container is only available for x86 64 and ARM 64 -->
+ <id>x86</id>
<activation>
<os>
- <arch>!amd64</arch>
+ <arch>amd64</arch>
</os>
</activation>
<properties>
- <skipITs>true</skipITs>
+ <skipITs>false</skipITs>
</properties>
</profile>
<profile>
- <id>NotARM</id>
+ <id>Arm</id>
<activation>
<os>
- <arch>!aarch64</arch>
+ <arch>aarch64</arch>
</os>
</activation>
<properties>
- <skipITs>true</skipITs>
+ <skipITs>false</skipITs>
</properties>
</profile>
</profiles>
diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml
index 47c7f642ba2..361ca3e9266 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -33,6 +33,7 @@
<description>Camel Zookeeper Master Support</description>
<properties>
+ <skipITs>true</skipITs>
</properties>
<dependencies>
@@ -152,29 +153,26 @@
<profiles>
<profile>
- <!-- Zookeeper master tests only run on x86 64 or ARM-->
- <id>Notx86</id>
+ <!-- Zookeeper master is only available for x86 64 and ARM 64 -->
+ <id>x86</id>
<activation>
<os>
- <arch>!amd64</arch>
+ <arch>amd64</arch>
</os>
</activation>
<properties>
- <skipTests>true</skipTests>
- <skipITs>true</skipITs>
+ <skipITs>false</skipITs>
</properties>
</profile>
<profile>
- <!-- Zookeeper master tests only run on x86 64 or ARM-->
- <id>NotARM</id>
+ <id>Arm</id>
<activation>
<os>
- <arch>!aarch64</arch>
+ <arch>aarch64</arch>
</os>
</activation>
<properties>
- <skipTests>true</skipTests>
- <skipITs>true</skipITs>
+ <skipITs>false</skipITs>
</properties>
</profile>
</profiles>
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index bc0736038fa..afde2038258 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -33,6 +33,7 @@
<description>Camel Zookeeper Support</description>
<properties>
+ <skipITs>true</skipITs>
</properties>
<dependencies>
@@ -212,27 +213,26 @@
<profiles>
<profile>
- <!-- Zookeeper container is only available for on x86 64 or ARM-->
- <id>Notx86</id>
+ <!-- Zookeeper container is only available for x86 64 and ARM 64 -->
+ <id>x86</id>
<activation>
<os>
- <arch>!amd64</arch>
+ <arch>amd64</arch>
</os>
</activation>
<properties>
- <skipITs>true</skipITs>
+ <skipITs>false</skipITs>
</properties>
</profile>
<profile>
- <!-- XMPP container is only available for on x86 64 or ARM-->
- <id>NotARM</id>
+ <id>Arm</id>
<activation>
<os>
- <arch>!aarch64</arch>
+ <arch>aarch64</arch>
</os>
</activation>
<properties>
- <skipITs>true</skipITs>
+ <skipITs>false</skipITs>
</properties>
</profile>
</profiles>