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 e669c01caac (chores) build: cleanup multi-arch builds and tests
e669c01caac is described below
commit e669c01caac07d6a3b00451d26ea8d0d619d99a4
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Sat May 20 06:38:20 2023 +0200
(chores) build: cleanup multi-arch builds and tests
---
components/camel-aws/pom.xml | 30 +------
.../camel-azure/camel-azure-storage-blob/pom.xml | 30 +------
.../camel-azure/camel-azure-storage-queue/pom.xml | 30 +------
components/camel-cassandraql/pom.xml | 30 +------
components/camel-chatscript/pom.xml | 19 +----
components/camel-consul/pom.xml | 16 +---
components/camel-couchbase/pom.xml | 26 ++----
components/camel-couchdb/pom.xml | 30 +------
components/camel-dhis2/pom.xml | 20 ++---
components/camel-djl/pom.xml | 26 +++---
components/camel-elasticsearch/pom.xml | 30 +------
components/camel-fhir/pom.xml | 31 +------
.../camel-google/camel-google-pubsub/pom.xml | 21 ++---
components/camel-hashicorp-vault/pom.xml | 30 +------
components/camel-hdfs/pom.xml | 16 +---
.../camel-infinispan/camel-infinispan/pom.xml | 28 +-----
components/camel-kafka/pom.xml | 16 ++--
components/camel-ldif/pom.xml | 31 +------
components/camel-lra/pom.xml | 21 ++---
components/camel-mongodb-gridfs/pom.xml | 30 +------
components/camel-mongodb/pom.xml | 30 +------
components/camel-nats/pom.xml | 30 +------
components/camel-pulsar/pom.xml | 23 ++---
components/camel-xmpp/pom.xml | 19 +----
components/camel-zookeeper-master/pom.xml | 31 +------
components/camel-zookeeper/pom.xml | 30 +------
components/pom.xml | 99 +++++++++++++++++++++-
27 files changed, 201 insertions(+), 572 deletions(-)
diff --git a/components/camel-aws/pom.xml b/components/camel-aws/pom.xml
index de5fc9d0bcb..c3d238d4d4a 100644
--- a/components/camel-aws/pom.xml
+++ b/components/camel-aws/pom.xml
@@ -33,7 +33,9 @@
<description>Camel AWS parent</description>
<properties>
- <skipITs>true</skipITs>
+ <!-- Localstack is not available on these platforms -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
</properties>
<modules>
@@ -61,30 +63,4 @@
<module>camel-aws-xray</module>
</modules>
- <profiles>
- <profile>
- <!-- Localstack container is only available for x86 64 and ARM 64
-->
- <id>x86</id>
- <activation>
- <os>
- <arch>amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- <profile>
- <id>Arm</id>
- <activation>
- <os>
- <arch>aarch64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-azure/camel-azure-storage-blob/pom.xml
b/components/camel-azure/camel-azure-storage-blob/pom.xml
index 731e99357b3..b97f1d9d8f0 100644
--- a/components/camel-azure/camel-azure-storage-blob/pom.xml
+++ b/components/camel-azure/camel-azure-storage-blob/pom.xml
@@ -33,7 +33,9 @@
<description>Camel Azure Blob Storage Service Component</description>
<properties>
- <skipITs>true</skipITs>
+ <!-- Azurite is not available on these platforms -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
</properties>
<dependencies>
@@ -124,30 +126,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <!-- Localstack container is only available for x86 64 and ARM 64
-->
- <id>x86</id>
- <activation>
- <os>
- <arch>amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- <profile>
- <id>Arm</id>
- <activation>
- <os>
- <arch>aarch64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-azure/camel-azure-storage-queue/pom.xml
b/components/camel-azure/camel-azure-storage-queue/pom.xml
index 1210514128f..c0be4943be5 100644
--- a/components/camel-azure/camel-azure-storage-queue/pom.xml
+++ b/components/camel-azure/camel-azure-storage-queue/pom.xml
@@ -33,7 +33,9 @@
<description>Camel Azure Storage Queue Service Component</description>
<properties>
- <skipITs>true</skipITs>
+ <!-- Azurite is not available on these platforms -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
</properties>
<dependencies>
@@ -103,30 +105,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <!-- Localstack container is only available for x86 64 and ARM 64
-->
- <id>x86</id>
- <activation>
- <os>
- <arch>amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- <profile>
- <id>Arm</id>
- <activation>
- <os>
- <arch>aarch64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-cassandraql/pom.xml
b/components/camel-cassandraql/pom.xml
index 820008b49a6..3eaf4c227d6 100644
--- a/components/camel-cassandraql/pom.xml
+++ b/components/camel-cassandraql/pom.xml
@@ -34,7 +34,9 @@
<description>Cassandra CQL3 support</description>
<properties>
- <skipITs>true</skipITs>
+ <!-- Cassandra is not available on these platforms -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
</properties>
<dependencies>
@@ -92,30 +94,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <!-- Localstack container is only available for x86 64 and ARM 64
-->
- <id>x86</id>
- <activation>
- <os>
- <arch>amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- <profile>
- <id>Arm</id>
- <activation>
- <os>
- <arch>aarch64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-chatscript/pom.xml
b/components/camel-chatscript/pom.xml
index c3ddef5a82a..d20d38290cf 100644
--- a/components/camel-chatscript/pom.xml
+++ b/components/camel-chatscript/pom.xml
@@ -33,6 +33,10 @@
<description>Camel support for ChatScript</description>
<properties>
+ <!-- ChatScript container is not available on these platforms -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
+ <skipITs.aarch64>true</skipITs.aarch64>
</properties>
<dependencies>
@@ -70,19 +74,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <!-- Chatscript container is only available for x86 64 and ARM 64
-->
- <id>Notx86</id>
- <activation>
- <os>
- <arch>!amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>true</skipITs>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml
index 9be55c2e2de..5507bd3eaca 100644
--- a/components/camel-consul/pom.xml
+++ b/components/camel-consul/pom.xml
@@ -33,6 +33,9 @@
<description>Camel Consul support</description>
<properties>
+ <!-- Consul container is not available on these platforms -->
+ <skipTests.s390x>true</skipTests.s390x>
+ <skipITs.s390x>true</skipITs.s390x>
</properties>
<dependencies>
@@ -179,19 +182,6 @@
</plugins>
</build>
</profile>
- <profile>
- <!-- Disable tests not available on platform -->
- <id>s390x</id>
- <activation>
- <os>
- <arch>s390x</arch>
- </os>
- </activation>
- <properties>
- <skipTests>true</skipTests>
- <skipITs>true</skipITs>
- </properties>
- </profile>
</profiles>
</project>
diff --git a/components/camel-couchbase/pom.xml
b/components/camel-couchbase/pom.xml
index 469e5caf260..ec62b036539 100644
--- a/components/camel-couchbase/pom.xml
+++ b/components/camel-couchbase/pom.xml
@@ -31,6 +31,13 @@
<name>Camel :: Couchbase</name>
<description>Camel Couchbase component</description>
+ <properties>
+ <!-- Couchbase container is not available on these platforms -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
+ <skipITs.aarch64>true</skipITs.aarch64>
+ </properties>
+
<dependencies>
<dependency>
<groupId>com.couchbase.client</groupId>
@@ -79,8 +86,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
- <skipITs>${skipITs}</skipITs>
- <skipTests>${skipTests}</skipTests>
<reuseForks>true</reuseForks>
</configuration>
<executions>
@@ -90,7 +95,6 @@
<goal>integration-test</goal>
</goals>
<configuration>
- <skipITs>${skipITs}</skipITs>
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
<excludedGroups>couchbase-7</excludedGroups>
@@ -113,20 +117,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <!-- Couchbase container is only available for x86 64 and ARM 64
-->
- <id>Notx86</id>
- <activation>
- <os>
- <arch>!amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>true</skipITs>
- </properties>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-couchdb/pom.xml b/components/camel-couchdb/pom.xml
index 1ba52615aff..4f16b8989cf 100644
--- a/components/camel-couchdb/pom.xml
+++ b/components/camel-couchdb/pom.xml
@@ -32,7 +32,9 @@
<description>Camel CouchDB component</description>
<properties>
- <skipITs>true</skipITs>
+ <!-- Couchdb container is not available on these platforms -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
</properties>
<dependencies>
@@ -77,30 +79,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <!-- Localstack container is only available for x86 64 and ARM 64
-->
- <id>x86</id>
- <activation>
- <os>
- <arch>amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- <profile>
- <id>Arm</id>
- <activation>
- <os>
- <arch>aarch64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-dhis2/pom.xml b/components/camel-dhis2/pom.xml
index 7c2c64611e8..ef0c1a4044c 100644
--- a/components/camel-dhis2/pom.xml
+++ b/components/camel-dhis2/pom.xml
@@ -35,6 +35,11 @@
<properties>
<dhis2-java-sdk.version>2.0.0</dhis2-java-sdk.version>
+
+ <!-- DHIS2 container is not available on these platforms -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
+ <skipITs.aarch64>true</skipITs.aarch64>
</properties>
<modules>
@@ -66,19 +71,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <!-- DHIS container is only available for x86 64 and ARM 64 -->
- <id>Notx86</id>
- <activation>
- <os>
- <arch>!amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>true</skipITs>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-djl/pom.xml b/components/camel-djl/pom.xml
index ee3dbcb0015..c2df5f0d8b5 100644
--- a/components/camel-djl/pom.xml
+++ b/components/camel-djl/pom.xml
@@ -30,6 +30,16 @@
<name>Camel :: Deep Java Library</name>
<description>Camel Deep Java Library support</description>
+ <properties>
+ <!-- DJL requires native components only available on x86 -->
+ <skipTests.ppc64le>true</skipTests.ppc64le>
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipTests.s390x>true</skipTests.s390x>
+ <skipITs.s390x>true</skipITs.s390x>
+ <skipTests.aarch64>true</skipTests.aarch64>
+ <skipITs.aarch64>true</skipITs.aarch64>
+ </properties>
+
<dependencies>
<!-- camel -->
<dependency>
@@ -129,20 +139,4 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <!-- DJL components are only available for Linux on x86 64 -->
- <id>Notx86</id>
- <activation>
- <os>
- <arch>!amd64</arch>
- </os>
- </activation>
- <properties>
- <skipTests>true</skipTests>
- <skipITs>true</skipITs>
- </properties>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-elasticsearch/pom.xml
b/components/camel-elasticsearch/pom.xml
index 68c4f2afafd..d77f07da918 100644
--- a/components/camel-elasticsearch/pom.xml
+++ b/components/camel-elasticsearch/pom.xml
@@ -33,7 +33,9 @@
<description>Camel ElasticSearch Java API Client support</description>
<properties>
- <skipITs>true</skipITs>
+ <!-- Elasticsearch container is not available on these platforms -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
</properties>
<dependencies>
@@ -102,30 +104,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <!-- Elasticsearch container is only available for x86 64 and ARM
64 -->
- <id>x86</id>
- <activation>
- <os>
- <arch>amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- <profile>
- <id>Arm</id>
- <activation>
- <os>
- <arch>aarch64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-fhir/pom.xml b/components/camel-fhir/pom.xml
index 776fd97babd..91bcf4e219c 100644
--- a/components/camel-fhir/pom.xml
+++ b/components/camel-fhir/pom.xml
@@ -33,38 +33,13 @@
<description>Camel FHIR parent</description>
<properties>
- <skipITs>true</skipITs>
+ <!-- FHIR container is not available on these platforms -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
</properties>
<modules>
<module>camel-fhir-api</module>
<module>camel-fhir-component</module>
</modules>
-
- <profiles>
- <profile>
- <!-- FHIR container is only available for x86 64 and ARM 64 -->
- <id>x86</id>
- <activation>
- <os>
- <arch>amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- <profile>
- <id>Arm</id>
- <activation>
- <os>
- <arch>aarch64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-google/camel-google-pubsub/pom.xml
b/components/camel-google/camel-google-pubsub/pom.xml
index 31dd03d080b..d0042485b9a 100644
--- a/components/camel-google/camel-google-pubsub/pom.xml
+++ b/components/camel-google/camel-google-pubsub/pom.xml
@@ -36,6 +36,11 @@
<schemeName>google-pubsub</schemeName>
<componentName>GooglePubSub</componentName>
<componentPackage>org.apache.camel.component.google.pubsub</componentPackage>
+
+ <!-- The emulator is only available for x86 -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
+ <skipITs.aarch64>true</skipITs.aarch64>
</properties>
<dependencyManagement>
@@ -86,20 +91,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <!-- The emulator is only available for on x86 64 -->
- <id>Notx86</id>
- <activation>
- <os>
- <arch>!amd64</arch>
- </os>
- </activation>
- <properties>
- <skipTests>true</skipTests>
- <skipITs>true</skipITs>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-hashicorp-vault/pom.xml
b/components/camel-hashicorp-vault/pom.xml
index d21ef96b005..12c65fad03d 100644
--- a/components/camel-hashicorp-vault/pom.xml
+++ b/components/camel-hashicorp-vault/pom.xml
@@ -33,7 +33,9 @@
<description>Camel Hashicorp Vault Component</description>
<properties>
- <skipITs>true</skipITs>
+ <!-- Hashicorp vault container is not available on these platforms -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
</properties>
<dependencies>
@@ -87,30 +89,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <!-- Hashicorp vault container is only available for x86 64 and
ARM 64 -->
- <id>x86</id>
- <activation>
- <os>
- <arch>amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- <profile>
- <id>Arm</id>
- <activation>
- <os>
- <arch>aarch64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-hdfs/pom.xml b/components/camel-hdfs/pom.xml
index 8478517d162..8fcb7704838 100644
--- a/components/camel-hdfs/pom.xml
+++ b/components/camel-hdfs/pom.xml
@@ -32,6 +32,9 @@
<description>Camel HDFS support with Hadoop 3.x libraries</description>
<properties>
+ <!-- HDFS is not available on this platform -->
+ <skipTests.s390x>true</skipTests.s390x>
+ <skipITs.s390x>true</skipITs.s390x>
</properties>
<dependencies>
@@ -158,19 +161,6 @@
<skipTests>true</skipTests>
</properties>
</profile>
- <profile>
- <!-- Disable tests not available on platform -->
- <id>s390x</id>
- <activation>
- <os>
- <arch>s390x</arch>
- </os>
- </activation>
- <properties>
- <skipTests>true</skipTests>
- <skipITs>true</skipITs>
- </properties>
- </profile>
</profiles>
</project>
diff --git a/components/camel-infinispan/camel-infinispan/pom.xml
b/components/camel-infinispan/camel-infinispan/pom.xml
index 89bdb691b3f..1d576f8f876 100644
--- a/components/camel-infinispan/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/camel-infinispan/pom.xml
@@ -33,7 +33,9 @@
<description>Camel Infinispan Remote support</description>
<properties>
- <skipITs>true</skipITs>
+ <!-- Infinispan container is not available on these platforms -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
</properties>
<dependencies>
@@ -195,30 +197,6 @@
</plugins>
</build>
</profile>
-
- <profile>
- <!-- Infinispan container is only available for x86 64 and ARM 64
-->
- <id>x86</id>
- <activation>
- <os>
- <arch>amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- <profile>
- <id>Arm</id>
- <activation>
- <os>
- <arch>aarch64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
</profiles>
</project>
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index 6e04e0ffd0e..7f62b908e0c 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -31,6 +31,11 @@
<name>Camel :: Kafka</name>
<description>Camel Kafka support</description>
+ <properties>
+ <!-- Kafka is not available on this platform -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ </properties>
+
<dependencies>
<!-- camel -->
@@ -226,16 +231,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>ppc64le</id>
- <activation>
- <os>
- <arch>ppc64le</arch>
- </os>
- </activation>
- <properties>
- <skipITs>true</skipITs>
- </properties>
- </profile>
</profiles>
</project>
diff --git a/components/camel-ldif/pom.xml b/components/camel-ldif/pom.xml
index 13c114a632c..0e1bd769716 100644
--- a/components/camel-ldif/pom.xml
+++ b/components/camel-ldif/pom.xml
@@ -32,7 +32,9 @@
<description>Camel LDIF support</description>
<properties>
- <skipITs>true</skipITs>
+ <!-- OpenLDAP container is not available on these platforms -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
</properties>
<dependencies>
@@ -92,32 +94,5 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
</dependencies>
-
- <profiles>
- <profile>
- <!-- Localstack container is only available for x86 64 and ARM 64
-->
- <id>x86</id>
- <activation>
- <os>
- <arch>amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- <profile>
- <id>Arm</id>
- <activation>
- <os>
- <arch>aarch64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-lra/pom.xml b/components/camel-lra/pom.xml
index 8f20b31dc2f..ede17956c3d 100644
--- a/components/camel-lra/pom.xml
+++ b/components/camel-lra/pom.xml
@@ -37,6 +37,11 @@
<title>LRA</title>
<label>database, microservice</label>
<supportLevel>preview</supportLevel>
+
+ <!-- LRA coordinator container is only available for x86 -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
+ <skipITs.aarch64>true</skipITs.aarch64>
</properties>
<dependencies>
@@ -85,20 +90,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <!-- LRA Coordinator container is only available for x86 64 -->
- <id>Notx86</id>
- <activation>
- <os>
- <arch>!amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>true</skipITs>
- </properties>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-mongodb-gridfs/pom.xml
b/components/camel-mongodb-gridfs/pom.xml
index 0974cdcaf00..a32e72ff087 100644
--- a/components/camel-mongodb-gridfs/pom.xml
+++ b/components/camel-mongodb-gridfs/pom.xml
@@ -33,7 +33,9 @@
<description>Camel MongoDB GridFS component</description>
<properties>
- <skipITs>true</skipITs>
+ <!-- MongoDB container is not available on these platforms -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
</properties>
<dependencies>
@@ -80,30 +82,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <!-- MongoDB container is only available for x86 64 and ARM 64 -->
- <id>x86</id>
- <activation>
- <os>
- <arch>amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- <profile>
- <id>Arm</id>
- <activation>
- <os>
- <arch>aarch64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-mongodb/pom.xml b/components/camel-mongodb/pom.xml
index 2b4c773e5e7..e722ce24403 100644
--- a/components/camel-mongodb/pom.xml
+++ b/components/camel-mongodb/pom.xml
@@ -32,7 +32,9 @@
<description>Camel MongoDB (Java Driver 3) component</description>
<properties>
- <skipITs>true</skipITs>
+ <!-- MongoDB container is not available on these platforms -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
</properties>
<dependencies>
@@ -107,30 +109,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <!-- MongoDB container is only available for x86 64 and ARM 64 -->
- <id>x86</id>
- <activation>
- <os>
- <arch>amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- <profile>
- <id>Arm</id>
- <activation>
- <os>
- <arch>aarch64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-nats/pom.xml b/components/camel-nats/pom.xml
index 2819f6eb6e3..5167686a75f 100644
--- a/components/camel-nats/pom.xml
+++ b/components/camel-nats/pom.xml
@@ -32,7 +32,9 @@
<name>Camel :: Nats</name>
<properties>
- <skipITs>true</skipITs>
+ <!-- Nats container is not available on these platforms -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
</properties>
<dependencies>
@@ -61,30 +63,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <!-- Nats container is only available for x86 64 and ARM 64 -->
- <id>x86</id>
- <activation>
- <os>
- <arch>amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- <profile>
- <id>Arm</id>
- <activation>
- <os>
- <arch>aarch64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-pulsar/pom.xml b/components/camel-pulsar/pom.xml
index 3314f27f451..49a3f8664cc 100644
--- a/components/camel-pulsar/pom.xml
+++ b/components/camel-pulsar/pom.xml
@@ -32,8 +32,14 @@
<name>Camel :: Pulsar</name>
<description>Camel Apache Pulsar Component</description>
- <dependencies>
+ <properties>
+ <!-- Pulsar container is only available on x86 -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
+ <skipITs.aarch64>true</skipITs.aarch64>
+ </properties>
+ <dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
@@ -111,19 +117,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <!-- Pulsar container is only available for Linux on x86 64 -->
- <id>Notx86</id>
- <activation>
- <os>
- <arch>!amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>true</skipITs>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml
index ea68da9e40d..e5b43ebdaf7 100644
--- a/components/camel-xmpp/pom.xml
+++ b/components/camel-xmpp/pom.xml
@@ -33,6 +33,10 @@
<description>Camel XMPP support</description>
<properties>
+ <!-- XMPP container is only available on x86 -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
+ <skipITs.aarch64>true</skipITs.aarch64>
</properties>
<dependencies>
@@ -104,19 +108,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <!-- XMPP container is only available for on x86 64 -->
- <id>Notx86</id>
- <activation>
- <os>
- <arch>!amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>true</skipITs>
- </properties>
- </profile>
- </profiles>
</project>
diff --git a/components/camel-zookeeper-master/pom.xml
b/components/camel-zookeeper-master/pom.xml
index 361ca3e9266..acf6086e9cd 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -33,7 +33,9 @@
<description>Camel Zookeeper Master Support</description>
<properties>
- <skipITs>true</skipITs>
+ <!-- Zookeeper container is not available on these platforms -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
</properties>
<dependencies>
@@ -150,31 +152,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <!-- Zookeeper master is only available for x86 64 and ARM 64 -->
- <id>x86</id>
- <activation>
- <os>
- <arch>amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- <profile>
- <id>Arm</id>
- <activation>
- <os>
- <arch>aarch64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- </profiles>
-
</project>
diff --git a/components/camel-zookeeper/pom.xml
b/components/camel-zookeeper/pom.xml
index afde2038258..d39afd13029 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -33,7 +33,9 @@
<description>Camel Zookeeper Support</description>
<properties>
- <skipITs>true</skipITs>
+ <!-- Zookeeper container is not available on these platforms -->
+ <skipITs.ppc64le>true</skipITs.ppc64le>
+ <skipITs.s390x>true</skipITs.s390x>
</properties>
<dependencies>
@@ -211,30 +213,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <!-- Zookeeper container is only available for x86 64 and ARM 64
-->
- <id>x86</id>
- <activation>
- <os>
- <arch>amd64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- <profile>
- <id>Arm</id>
- <activation>
- <os>
- <arch>aarch64</arch>
- </os>
- </activation>
- <properties>
- <skipITs>false</skipITs>
- </properties>
- </profile>
- </profiles>
-
</project>
diff --git a/components/pom.xml b/components/pom.xml
index d296734986f..70e7d8b091b 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -325,8 +325,13 @@
</modules>
<properties>
-
<camel-prepare-component>true</camel-prepare-component>
+ <skipTests.aarch64 />
+ <skipITs.aarch64 />
+ <skipTests.ppc64le />
+ <skipITs.ppc64le />
+ <skipTests.s390x />
+ <skipITs.s390x />
</properties>
<dependencies>
@@ -446,4 +451,96 @@
</plugins>
</build>
+ <profiles>
+ <!-- Platform-specific block list for tests. This is required because,
+ sometimes, containers or native components are not available on
+ certain platforms. Define the properties and set them as true on
+ the component poms to skip.
+ -->
+ <profile>
+ <id>Arm</id>
+ <activation>
+ <os>
+ <arch>aarch64</arch>
+ </os>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-plugin-version}</version>
+ <configuration>
+ <skipTests>${skipTests.aarch64}</skipTests>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-failsafe-plugin-version}</version>
+ <configuration>
+ <skipITs>${skipITs.aarch64}</skipITs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>s390x</id>
+ <activation>
+ <os>
+ <arch>s390x</arch>
+ </os>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-plugin-version}</version>
+ <configuration>
+ <skipTests>${skipTests.s390x}</skipTests>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-failsafe-plugin-version}</version>
+ <configuration>
+ <skipITs>${skipITs.s390x}</skipITs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>ppc64le</id>
+ <activation>
+ <os>
+ <arch>ppc64le</arch>
+ </os>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-plugin-version}</version>
+ <configuration>
+ <skipTests>${skipTests.ppc64le}</skipTests>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-failsafe-plugin-version}</version>
+ <configuration>
+ <skipITs>${skipITs.ppc64le}</skipITs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
