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 2016/03/31 09:19:31 UTC
[1/2] camel git commit: Upgrade Kafka features using Kafka bundle
0.9.0.1_1
Repository: camel
Updated Branches:
refs/heads/master 98e4b5a8f -> 0fb19fb5e
Upgrade Kafka features using Kafka bundle 0.9.0.1_1
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3dc9a75a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3dc9a75a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3dc9a75a
Branch: refs/heads/master
Commit: 3dc9a75affc1a11e61d8b537677067cf1c141d21
Parents: 98e4b5a
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Mar 31 09:11:11 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Mar 31 09:11:11 2016 +0200
----------------------------------------------------------------------
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3dc9a75a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index c759441..eeda85a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -350,6 +350,7 @@
<jzlib-version>1.1.3</jzlib-version>
<jzlib-bundle-version>1.1.3_2</jzlib-bundle-version>
<kafka-version>0.9.0.1</kafka-version>
+ <kafka-bundle-version>0.9.0.1_1</kafka-bundle-version>
<karaf-version>2.4.4</karaf-version>
<karaf3-version>3.0.6</karaf3-version>
<karaf4-version>4.0.4</karaf4-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/3dc9a75a/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 52141a5..65d2e54 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -988,7 +988,7 @@
</feature>
<feature name='camel-kafka' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>wrap:mvn:org.apache.kafka/kafka-clients/${kafka-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:net.jpountz.lz4/lz4/1.2.0</bundle>
<bundle>mvn:org.apache.camel/camel-kafka/${project.version}</bundle>
[2/2] camel git commit: Upgrade Snappy java to version 1.1.2.4
Posted by ac...@apache.org.
Upgrade Snappy java to version 1.1.2.4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0fb19fb5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0fb19fb5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0fb19fb5
Branch: refs/heads/master
Commit: 0fb19fb5e1f1487fc1c310c25b4a6d0364baa416
Parents: 3dc9a75
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Mar 31 09:14:53 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Mar 31 09:18:05 2016 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0fb19fb5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index eeda85a..4a20c20 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -490,7 +490,7 @@
<slf4j-version>1.7.13</slf4j-version>
<smack-version>4.0.7</smack-version>
<snakeyaml-version>1.17</snakeyaml-version>
- <snappy-version>1.1.2.1</snappy-version>
+ <snappy-version>1.1.2.4</snappy-version>
<snmp4j-version>2.3.4_1</snmp4j-version>
<solr-bundle-version>5.5.0_1</solr-bundle-version>
<solr-version>5.5.0</solr-version>