You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/03/03 08:38:49 UTC
[camel] branch camel-3.7.x updated (b6f8198 -> fabc281)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from b6f8198 Regen
new b535418 camel-kuda - Trouble building on mac
new fabc281 Regen
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-dependencies/pom.xml | 2 +-
components/camel-kudu/pom.xml | 15 ++++++++++++++-
parent/pom.xml | 2 +-
3 files changed, 16 insertions(+), 3 deletions(-)
[camel] 01/02: camel-kuda - Trouble building on mac
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b5354189de99012308cb3a9e62f807c148213649
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Feb 12 07:31:17 2021 +0100
camel-kuda - Trouble building on mac
---
components/camel-kudu/pom.xml | 15 ++++++++++++++-
parent/pom.xml | 2 +-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/components/camel-kudu/pom.xml b/components/camel-kudu/pom.xml
index 42c120d..0f71441 100644
--- a/components/camel-kudu/pom.xml
+++ b/components/camel-kudu/pom.xml
@@ -33,7 +33,7 @@
<profiles>
<profile>
- <!-- kudu-binary is not available for Windows. It is needed for tests, so skip that on Windows OS -->
+ <!-- kudu-binary is not available for Windows. It is needed for tests, so skip that -->
<id>Windows-Kudu-SkipTests</id>
<activation>
<os>
@@ -45,6 +45,19 @@
<os.detected.classifier>linux-x86_64</os.detected.classifier> <!-- Fake classifier to allow dependency resolution. kudu-binary will not be executed anyway on Windows -->
</properties>
</profile>
+ <profile>
+ <!-- kudu-binary is not available for Apple. It is needed for tests, so skip that -->
+ <id>Apple-Arm64-SkipTests</id>
+ <activation>
+ <os>
+ <family>mac</family>
+ </os>
+ </activation>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ <os.detected.classifier>linux-x86_64</os.detected.classifier> <!-- Fake classifier to allow dependency resolution. kudu-binary will not be executed anyway on Windows -->
+ </properties>
+ </profile>
</profiles>
<dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index b29090e..1b2826e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -443,7 +443,7 @@
<opentracing-version>0.31.0</opentracing-version>
<opentracing-tracerresolver-version>0.1.8</opentracing-tracerresolver-version>
<optaplanner-version>7.46.0.Final</optaplanner-version>
- <os-maven-plugin-version>1.6.2</os-maven-plugin-version>
+ <os-maven-plugin-version>1.7.0</os-maven-plugin-version>
<osgi-version>6.0.0</osgi-version>
<paho-version>1.2.5</paho-version>
<partial-build-plugin-version>2.7</partial-build-plugin-version>
[camel] 02/02: Regen
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fabc281ea725d00cdb08d6e6af0b2bd5757b7391
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Mar 3 09:38:05 2021 +0100
Regen
---
camel-dependencies/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 91267c1..9cace24 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -455,7 +455,7 @@
<openwebbeans-version>1.7.3</openwebbeans-version>
<openwebbeans1-version>1.2.7</openwebbeans1-version>
<optaplanner-version>7.46.0.Final</optaplanner-version>
- <os-maven-plugin-version>1.6.2</os-maven-plugin-version>
+ <os-maven-plugin-version>1.7.0</os-maven-plugin-version>
<osgi-version>6.0.0</osgi-version>
<paho-version>1.2.5</paho-version>
<partial-build-plugin-version>2.7</partial-build-plugin-version>