You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/03/11 11:28:11 UTC
[1/2] camel git commit: CAMEL-9698 fix for camel-servlet karaf
features
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x eb6e2ebd4 -> bd4008ea2
refs/heads/master 29c3c4063 -> 7c6737bf5
CAMEL-9698 fix for camel-servlet karaf features
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7c6737bf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7c6737bf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7c6737bf
Branch: refs/heads/master
Commit: 7c6737bf52b39d0d036e70c7d82e18d08c478236
Parents: 29c3c40
Author: Vladimir Dzalbo <v....@mielooandalexander.com>
Authored: Fri Mar 11 10:38:06 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Mar 11 11:27:42 2016 +0100
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7c6737bf/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 5809e92..8a683e7 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1390,6 +1390,7 @@
</feature>
<feature name='camel-servlet' version='${project.version}' resolver='(obr)' start-level='50'>
<details> camel-servlet need to access the http OSGi services </details>
+ <feature version='${project.version}'>camel-core</feature>
<feature>http</feature>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-servlet/${project.version}</bundle>
[2/2] camel git commit: CAMEL-9698 fix for camel-servlet karaf
features
Posted by da...@apache.org.
CAMEL-9698 fix for camel-servlet karaf features
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bd4008ea
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bd4008ea
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bd4008ea
Branch: refs/heads/camel-2.16.x
Commit: bd4008ea20e598df055762613b2e95922274d309
Parents: eb6e2eb
Author: Vladimir Dzalbo <v....@mielooandalexander.com>
Authored: Fri Mar 11 10:38:06 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Mar 11 11:28:02 2016 +0100
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bd4008ea/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 d54b169..b8725a5 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1359,6 +1359,7 @@
</feature>
<feature name='camel-servlet' version='${project.version}' resolver='(obr)' start-level='50'>
<details> camel-servlet need to access the http OSGi services </details>
+ <feature version='${project.version}'>camel-core</feature>
<feature>http</feature>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-servlet/${project.version}</bundle>