You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cs...@apache.org on 2016/11/02 10:29:00 UTC
camel git commit: fix CAMEL-10433 in Camel 2.16.x
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 2d99f74d8 -> 3e096a5dd
fix CAMEL-10433 in Camel 2.16.x
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3e096a5d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3e096a5d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3e096a5d
Branch: refs/heads/camel-2.16.x
Commit: 3e096a5dde6a2a6c352b8ae7c9787addf739c3ac
Parents: 2d99f74
Author: Xilai Dai <xl...@talend.com>
Authored: Wed Nov 2 11:17:17 2016 +0800
Committer: GitHub <no...@github.com>
Committed: Wed Nov 2 11:17:17 2016 +0800
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3e096a5d/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 b8725a5..6d61535 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -856,7 +856,7 @@
</feature>
<feature name='camel-jetty' version='${project.version}' resolver='(obr)' start-level='50'>
<details>camel-jetty intend to work with jetty8, so this feature only works in the karaf container which support jetty8, e.g. karaf 2.x/3.x</details>
- <feature>jetty</feature>
+ <feature version='[8,9)'>jetty</feature>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-jetty-common/${project.version}</bundle>
@@ -864,7 +864,7 @@
</feature>
<feature name='camel-jetty9' version='${project.version}' resolver='(obr)' start-level='50'>
<details>camel-jetty9 intend to work with jetty9, so this feature only works in the karaf container which support jetty9, e.g. karaf 4.x</details>
- <feature>jetty</feature>
+ <feature version='[9,10)'>jetty</feature>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-jetty-common/${project.version}</bundle>