You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ra...@apache.org on 2016/03/28 12:30:57 UTC
[11/27] camel git commit: camel-amqp feature should not use hardcoded
versions
camel-amqp feature should not use hardcoded versions
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ec9f12b2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ec9f12b2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ec9f12b2
Branch: refs/heads/jdk8-lambdas
Commit: ec9f12b299cf483aca509910b8221de0593bb4f1
Parents: 502e0c2
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 27 09:33:35 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 27 09:33:35 2016 +0200
----------------------------------------------------------------------
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 9 ++++++---
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ec9f12b2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index cd79925..f516f74 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -452,6 +452,7 @@
<protobuf-version>2.6.1</protobuf-version>
<qpid-bundle-version>0.28_1</qpid-bundle-version>
<qpid-version>0.28</qpid-version>
+ <qpid-proton-j-version>0.12.0</qpid-proton-j-version>
<qpid-jms-client-version>0.8.0</qpid-jms-client-version>
<quartz-bundle-version>1.8.6_1</quartz-bundle-version>
<quartz-version>1.8.6</quartz-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/ec9f12b2/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 5bbae10..bbba22e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -95,10 +95,13 @@
<feature version='${project.version}'>camel-jms</feature>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle>
<bundle dependency='true'>wrap:mvn:org.apache.qpid/qpid-jms-client/${qpid-jms-client-version}</bundle>
- <bundle dependency='true'>wrap:mvn:org.apache.qpid/proton-j/0.10</bundle>
- <bundle dependency='true'>wrap:mvn:io.netty/netty-all/4.0.17.Final</bundle>
+ <bundle dependency='true'>wrap:mvn:org.apache.qpid/proton-j/${qpid-proton-j-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-common/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-transport/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-buffer/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-handler/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle>
<bundle>mvn:org.apache.camel/camel-amqp/${project.version}</bundle>
</feature>
<feature name='camel-apns' version='${project.version}' resolver='(obr)' start-level='50'>