This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 0992ad2f5a1 Revert "Updated pom to skip build on Windows running on
ARM (#14063)" (#14100)
0992ad2f5a1 is described below
commit 0992ad2f5a12cc78f33637cfdec04ca60c94b754
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri May 10 09:23:19 2024 +0200
Revert "Updated pom to skip build on Windows running on ARM (#14063)"
(#14100)
This reverts commit 5f4209afa01e7c95b31e0f5808b383958ca17c5a.
---
components/camel-salesforce/pom.xml | 35 ++++++-----------------------------
1 file changed, 6 insertions(+), 29 deletions(-)
diff --git a/components/camel-salesforce/pom.xml
b/components/camel-salesforce/pom.xml
index 4c8a2a53c74..fde931a8b52 100644
--- a/components/camel-salesforce/pom.xml
+++ b/components/camel-salesforce/pom.xml
@@ -32,6 +32,12 @@
<name>Camel :: Salesforce :: Parent</name>
<description>Camel Salesforce parent</description>
+ <modules>
+ <module>camel-salesforce-component</module>
+ <module>camel-salesforce-codegen</module>
+ <module>camel-salesforce-maven-plugin</module>
+ </modules>
+
<properties>
<salesforce.component.root>${project.basedir}</salesforce.component.root>
@@ -44,33 +50,4 @@
<skipITs>true</skipITs>
</properties>
- <profiles>
- <!-- there is no gRPC library available for Windows on ARM so we need
to skip building the Salesforce component -->
- <profile>
- <id>win-arm</id>
- <activation>
- <os>
- <arch>aarch64</arch>
- <family>windows</family>
- </os>
- </activation>
- <modules>
- <module>camel-salesforce-maven-plugin</module>
- </modules>
- </profile>
- <profile>
- <id>not-win-arm</id>
- <activation>
- <os>
- <arch>!aarch64</arch>
- <family>!windows</family>
- </os>
- </activation>
- <modules>
- <module>camel-salesforce-component</module>
- <module>camel-salesforce-codegen</module>
- <module>camel-salesforce-maven-plugin</module>
- </modules>
- </profile>
- </profiles>
</project>
