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 2019/10/03 10:32:22 UTC
[camel] branch master updated: Use only one property placeholder
for kafka bundle
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 a730521 Use only one property placeholder for kafka bundle
a730521 is described below
commit a7305213e24e1145c78bb2b6210e9f2817a6b5a1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Oct 3 12:31:50 2019 +0200
Use only one property placeholder for kafka bundle
---
parent/pom.xml | 3 +--
platforms/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 59e5c8a..ac0343e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -399,8 +399,7 @@
<jzlib-version>1.1.3</jzlib-version>
<jzlib-bundle-version>1.1.3_2</jzlib-bundle-version>
<kafka-version>2.3.0</kafka-version>
- <kafka-bundle-version>2.3.0_1</kafka-bundle-version>
- <kafka-clients-bundle-version>2.3.0_2</kafka-clients-bundle-version>
+ <kafka-bundle-version>2.3.0_2</kafka-bundle-version>
<karaf4-version>4.2.7</karaf4-version>
<kie-version>7.27.0.Final</kie-version>
<kubernetes-client-version>4.6.0</kubernetes-client-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index d3d04e0..2448180 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1620,7 +1620,7 @@
</feature>
<feature name='camel-kafka' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/${kafka-clients-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/${kafka-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.xerial.snappy/snappy-java/${snappy-version}</bundle>
<bundle dependency='true'>wrap:mvn:org.lz4/lz4-java/${lz4-version}</bundle>
<bundle>mvn:org.apache.camel/camel-kafka/${project.version}</bundle>