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/08/22 13:23:40 UTC
camel git commit: CAMEL-10205: Fixed camel-spring-dm feature to work
in Karaf.
Repository: camel
Updated Branches:
refs/heads/master eca30a2d8 -> d1e386bf6
CAMEL-10205: Fixed camel-spring-dm feature to work in Karaf.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d1e386bf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d1e386bf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d1e386bf
Branch: refs/heads/master
Commit: d1e386bf6420240c8535b835bd6385708ffa9df0
Parents: eca30a2
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Aug 22 15:23:31 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Aug 22 15:23:31 2016 +0200
----------------------------------------------------------------------
components/camel-spring-dm/pom.xml | 6 ++++++
platforms/karaf/features/src/main/resources/features.xml | 1 -
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d1e386bf/components/camel-spring-dm/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-dm/pom.xml b/components/camel-spring-dm/pom.xml
index 814fa16..c9550b7 100644
--- a/components/camel-spring-dm/pom.xml
+++ b/components/camel-spring-dm/pom.xml
@@ -48,6 +48,12 @@
${camel.osgi.import.defaults},
*
</camel.osgi.import>
+ <camel.osgi.export>
+ org.apache.camel.spring.*;${camel.osgi.version},
+ org.apache.camel.util.spring.*;${camel.osgi.version},
+ org.apache.camel.component.event;${camel.osgi.split.pkg};${camel.osgi.version},
+ org.apache.camel.language.spel;${camel.osgi.split.pkg};${camel.osgi.version}
+ </camel.osgi.export>
<camel.osgi.activator>
org.apache.camel.osgi.Activator
</camel.osgi.activator>
http://git-wip-us.apache.org/repos/asf/camel/blob/d1e386bf/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 4e5cfa0..a403007 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -66,7 +66,6 @@
<feature version='[1.2,2)'>spring-dm</feature>
<feature version='${spring-dm-version-range}'>spring</feature>
<feature version='${spring-dm-version-range}'>spring-tx</feature>
- <feature version='${project.version}'>camel-spring</feature>
<bundle>mvn:org.apache.camel/camel-spring-dm/${project.version}</bundle>
</feature>
<feature name='camel-scr' version='${project.version}' resolver='(obr)' start-level='50'>