Repository: camel Updated Branches: refs/heads/master 7fdf5fbe6 -> 42f66bc33
CAMEL-8264: Polished Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/42f66bc3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/42f66bc3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/42f66bc3 Branch: refs/heads/master Commit: 42f66bc33b61b04b7db98d6f671c5179a2494a2a Parents: 7fdf5fb Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Jan 23 10:27:57 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Jan 23 10:27:57 2015 +0100 ---------------------------------------------------------------------- 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/42f66bc3/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 0d85c2a..384431b 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1377,7 +1377,7 @@ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.stringtemplate/${stringtemplate-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-stringtemplate/${project.version}</bundle> </feature> - <!-- Does not work yet + <!-- Does not work yet, see CAMEL-8264 <feature name='camel-swagger' version='${project.version}' resolver='(obr)' start-level='50'> <details> camel-swagger need to access the http OSGi services </details> <feature>http</feature> @@ -1400,7 +1400,7 @@ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/2.6_1</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s/3.2.8_1</bundle> <bundle>mvn:org.apache.camel/camel-swagger/${project.version}</bundle> - </feature> --> + </feature> --> <feature name='camel-syslog' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <feature version='${project.version}'>camel-netty</feature>
