Updated Branches: refs/heads/camel-2.12.x 31469443b -> 2ca19aff7 refs/heads/master c87bc8c4c -> da022c393
camel-salesforce feature should use jetty feature for reusing karaf jetty. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/da022c39 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/da022c39 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/da022c39 Branch: refs/heads/master Commit: da022c3939646d0890ccc576effeeff24894b009 Parents: c87bc8c Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Jan 16 14:48:12 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jan 16 14:48:12 2014 +0100 ---------------------------------------------------------------------- platforms/karaf/features/src/main/resources/features.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/da022c39/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 f522919..83898ec 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -865,6 +865,7 @@ <bundle>mvn:org.apache.camel/camel-sap-netweaver/${project.version}</bundle> </feature> <feature name='camel-salesforce' version='${project.version}' resolver='(obr)' start-level='50'> + <feature>jetty</feature> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle> <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle> @@ -874,10 +875,6 @@ <bundle dependency='true'>mvn:org.cometd.java/cometd-java-client/${cometd-java-client-version}</bundle> <bundle dependency='true'>mvn:org.cometd.java/bayeux-api/${cometd-java-client-version}</bundle> <bundle dependency='true'>mvn:org.cometd.java/cometd-java-common/${cometd-java-client-version}</bundle> - <bundle dependency='true'>mvn:org.eclipse.jetty/jetty-util/${jetty-version}</bundle> - <bundle dependency='true'>mvn:org.eclipse.jetty/jetty-io/${jetty-version}</bundle> - <bundle dependency='true'>mvn:org.eclipse.jetty/jetty-http/${jetty-version}</bundle> - <bundle dependency='true'>mvn:org.eclipse.jetty/jetty-client/${jetty-version}</bundle> <bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-salesforce/${project.version}</bundle> </feature>
